[Gzz-commits] fenfire/org/fenfire/loom Cursor.java NodeView.j...

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Benja Fallenstein <address@hidden>      03/03/08 16:54:19

Modified files:
        org/fenfire/loom: Cursor.java NodeView.java NodeView.test 

Log message:
        refactor

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/Cursor.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/NodeView.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/NodeView.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/loom/Cursor.java
diff -u fenfire/org/fenfire/loom/Cursor.java:1.7 
fenfire/org/fenfire/loom/Cursor.java:1.8
--- fenfire/org/fenfire/loom/Cursor.java:1.7    Fri Mar  7 16:03:43 2003
+++ fenfire/org/fenfire/loom/Cursor.java        Sat Mar  8 16:54:15 2003
@@ -154,13 +154,26 @@
        return rotation;
     }
 
-    public SortedSet getConnections(int dir) {
-       Collection c = statementSelector.getConnections(focus, dir);
+    /** Get the connections of a given node in a given direction,
+     *  as determined by the statementSelector,
+     *  sorted according to the subjOrder/objOrder of this cursor.
+     *  XXX make public once tested
+     *  @return A set of statements, one for each connection.
+     */
+    protected SortedSet getConnections(Resource of, int dir) {
+       Collection c = statementSelector.getConnections(of, dir);
        SortedSet s = new TreeSet(dir<0 ? subjOrder : objOrder);
        s.addAll(c);
        return s;
     }
 
+    /** Get the focus's connections in a given direction.
+     *  @return A set of statements, one for each connection.
+     */
+    public SortedSet getConnections(int dir) {
+       return getConnections(focus, dir);
+    }
+
     public int getConnectionCount() {
        int negn = getConnections(-1).size();
        int posn = getConnections(1).size();
@@ -224,12 +237,7 @@
 
        Statement stmt = getRotationStmt(dir);
        if(stmt == null) return null;
-       if(dir < 0)
-           return new NodeView.Nodespec(stmt.getSubject(),
-                                        stmt.getPredicate(), -1);
-       else
-           return new NodeView.Nodespec(stmt.getObject(),
-                                        stmt.getPredicate(), 1);
+       return new NodeView.Nodespec(stmt, dir);
     }
 
     /** Move left/right. Focuses the node currently selected
Index: fenfire/org/fenfire/loom/NodeView.java
diff -u fenfire/org/fenfire/loom/NodeView.java:1.4 
fenfire/org/fenfire/loom/NodeView.java:1.5
--- fenfire/org/fenfire/loom/NodeView.java:1.4  Tue Mar  4 11:49:25 2003
+++ fenfire/org/fenfire/loom/NodeView.java      Sat Mar  8 16:54:15 2003
@@ -65,6 +65,16 @@
            dir = 0;
        }
 
+       /** Create a nodespec for a node in a statement.
+        *  If dir is -1, a nodespec for the subject
+        *  is created, if dir is 1, a nodespec for the object.
+        */
+       public Nodespec(Statement stmt, int dir) {
+           node = (dir<0) ? stmt.getSubject() : stmt.getObject();
+           prop = stmt.getPredicate();
+           this.dir = dir;
+       }
+
        /** Create a nodespec for a node in the context.
         */
        public Nodespec(RDFNode node, Property prop, int dir) {
@@ -95,19 +105,19 @@
 
        /** The node rendered in this cs.
         */
-       public RDFNode node;
+       public final RDFNode node;
 
        /** The property through which the node
         *  is related to the focus (<code>null</code>
         *  for the focus itself).
         */
-       public Property prop;
+       public final Property prop;
 
        /** Larger than zero if the node is posward
         *  from the focus; smaller than zero if the node
         *  is negward from the focus; zero if the node
         *  <em>is</em> the focus.
         */
-       public int dir;
+       public final int dir;
     }
 }
Index: fenfire/org/fenfire/loom/NodeView.test
diff -u fenfire/org/fenfire/loom/NodeView.test:1.1 
fenfire/org/fenfire/loom/NodeView.test:1.2
--- fenfire/org/fenfire/loom/NodeView.test:1.1  Tue Mar  4 11:49:25 2003
+++ fenfire/org/fenfire/loom/NodeView.test      Sat Mar  8 16:54:15 2003
@@ -22,13 +22,23 @@
 from gzz.loom.NodeView import Nodespec as Spec
 from com.hp.hpl.mesa.rdf import jena
 
-def testNodespecEquality():
+def setUp():
+    global model,p,q,r,s
     model = jena.mem.ModelMem()
     p = model.createProperty("http://fenfire.org/2003/02/test#";, 
"test-property")
     q = model.createProperty("http://fenfire.org/2003/02/test#";, 
"test-property-2")
     r = model.createResource()
     s = model.createResource()
 
+def testConstructFromStmt():
+    conn = model.createStatement(r,p,s)
+    model.add(conn)
+
+    assert Spec(conn, -1) == Spec(r,p,-1)
+    assert Spec(conn, 1) == Spec(s,p,1)
+    
+
+def testNodespecEquality():
     assert Spec(r) == Spec(r)
     assert Spec(r) != Spec(s)