[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/23 09:15:46

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

Log message:
        refactor

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/loom/Loom.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/loom/SimpleView.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/gzz/loom/View.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/lava/test/gzz/loom/SimpleView.test.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: gzz/lava/gzz/loom/Loom.java
diff -u gzz/lava/gzz/loom/Loom.java:1.2 gzz/lava/gzz/loom/Loom.java:1.3
--- gzz/lava/gzz/loom/Loom.java:1.2     Sat Feb 22 19:33:30 2003
+++ gzz/lava/gzz/loom/Loom.java Sun Feb 23 09:15:46 2003
@@ -29,6 +29,7 @@
 import gzz.vob.*;
 import gzz.vob.vobs.*;
 
+import java.awt.Color;
 import java.awt.event.MouseEvent;
 import java.io.*;
 import java.util.*;
@@ -38,7 +39,7 @@
 
 /** A sample app loading an RDF file and showing part of it.
  *  Currently used to verify visually that the tests really work.
- *  May become the main Loom app in the future :-)
+ *  May evolve into the main Loom app in the future :-)
  */
 public class Loom {
 
@@ -52,6 +53,7 @@
     public static void main(String[] args) throws RDFException, IOException {
        final Model model = load(args[0]);
        final Statement stmt = model.listStatements().next();
+       final Cursor cursor = new Cursor(stmt.getSubject(), stmt.getObject());
        final GraphicsAPI api = GraphicsAPI.getInstance();
 
        final Comparator cmp = new Comparator() {
@@ -64,6 +66,7 @@
        final NodeView nodeView = new NodeView() {
                public void render(VobScene sc, int into, RDFNode node) {
                    sc.map.put(bg, into);
+                   //sc.map.put(new TextVob(style, "Hi"), into);
                }
            };
        final Shower s = new Shower() {
@@ -74,7 +77,8 @@
                public VobScene generate() {
                    VobScene sc = this.screen.window.createVobScene();
                    SimpleView sv = new SimpleView(cmp, nodeView);
-                   sv.render(sc, 0, stmt.getSubject(), stmt.getObject());
+                   sc.map.put(new SolidBgVob(java.awt.Color.white), 0);
+                   sv.render(sc, 0, cursor);
                    return sc;
                }
                public void chg() {}
Index: gzz/lava/gzz/loom/SimpleView.java
diff -u gzz/lava/gzz/loom/SimpleView.java:1.14 
gzz/lava/gzz/loom/SimpleView.java:1.15
--- gzz/lava/gzz/loom/SimpleView.java:1.14      Sat Feb 22 19:33:30 2003
+++ gzz/lava/gzz/loom/SimpleView.java   Sun Feb 23 09:15:46 2003
@@ -29,12 +29,8 @@
 import gzz.vob.*;
 import gzz.vob.vobs.*;
 
-import java.awt.event.MouseEvent;
-import java.io.*;
 import java.util.*;
-
 import com.hp.hpl.mesa.rdf.jena.model.*;
-import com.hp.hpl.mesa.rdf.jena.mem.*;
 
 /** A very simple view of an RDF graph.
  *  Example:
@@ -62,19 +58,18 @@
        this.nodeView = nodeView;
     }
 
-    public void render(VobScene sc, int into, Resource focus, 
-                      RDFNode rotation) {
+    public void render(VobScene sc, int into, Cursor c) {
        try {
            int midx = sc.size.width/2, midy = sc.size.height/2;
-           int cs = sc.boxCS(into, focus, midx-25, midy-10, 50, 20);
-           nodeView.render(sc, cs, focus);
+           int cs = sc.boxCS(into, c.focus, midx-25, midy-10, 50, 20);
+           nodeView.render(sc, cs, c.focus);
 
            SortedSet nodes = new TreeSet(cmp);
-           StmtIterator i=focus.listProperties();
+           StmtIterator i=c.focus.listProperties();
            for(; i.hasNext();) nodes.add(i.next().getObject());
            i.close();
 
-           int before = nodes.headSet(rotation).size();
+           int before = nodes.headSet(c.rotation).size();
 
            int x = midx + 75, y = midy-10-before*50;
 
Index: gzz/lava/gzz/loom/View.java
diff -u gzz/lava/gzz/loom/View.java:1.3 gzz/lava/gzz/loom/View.java:1.4
--- gzz/lava/gzz/loom/View.java:1.3     Sat Feb 22 04:59:51 2003
+++ gzz/lava/gzz/loom/View.java Sun Feb 23 09:15:46 2003
@@ -38,5 +38,5 @@
  */
 public interface View {
 
-    void render(VobScene sc, int into, Resource focus, RDFNode rotation);    
+    void render(VobScene sc, int into, Cursor c);    
 }
Index: gzz/lava/test/gzz/loom/SimpleView.test
diff -u gzz/lava/test/gzz/loom/SimpleView.test:1.10 
gzz/lava/test/gzz/loom/SimpleView.test:1.11
--- gzz/lava/test/gzz/loom/SimpleView.test:1.10 Sat Feb 22 19:33:30 2003
+++ gzz/lava/test/gzz/loom/SimpleView.test      Sun Feb 23 09:15:46 2003
@@ -51,7 +51,8 @@
     r.addProperty(p, v)
 
     vs = getvs()
-    view.render(vs, 0, r, s)
+    cursor = gzz.loom.Cursor(r, s)
+    view.render(vs, 0, cursor)
 
     cs_r, cs_s, cs_t, cs_u, cs_v = [vs.matcher.getCS(0, x)
                                     for x in (r,s,t,u,v)]