[Gzz-commits] gzz/lava gzz/loom/Cursor.java gzz/loom/SimpleVi...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      03/02/23 16:11:35

Modified files:
        lava/gzz/loom  : Cursor.java SimpleView.java 
        lava/test/gzz/loom: Cursor.test 

Log message:
        refactor

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/loom/Cursor.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/loom/SimpleView.java.diff?tr1=1.22&tr2=1.23&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/loom/Cursor.test.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gzz/lava/gzz/loom/Cursor.java
diff -u gzz/lava/gzz/loom/Cursor.java:1.5 gzz/lava/gzz/loom/Cursor.java:1.6
--- gzz/lava/gzz/loom/Cursor.java:1.5   Sun Feb 23 14:44:24 2003
+++ gzz/lava/gzz/loom/Cursor.java       Sun Feb 23 16:11:34 2003
@@ -57,6 +57,18 @@
        this.rotation = rotation;
     }
 
+    /** Get the index of <code>rotation</code> among the connections.
+     *  E.g., when <code>rotation</code> is the first of the connections,
+     *  then this returns 0; when the rotation is the third connection,
+     *  this returns 2.
+     */
+    public int getRotationIndex() {
+       if(rotation != null)
+           return getConnections(1).headSet(rotation).size();
+       else
+           return 0;
+    }
+
     /** The posward or negward connections of <code>focus</code> to show,
      *  in order. XXX refactor-- we need only a subset of all properties,
      *  and recursion... currently slow because we iterate though
Index: gzz/lava/gzz/loom/SimpleView.java
diff -u gzz/lava/gzz/loom/SimpleView.java:1.22 
gzz/lava/gzz/loom/SimpleView.java:1.23
--- gzz/lava/gzz/loom/SimpleView.java:1.22      Sun Feb 23 15:43:40 2003
+++ gzz/lava/gzz/loom/SimpleView.java   Sun Feb 23 16:11:34 2003
@@ -63,18 +63,12 @@
                               1, 1, sizex, sizey);
        nodeView.render(sc, cs, c.focus);
        
-       SortedSet nodes = c.getConnections(1);
-       int before;
-
-       if(c.rotation != null)
-           before = nodes.headSet(c.rotation).size();
-       else
-           before = 0;
+       int before = c.getRotationIndex();
        
        int x = midx + gapx + sizex/2, 
            y = midy - sizey/2 - before*(gapy+sizey);
        
-       for(Iterator j=nodes.iterator(); j.hasNext();) {
+       for(Iterator j=c.getConnections(1).iterator(); j.hasNext();) {
            RDFNode node = (RDFNode)j.next();
            int cs2 = sc.orthoBoxCS(into, node, 0, x, y, 1, 1, sizex, sizey);
            nodeView.render(sc, cs2, node);
@@ -82,11 +76,10 @@
            y += sizey + gapy;
        }
 
-       nodes = c.getConnections(-1);
        x = midx - gapx - sizex - sizex/2; 
        y = midy - sizey/2 - before*(gapy+sizey);
 
-       for(Iterator j=nodes.iterator(); j.hasNext();) {
+       for(Iterator j=c.getConnections(-1).iterator(); j.hasNext();) {
            RDFNode node = (RDFNode)j.next();
            int cs2 = sc.orthoBoxCS(into, node, 0, x, y, 1, 1, sizex, sizey);
            nodeView.render(sc, cs2, node);
Index: gzz/lava/test/gzz/loom/Cursor.test
diff -u gzz/lava/test/gzz/loom/Cursor.test:1.3 
gzz/lava/test/gzz/loom/Cursor.test:1.4
--- gzz/lava/test/gzz/loom/Cursor.test:1.3      Sun Feb 23 14:44:24 2003
+++ gzz/lava/test/gzz/loom/Cursor.test  Sun Feb 23 16:11:35 2003
@@ -64,6 +64,20 @@
     assert list(c.getConnections(-1)) == [n[2]]
 
 
+def testRotationIndex():
+    c.set(n[1], n[2])
+    assert c.getRotationIndex() == 0
+
+    c.set(n[2], n[5])
+    assert c.getRotationIndex() == 2
+
+    c.set(n[2], n[9])
+    assert c.getRotationIndex() == 6
+
+    c.set(n[4], None)
+    assert c.getRotationIndex() == 0
+
+
 def testRotateMove():
     c.set(n[2], n[5])
     c.rotate(1)