[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] fenfire/org/fenfire modules/pp/PPActionsImpl.te...
From: |
Matti Katila |
Subject: |
[Gzz-commits] fenfire/org/fenfire modules/pp/PPActionsImpl.te... |
Date: |
Tue, 15 Apr 2003 13:27:27 -0400 |
CVSROOT: /cvsroot/fenfire
Module name: fenfire
Changes by: Matti Katila <address@hidden> 03/04/15 13:27:27
Modified files:
org/fenfire/modules/pp: PPActionsImpl.test PPCanvasNode.java
Pp.java
org/fenfire/util: RDFUtil.java
org/fenfire/view/buoy: BuoyAdaptor.java
Added files:
org/fenfire/util: RDFUtil.test
Log message:
should be ready for awt pp but something is missing :/
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPActionsImpl.test.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/PPCanvasNode.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/modules/pp/Pp.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/RDFUtil.test?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/RDFUtil.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/BuoyAdaptor.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: fenfire/org/fenfire/modules/pp/PPActionsImpl.test
diff -u fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.5
fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.6
--- fenfire/org/fenfire/modules/pp/PPActionsImpl.test:1.5 Tue Apr 15
10:57:14 2003
+++ fenfire/org/fenfire/modules/pp/PPActionsImpl.test Tue Apr 15 13:27:26 2003
@@ -1,2 +1,36 @@
-# to be implemented
+#/(to be implemented
+from org import fenfire
+
+from org.fenfire.modules.pp import *
+from org.fenfire.vocab import PP, RDF
+from org.fenfire.util import URN5Namespace, Pair, RDFUtil
+from org.nongnu.libvob.buoy import BuoyViewNodeType,\
+ BuoyLinkListener
+from org.nongnu.alph import impl
+
+from org.fenfire.test.gfx import getvs
+
+# from java.util import Iterator
+
+
+
+def setUp():
+ global fen, act
+ fen = fenfire.Fen()
+ fen.constgraph = fen.graph = fenfire.swamp.impl.HashGraph()
+ fen.txt = fenfire.impl.SimpleNodeContent(fen)
+ act = PPActionsImpl(fen)
+
+def testNewPaper():
+ paper = act.newPaper()
+
+ assert PP.Paper == fen.constgraph.find1_11X(paper, RDF.type)
+ assert paper == fen.constgraph.find1_X11(RDF.type, PP.Paper)
+
+ it = fen.constgraph.findN_11X_Iter(paper, RDF.type)
+ assert 1 == it.hasNext()
+ assert PP.Paper == it.next()
+ assert 0 == it.hasNext()
+
+ assert 1 == RDFUtil.isNodeType(fen, paper, PP.Paper)
Index: fenfire/org/fenfire/modules/pp/PPCanvasNode.java
diff -u fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.12
fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.13
--- fenfire/org/fenfire/modules/pp/PPCanvasNode.java:1.12 Tue Apr 15
10:43:42 2003
+++ fenfire/org/fenfire/modules/pp/PPCanvasNode.java Tue Apr 15 13:27:26 2003
@@ -21,7 +21,7 @@
import com.hp.hpl.mesa.rdf.jena.vocabulary.*;
public class PPCanvasNode implements NodeBuoyViewNodeType {
-private static final String rcsid = "$Id: PPCanvasNode.java,v 1.12 2003/04/15
14:43:42 mudyc Exp $";
+private static final String rcsid = "$Id: PPCanvasNode.java,v 1.13 2003/04/15
17:27:26 mudyc Exp $";
public static boolean dbg = false;
private static void pa(String s) { System.out.println("PPCanvasNode::"+s);
}
@@ -49,6 +49,7 @@
*/
public boolean ownsNode(Object node)
{
+ pa("foo: "+node);
// check if node is a note
if (RDFUtil.isNodeType(fen, node, PP.Note)) return true;
Index: fenfire/org/fenfire/modules/pp/Pp.java
diff -u fenfire/org/fenfire/modules/pp/Pp.java:1.13
fenfire/org/fenfire/modules/pp/Pp.java:1.14
--- fenfire/org/fenfire/modules/pp/Pp.java:1.13 Tue Apr 15 10:15:12 2003
+++ fenfire/org/fenfire/modules/pp/Pp.java Tue Apr 15 13:27:26 2003
@@ -3,6 +3,7 @@
package org.fenfire.modules.pp;
import org.fenfire.*;
import org.fenfire.swamp.*;
+import org.fenfire.swamp.impl.*;
import org.fenfire.impl.*;
import org.fenfire.util.*;
import org.fenfire.view.*;
@@ -12,7 +13,6 @@
import org.nongnu.libvob.*;
import org.nongnu.libvob.impl.*;
import org.nongnu.libvob.buoy.*;
-import org.nongnu.libvob.impl.DefaultVobMatcher;
import org.nongnu.libvob.vobs.*;
import org.nongnu.alph.impl.*;
@@ -25,49 +25,35 @@
import java.rmi.*;
import java.rmi.server.*;
-import com.hp.hpl.mesa.rdf.jena.model.*;
-import com.hp.hpl.mesa.rdf.jena.mem.*;
-
public class Pp implements BuoyLinkListener {
-public static final String rcsid = "$Id: Pp.java,v 1.13 2003/04/15 14:15:12
mudyc Exp $";
+public static final String rcsid = "$Id: Pp.java,v 1.14 2003/04/15 17:27:26
mudyc Exp $";
public static final boolean dbg = true;
protected static void p(String s) { if(dbg) pa(s); }
protected static void pa(String s) { System.out.println("Pp::"+s); }
private static Pp pp;
- static public void main(String[] args) throws RemoteException,
RDFException {
+ static public void main(String[] args) throws RemoteException {
pp = new Pp();
}
private final GraphicsAPI api = GraphicsAPI.getInstance();
private Frame frame;
+ private Fen fen;
private PPActions ppAct;
private BuoyAdaptor adaptor = new BuoyAdaptor();
private BuoyViewMainNode focus;
-
- // old!
- private Space space;
private NodeView nodeview;
- //private RDFNode accursed;
-
-
- // new
- private Fen fen;
private Object accursed;
-
- public Pp() throws RemoteException, RDFException {
+ public Pp() throws RemoteException {
fen = new Fen();
+ fen.constgraph = new HashGraph();
+ fen.graph = new HashGraph();
+ //fen.enfiladeOverlap = new XXX
+ fen.txt = new SimpleNodeContent(fen);
- /*
- space = new ModularSpace(
- new SimpleVStreamTexter(
- new FakeSpanMaker(),
- new Enfilade1DImpl.Enfilade1DImplMaker()),
- new ModelMem());
- */
ppAct = new PPActionsImpl(fen);
String paper = ppAct.newPaper();
@@ -154,11 +140,11 @@
Pair p = (Pair)obj;
if (p.first.equals(accursed)) {
focus = adaptor.createMainNode(null, p.second, pp);
- accursed = (RDFNode)p.second;
+ accursed = p.second;
}
else {
focus = adaptor.createMainNode(null, p.first, pp);
- accursed = (RDFNode)p.first;
+ accursed = p.first;
}
AbstractUpdateManager.chg();
return;
@@ -191,11 +177,11 @@
public PPActions getPPActions() { return ppAct; }
public String getCurrentPaper() {
Object paper = getAccursed();
- /*
- if (ShortRDF.isNodeType(space.getModel(), getAccursed(),
PP.noteType)) {
- paper = ShortRDF.getSubj(space.getModel(), getAccursed(),
PP.contains);
+
+ if (RDFUtil.isNodeType(fen, getAccursed(), PP.Note)) {
+ paper = fen.constgraph.find1_X11(getAccursed(), PP.contains);
}
- */
+
return paper.toString();
}
}
Index: fenfire/org/fenfire/util/RDFUtil.java
diff -u fenfire/org/fenfire/util/RDFUtil.java:1.2
fenfire/org/fenfire/util/RDFUtil.java:1.3
--- fenfire/org/fenfire/util/RDFUtil.java:1.2 Tue Apr 15 10:15:12 2003
+++ fenfire/org/fenfire/util/RDFUtil.java Tue Apr 15 13:27:26 2003
@@ -7,14 +7,18 @@
import java.util.Iterator;
public class RDFUtil {
-
+ static private void pa(String s) { System.out.println("RDFUtil: "+s); }
/** Create a new resource with given type.
*/
static public Object N(Fen fen, Object type) {
Object ret = Nodes.N();
fen.graph.set1_11X(ret, RDF.type, type);
+
+ if (!isNodeType(fen, ret, type)) throw new Error("Impossible!");
+
return ret;
+
}
/** Check if node is the type which is asked.
@@ -22,7 +26,9 @@
static public boolean isNodeType(Fen fen, Object node, Object type) {
Iterator it = fen.constgraph.findN_11X_Iter(node, RDF.type);
while(it.hasNext()) {
- if ( it.next() == type ) return true;
+ Object obj = it.next();
+ pa("obj: "+ obj);
+ if ( obj.equals(type) ) return true;
}
return false;
}
Index: fenfire/org/fenfire/view/buoy/BuoyAdaptor.java
diff -u fenfire/org/fenfire/view/buoy/BuoyAdaptor.java:1.4
fenfire/org/fenfire/view/buoy/BuoyAdaptor.java:1.5
--- fenfire/org/fenfire/view/buoy/BuoyAdaptor.java:1.4 Tue Apr 15 10:17:40 2003
+++ fenfire/org/fenfire/view/buoy/BuoyAdaptor.java Tue Apr 15 13:27:26 2003
@@ -55,6 +55,7 @@
*/
private NodeBuoyViewNodeType getNode(Object node) {
for(int i=0; i<nodes.length; i++) {
+ pa("ba");
if(nodes[i].ownsNode(node)) {
return nodes[i];
}