[Gzz-commits] fenfire/org/fenfire/view buoy/BuoyNodeViewLinke...

[Matti Katila]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Matti Katila <address@hidden>   03/04/15 08:14:59

Modified files:
        org/fenfire/view/buoy: BuoyNodeViewLinker.java PPLinker.java 
Removed files:
        org/fenfire/view: CoordinatePlaneView.java 

Log message:
        sorry to brake everything.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/BuoyNodeViewLinker.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/view/buoy/PPLinker.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/view/buoy/BuoyNodeViewLinker.java
diff -u fenfire/org/fenfire/view/buoy/BuoyNodeViewLinker.java:1.1 
fenfire/org/fenfire/view/buoy/BuoyNodeViewLinker.java:1.2
--- fenfire/org/fenfire/view/buoy/BuoyNodeViewLinker.java:1.1   Tue Mar 25 
10:58:56 2003
+++ fenfire/org/fenfire/view/buoy/BuoyNodeViewLinker.java       Tue Apr 15 
08:14:59 2003
@@ -3,7 +3,6 @@
 package org.fenfire.view.buoy;
 import org.nongnu.libvob.*;
 import org.nongnu.libvob.buoy.*;
-import com.hp.hpl.mesa.rdf.jena.model.*;
 
 /** An interface for link-making callbacks of nodes.
  * This class can be used for node-node or node-other
@@ -16,7 +15,7 @@
      * use nodeType as the BuoyViewNodeType (usually
      * it is just the BuoyAdaptor instance).
      */
-    public void doLinks(RDFNode node, VobScene vs, int cs, 
+    public void doLinks(Object node, VobScene vs, int cs, 
                 BuoyViewNodeType nodeType, 
                 BuoyLinkListener l);
 }
Index: fenfire/org/fenfire/view/buoy/PPLinker.java
diff -u fenfire/org/fenfire/view/buoy/PPLinker.java:1.3 
fenfire/org/fenfire/view/buoy/PPLinker.java:1.4
--- fenfire/org/fenfire/view/buoy/PPLinker.java:1.3     Mon Mar 31 07:37:47 2003
+++ fenfire/org/fenfire/view/buoy/PPLinker.java Tue Apr 15 08:14:59 2003
@@ -2,64 +2,48 @@
 
 package org.fenfire.modules.pp;
 import org.fenfire.*;
+import org.fenfire.swamp.*;
 import org.fenfire.view.buoy.*;
 import org.fenfire.util.*;
 import org.fenfire.vocab.*;
 import org.nongnu.libvob.*;
 import org.nongnu.libvob.buoy.*;
-import com.hp.hpl.mesa.rdf.jena.model.*;
-import com.hp.hpl.mesa.rdf.jena.common.*;
+
+import java.util.Iterator;
 
 /** Make the kinds of links familiar from PP structure.
  */
 public class PPLinker implements BuoyNodeViewLinker {
-public static final String rcsid = "$Id: PPLinker.java,v 1.3 2003/03/31 
12:37:47 mudyc Exp $";
+public static final String rcsid = "$Id: PPLinker.java,v 1.4 2003/04/15 
12:14:59 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println("PPLinker:"+s); }
 
-    private Space space;
-    public PPLinker(Space space) {
-       this.space = space;
+    private Fen fen;
+    public PPLinker(Fen fen) {
+       this.fen = fen;
     }
 
-    public void doLinks(RDFNode node, VobScene vs, int cs, 
+    public void doLinks(Object node, VobScene vs, int cs, 
                 BuoyViewNodeType nodeType, 
                 BuoyLinkListener l) 
-    { try {
+    {
        if (node == null) 
            throw new Error("PPLinker error: node is null!");
        
-       if (node instanceof Resource);
-       else throw new Error("PPLinker error: node is not a resource!");
-       
-       // check all associations
-       Resource n = (Resource)node;
+       /* check all associations */
 
        // Right links!
-       Selector slctr = new SelectorImpl(n, PP.association, (RDFNode) null);
-       StmtIterator iter = space.getModel().listStatements(slctr);
-       Statement stmt = null;
-
+       Iterator iter = fen.constgraph.findN_11X_Iter(node, PP.association);
        while (iter.hasNext()) {
-           stmt = iter.next();
-           l.link(1,cs,nodeType, 
-                  new Pair(n, stmt.getObject()), 
-                  stmt.getObject());
+           Object obj = iter.next();
+           l.link(1,cs,nodeType, new Pair(node, obj), obj);
        }
 
        // Left links!
-       slctr = new SelectorImpl(null, PP.association, n);
-       iter = space.getModel().listStatements(slctr);
+       iter = fen.constgraph.findN_X11_Iter(node, PP.association);
        while (iter.hasNext()) {
-           stmt = iter.next();
-           l.link(-1,cs,nodeType, 
-                  new Pair(stmt.getSubject(), n),
-                  stmt.getSubject());
+           Object sub = iter.next();
+           l.link(-1,cs,nodeType, new Pair(sub, node), sub);
        }
-    
-    } catch (RDFException e) {
-       pa("Exception ocurred!: "+e);
-       throw new Error("PPLinker error: Failed to doLink!!");
-    }
     }
 }