[Gzz-commits] gzz/lava gzz/loom/Loom.java gzz/loom/SimpleView...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      03/02/22 19:33:30

Modified files:
        lava/gzz/loom  : Loom.java SimpleView.java 
        lava/test/gzz/loom: SimpleView.test 
Added files:
        lava/gzz/loom  : NodeView.java 

Log message:
        refactor

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/loom/NodeView.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/loom/Loom.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/loom/SimpleView.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/loom/SimpleView.test.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: gzz/lava/gzz/loom/Loom.java
diff -u gzz/lava/gzz/loom/Loom.java:1.1 gzz/lava/gzz/loom/Loom.java:1.2
--- gzz/lava/gzz/loom/Loom.java:1.1     Sat Feb 22 14:38:23 2003
+++ gzz/lava/gzz/loom/Loom.java Sat Feb 22 19:33:30 2003
@@ -52,12 +52,20 @@
     public static void main(String[] args) throws RDFException, IOException {
        final Model model = load(args[0]);
        final Statement stmt = model.listStatements().next();
+       final GraphicsAPI api = GraphicsAPI.getInstance();
 
        final Comparator cmp = new Comparator() {
                public int compare(Object o1, Object o2) {
                    return o1.hashCode() - o2.hashCode();
                }
            };
+       final Vob bg = new RectBgVob();
+       final TextStyle style = api.getTextStyle("Serif", 0, 12);
+       final NodeView nodeView = new NodeView() {
+               public void render(VobScene sc, int into, RDFNode node) {
+                   sc.map.put(bg, into);
+               }
+           };
        final Shower s = new Shower() {
                Screen screen;
                public void setScreen(Screen s) {
@@ -65,7 +73,7 @@
                }
                public VobScene generate() {
                    VobScene sc = this.screen.window.createVobScene();
-                   SimpleView sv = new SimpleView(cmp);
+                   SimpleView sv = new SimpleView(cmp, nodeView);
                    sv.render(sc, 0, stmt.getSubject(), stmt.getObject());
                    return sc;
                }
@@ -79,7 +87,6 @@
                public void windowClosed() {}
            };
 
-       final GraphicsAPI api = GraphicsAPI.getInstance();
        api.startUpdateManager(new Runnable() {
                public void run() {
                    Screen scr = new Screen(api.createWindow(), b, s);
Index: gzz/lava/gzz/loom/SimpleView.java
diff -u gzz/lava/gzz/loom/SimpleView.java:1.13 
gzz/lava/gzz/loom/SimpleView.java:1.14
--- gzz/lava/gzz/loom/SimpleView.java:1.13      Sat Feb 22 14:38:23 2003
+++ gzz/lava/gzz/loom/SimpleView.java   Sat Feb 22 19:33:30 2003
@@ -48,15 +48,18 @@
  */
 public class SimpleView implements View {
 
-    final RectBgVob bg = new RectBgVob();
-    
     /** The comparator used to order the nodes in the graph.
      *  The vertical order of nodes is determined by this Comparator.
      */
     protected Comparator cmp;
+    
+    /** The view used to show the individual nodes.
+     */
+    protected NodeView nodeView;
 
-    public SimpleView(Comparator cmp) {
+    public SimpleView(Comparator cmp, NodeView nodeView) {
        this.cmp = cmp;
+       this.nodeView = nodeView;
     }
 
     public void render(VobScene sc, int into, Resource focus, 
@@ -64,7 +67,7 @@
        try {
            int midx = sc.size.width/2, midy = sc.size.height/2;
            int cs = sc.boxCS(into, focus, midx-25, midy-10, 50, 20);
-           sc.map.put(bg, cs);
+           nodeView.render(sc, cs, focus);
 
            SortedSet nodes = new TreeSet(cmp);
            StmtIterator i=focus.listProperties();
@@ -76,8 +79,9 @@
            int x = midx + 75, y = midy-10-before*50;
 
            for(Iterator j=nodes.iterator(); j.hasNext();) {
-               cs = sc.boxCS(into, j.next(), x, y, 50, 20);
-               sc.map.put(bg, cs);
+               RDFNode node = (RDFNode)j.next();
+               cs = sc.boxCS(into, node, x, y, 50, 20);
+               nodeView.render(sc, cs, node);
                y += 50;
            }
        } catch(RDFException e) {
Index: gzz/lava/test/gzz/loom/SimpleView.test
diff -u gzz/lava/test/gzz/loom/SimpleView.test:1.9 
gzz/lava/test/gzz/loom/SimpleView.test:1.10
--- gzz/lava/test/gzz/loom/SimpleView.test:1.9  Sat Feb 22 11:48:59 2003
+++ gzz/lava/test/gzz/loom/SimpleView.test      Sat Feb 22 19:33:30 2003
@@ -32,11 +32,17 @@
 u = model.createResource()
 v = model.createResource()
 
+nodes = {}
+
+class NodeView(gzz.loom.NodeView):
+    def render(self, vs, cs, node):
+        nodes[node] = cs
+
 class Cmp(java.util.Comparator):
     def compare(self, r1, r2):
         return [t,r,s,v,u].index(r1) - [t,r,s,v,u].index(r2)
 
-view = gzz.loom.SimpleView(Cmp())
+view = gzz.loom.SimpleView(Cmp(), NodeView())
 
 def testSimple():
     r.addProperty(p, s)
@@ -70,8 +76,8 @@
     assert pt.y < ps.y < pv.y < pu.y
     assert abs(ps.y-pr.y) < 5
 
-    assert vs.map.getVobByCS(cs_r) != None
-    assert vs.map.getVobByCS(cs_s) != None
-    assert vs.map.getVobByCS(cs_t) != None
-    assert vs.map.getVobByCS(cs_u) != None
-    assert vs.map.getVobByCS(cs_v) != None
+    assert nodes[r] == cs_r
+    assert nodes[s] == cs_s
+    assert nodes[t] == cs_t
+    assert nodes[u] == cs_u
+    assert nodes[v] == cs_v