[Gzz-commits] fenfire/org/fenfire/loom ColorScheme.java Curso...

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Benja Fallenstein <address@hidden>      03/03/11 17:52:22

Modified files:
        org/fenfire/loom: ColorScheme.java Cursor.java Cursor.test 
                          Loom.java ModelUtil.java ModelUtil.test 
                          NamespaceMap.java NamespaceMap.test 
                          NodeView.java NodeView.test RDFVocab.java 
                          SimpleOrder.java SimpleOrder.test 
                          SimpleView.java SimpleView.test 
                          StatementSelector.java View.java 
                          WheelView.java WheelView.test 

Log message:
        Change package from 'gzz.loom' to 'org.fenfire.loom' (please ant clean)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/ColorScheme.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/Cursor.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/Cursor.test.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/Loom.java.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/ModelUtil.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/ModelUtil.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/NamespaceMap.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/NamespaceMap.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/NodeView.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/NodeView.test.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/RDFVocab.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/SimpleOrder.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/SimpleOrder.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/SimpleView.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/SimpleView.test.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/StatementSelector.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/View.java.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/WheelView.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/WheelView.test.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: fenfire/org/fenfire/loom/ColorScheme.java
diff -u fenfire/org/fenfire/loom/ColorScheme.java:1.1 
fenfire/org/fenfire/loom/ColorScheme.java:1.2
--- fenfire/org/fenfire/loom/ColorScheme.java:1.1       Sat Mar  8 17:22:59 2003
+++ fenfire/org/fenfire/loom/ColorScheme.java   Tue Mar 11 17:52:22 2003
@@ -24,7 +24,7 @@
 /*
  * Written by Benja Fallenstein
  */
-package gzz.loom;
+package org.fenfire.loom;
 import java.awt.Color;
 
 /** A color scheme for the Loom editor.
Index: fenfire/org/fenfire/loom/Cursor.java
diff -u fenfire/org/fenfire/loom/Cursor.java:1.8 
fenfire/org/fenfire/loom/Cursor.java:1.9
--- fenfire/org/fenfire/loom/Cursor.java:1.8    Sat Mar  8 16:54:15 2003
+++ fenfire/org/fenfire/loom/Cursor.java        Tue Mar 11 17:52:22 2003
@@ -24,7 +24,7 @@
 /*
  * Written by Benja Fallenstein
  */
-package gzz.loom;
+package org.fenfire.loom;
 
 import java.util.*;
 import com.hp.hpl.mesa.rdf.jena.model.*;
Index: fenfire/org/fenfire/loom/Cursor.test
diff -u fenfire/org/fenfire/loom/Cursor.test:1.7 
fenfire/org/fenfire/loom/Cursor.test:1.8
--- fenfire/org/fenfire/loom/Cursor.test:1.7    Fri Mar  7 15:48:09 2003
+++ fenfire/org/fenfire/loom/Cursor.test        Tue Mar 11 17:52:22 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 #
 
-import gzz, java
+import org.fenfire, java
 import jarray
 from org.fenfire.test.gfx import getvs
 from com.hp.hpl.mesa.rdf import jena
@@ -38,7 +38,7 @@
 
 subjectCmp = Cmp(lambda stmt: stmt.getSubject())
 objectCmp = Cmp(lambda stmt: stmt.getObject())
-selector = gzz.loom.StatementSelector.SimpleSelector()
+selector = org.fenfire.loom.StatementSelector.SimpleSelector()
 
 def list(set):
     l = []; i = set.iterator()
@@ -63,31 +63,31 @@
     for i in range(3,10):
         n[2].addProperty(p, n[i])
 
-    c = gzz.loom.Cursor(subjectCmp, objectCmp, selector)
+    c = org.fenfire.loom.Cursor(subjectCmp, objectCmp, selector)
 
 
 def testConstructors():
     sc, oc, sel = subjectCmp, objectCmp, selector
     
-    c = gzz.loom.Cursor(sc,oc,sel)
+    c = org.fenfire.loom.Cursor(sc,oc,sel)
     assert (c.getSubjectOrder(), c.getObjectOrder(),
             c.getStatementSelector()) == (sc, oc, sel)
     assert c.focus is None
     assert c.rotation == 0
 
-    c = gzz.loom.Cursor(sc,oc,sel,n[2])
+    c = org.fenfire.loom.Cursor(sc,oc,sel,n[2])
     assert (c.getSubjectOrder(), c.getObjectOrder(),
             c.getStatementSelector()) == (sc, oc, sel)
     assert c.focus == n[2]
     assert c.rotation == 0
 
-    c = gzz.loom.Cursor(sc,oc,sel,n[2],1,n[8])
+    c = org.fenfire.loom.Cursor(sc,oc,sel,n[2],1,n[8])
     assert (c.getSubjectOrder(), c.getObjectOrder(),
             c.getStatementSelector()) == (sc, oc, sel)
     assert c.focus == n[2]
     assert c.rotation == 2
 
-    c = gzz.loom.Cursor(sc,oc,sel,n[2],-1,n[1])
+    c = org.fenfire.loom.Cursor(sc,oc,sel,n[2],-1,n[1])
     assert (c.getSubjectOrder(), c.getObjectOrder(),
             c.getStatementSelector()) == (sc, oc, sel)
     assert c.focus == n[2]
Index: fenfire/org/fenfire/loom/Loom.java
diff -u fenfire/org/fenfire/loom/Loom.java:1.26 
fenfire/org/fenfire/loom/Loom.java:1.27
--- fenfire/org/fenfire/loom/Loom.java:1.26     Tue Mar 11 17:45:53 2003
+++ fenfire/org/fenfire/loom/Loom.java  Tue Mar 11 17:52:22 2003
@@ -24,7 +24,7 @@
 /*
  * Written by Benja Fallenstein
  */
-package gzz.loom;
+package org.fenfire.loom;
 import gzz.client.*;
 import gzz.vob.*;
 import gzz.vob.impl.DefaultVobMatcher;
Index: fenfire/org/fenfire/loom/ModelUtil.java
diff -u fenfire/org/fenfire/loom/ModelUtil.java:1.1 
fenfire/org/fenfire/loom/ModelUtil.java:1.2
--- fenfire/org/fenfire/loom/ModelUtil.java:1.1 Tue Mar 11 17:45:53 2003
+++ fenfire/org/fenfire/loom/ModelUtil.java     Tue Mar 11 17:52:22 2003
@@ -24,7 +24,7 @@
 /*
  * Written by Benja Fallenstein
  */
-package gzz.loom;
+package org.fenfire.loom;
 
 import java.util.*;
 import com.hp.hpl.mesa.rdf.jena.model.*;
Index: fenfire/org/fenfire/loom/ModelUtil.test
diff -u fenfire/org/fenfire/loom/ModelUtil.test:1.1 
fenfire/org/fenfire/loom/ModelUtil.test:1.2
--- fenfire/org/fenfire/loom/ModelUtil.test:1.1 Tue Mar 11 17:45:53 2003
+++ fenfire/org/fenfire/loom/ModelUtil.test     Tue Mar 11 17:52:22 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 #
 
-import gzz, java
+import org.fenfire, java
 import jarray
 from org.fenfire.test.gfx import getvs
 from com.hp.hpl.mesa.rdf import jena
@@ -33,14 +33,14 @@
     r = model.createProperty("http://fenfire.org/2003/02/test#";, 
"test-property-3")
     n = [model.createResource() for i in range(10)]
 
-    rdf = gzz.loom.RDFVocab(model)
+    rdf = org.fenfire.loom.RDFVocab(model)
 
 
 def testGetClasses():
     c, d = n[0], n[1]
 
     def get():
-        set = gzz.loom.ModelUtil.getClasses(model)
+        set = org.fenfire.loom.ModelUtil.getClasses(model)
 
         iter = set.iterator()
         while iter.hasNext():
@@ -68,7 +68,7 @@
 def testGetProperties():
 
     def get():
-        set = gzz.loom.ModelUtil.getProperties(model)
+        set = org.fenfire.loom.ModelUtil.getProperties(model)
         ps = [p, q, r, rdf._(3), rdf._(7)]
 
         iter = set.iterator()
Index: fenfire/org/fenfire/loom/NamespaceMap.java
diff -u fenfire/org/fenfire/loom/NamespaceMap.java:1.2 
fenfire/org/fenfire/loom/NamespaceMap.java:1.3
--- fenfire/org/fenfire/loom/NamespaceMap.java:1.2      Tue Mar 11 17:45:53 2003
+++ fenfire/org/fenfire/loom/NamespaceMap.java  Tue Mar 11 17:52:22 2003
@@ -24,7 +24,7 @@
 /*
  * Written by Benja Fallenstein
  */
-package gzz.loom;
+package org.fenfire.loom;
 import java.io.*;
 import java.util.*;
 import org.xml.sax.*;
Index: fenfire/org/fenfire/loom/NamespaceMap.test
diff -u fenfire/org/fenfire/loom/NamespaceMap.test:1.2 
fenfire/org/fenfire/loom/NamespaceMap.test:1.3
--- fenfire/org/fenfire/loom/NamespaceMap.test:1.2      Tue Mar 11 17:45:53 2003
+++ fenfire/org/fenfire/loom/NamespaceMap.test  Tue Mar 11 17:52:22 2003
@@ -19,10 +19,10 @@
 # MA  02111-1307  USA
 #
 
-import gzz, java
+import org.fenfire, java
 
 def testSimple():
-    map = gzz.loom.NamespaceMap()
+    map = org.fenfire.loom.NamespaceMap()
 
     assert map.getAbbrev("http://example.com/foo";) == \
            "http://example.com/foo";
@@ -45,7 +45,7 @@
     
 
 def testFromXML():
-    map = gzz.loom.NamespaceMap()
+    map = org.fenfire.loom.NamespaceMap()
     xml = """
         <one:xml xmlns:one="http://example.com/";
                  xmlns="http://example.net/FOO";>
@@ -71,7 +71,7 @@
     
 
 def testCompareByAbbrev():
-    map = gzz.loom.NamespaceMap()
+    map = org.fenfire.loom.NamespaceMap()
     map.put("one", "http://example.com/";)
     map.put("two", "mailto:foo@";)
 
Index: fenfire/org/fenfire/loom/NodeView.java
diff -u fenfire/org/fenfire/loom/NodeView.java:1.5 
fenfire/org/fenfire/loom/NodeView.java:1.6
--- fenfire/org/fenfire/loom/NodeView.java:1.5  Sat Mar  8 16:54:15 2003
+++ fenfire/org/fenfire/loom/NodeView.java      Tue Mar 11 17:52:22 2003
@@ -24,7 +24,7 @@
 /*
  * Written by Benja Fallenstein
  */
-package gzz.loom;
+package org.fenfire.loom;
 import gzz.vob.*;
 
 import com.hp.hpl.mesa.rdf.jena.model.*;
Index: fenfire/org/fenfire/loom/NodeView.test
diff -u fenfire/org/fenfire/loom/NodeView.test:1.2 
fenfire/org/fenfire/loom/NodeView.test:1.3
--- fenfire/org/fenfire/loom/NodeView.test:1.2  Sat Mar  8 16:54:15 2003
+++ fenfire/org/fenfire/loom/NodeView.test      Tue Mar 11 17:52:22 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 #
 
-from gzz.loom.NodeView import Nodespec as Spec
+from org.fenfire.loom.NodeView import Nodespec as Spec
 from com.hp.hpl.mesa.rdf import jena
 
 def setUp():
Index: fenfire/org/fenfire/loom/RDFVocab.java
diff -u fenfire/org/fenfire/loom/RDFVocab.java:1.1 
fenfire/org/fenfire/loom/RDFVocab.java:1.2
--- fenfire/org/fenfire/loom/RDFVocab.java:1.1  Tue Mar 11 17:45:53 2003
+++ fenfire/org/fenfire/loom/RDFVocab.java      Tue Mar 11 17:52:22 2003
@@ -24,7 +24,7 @@
 /*
  * Written by Benja Fallenstein
  */
-package gzz.loom;
+package org.fenfire.loom;
 
 import com.hp.hpl.mesa.rdf.jena.model.*;
 
Index: fenfire/org/fenfire/loom/SimpleOrder.java
diff -u fenfire/org/fenfire/loom/SimpleOrder.java:1.1 
fenfire/org/fenfire/loom/SimpleOrder.java:1.2
--- fenfire/org/fenfire/loom/SimpleOrder.java:1.1       Sat Mar  8 17:22:59 2003
+++ fenfire/org/fenfire/loom/SimpleOrder.java   Tue Mar 11 17:52:22 2003
@@ -24,7 +24,7 @@
 /*
  * Written by Benja Fallenstein
  */
-package gzz.loom;
+package org.fenfire.loom;
 
 import java.util.*;
 import com.hp.hpl.mesa.rdf.jena.model.*;
Index: fenfire/org/fenfire/loom/SimpleOrder.test
diff -u fenfire/org/fenfire/loom/SimpleOrder.test:1.1 
fenfire/org/fenfire/loom/SimpleOrder.test:1.2
--- fenfire/org/fenfire/loom/SimpleOrder.test:1.1       Sat Mar  8 17:22:59 2003
+++ fenfire/org/fenfire/loom/SimpleOrder.test   Tue Mar 11 17:52:22 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 #
 
-import gzz
+import org.fenfire
 from com.hp.hpl.mesa.rdf import jena
 
 def setUp():
@@ -31,8 +31,8 @@
     s = model.createResource("http://fenfire.org/2003/02/test#s";)
 
 def testSimple():
-    so = gzz.loom.SimpleOrder.subjOrder
-    oo = gzz.loom.SimpleOrder.objOrder
+    so = org.fenfire.loom.SimpleOrder.subjOrder
+    oo = org.fenfire.loom.SimpleOrder.objOrder
 
     S = model.createStatement
 
Index: fenfire/org/fenfire/loom/SimpleView.java
diff -u fenfire/org/fenfire/loom/SimpleView.java:1.5 
fenfire/org/fenfire/loom/SimpleView.java:1.6
--- fenfire/org/fenfire/loom/SimpleView.java:1.5        Tue Mar  4 11:49:25 2003
+++ fenfire/org/fenfire/loom/SimpleView.java    Tue Mar 11 17:52:22 2003
@@ -24,7 +24,7 @@
 /*
  * Written by Benja Fallenstein
  */
-package gzz.loom;
+package org.fenfire.loom;
 import gzz.client.*;
 import gzz.vob.*;
 import gzz.vob.vobs.*;
Index: fenfire/org/fenfire/loom/SimpleView.test
diff -u fenfire/org/fenfire/loom/SimpleView.test:1.8 
fenfire/org/fenfire/loom/SimpleView.test:1.9
--- fenfire/org/fenfire/loom/SimpleView.test:1.8        Fri Mar  7 15:48:10 2003
+++ fenfire/org/fenfire/loom/SimpleView.test    Tue Mar 11 17:52:22 2003
@@ -19,9 +19,9 @@
 # MA  02111-1307  USA
 #
 
-import gzz, java
+import org.fenfire, java
 import jarray
-import gzz.loom.NodeView.Nodespec as Spec
+import org.fenfire.loom.NodeView.Nodespec as Spec
 from org.fenfire.test.gfx import getvs
 from com.hp.hpl.mesa.rdf import jena
 
@@ -41,9 +41,9 @@
 
     nodes, dirs, props = {}, {}, {}
 
-    view = gzz.loom.SimpleView(NodeView())
+    view = org.fenfire.loom.SimpleView(NodeView())
     
-class NodeView(gzz.loom.NodeView):
+class NodeView(org.fenfire.loom.NodeView):
     def render(self, vs, cs, spec):
         nodes[spec.node] = cs
         dirs[spec.node] = spec.dir
@@ -66,9 +66,9 @@
     r.addProperty(p, t)
 
     vs = getvs()
-    cursor = gzz.loom.Cursor(Cmp(lambda stmt: stmt.getSubject()),
+    cursor = org.fenfire.loom.Cursor(Cmp(lambda stmt: stmt.getSubject()),
                              Cmp(lambda stmt: stmt.getObject()),
-                             gzz.loom.StatementSelector.SimpleSelector())
+                             
org.fenfire.loom.StatementSelector.SimpleSelector())
     cursor.set(r)
     view.render(vs, 0, cursor)
 
@@ -97,9 +97,9 @@
     w.addProperty(p, r)
 
     vs = getvs()
-    cursor = gzz.loom.Cursor(Cmp(lambda stmt: stmt.getSubject()),
+    cursor = org.fenfire.loom.Cursor(Cmp(lambda stmt: stmt.getSubject()),
                              Cmp(lambda stmt: stmt.getObject()),
-                             gzz.loom.StatementSelector.SimpleSelector(),
+                             
org.fenfire.loom.StatementSelector.SimpleSelector(),
                              r, 1, s)
     assert cursor.rotation == 0
     view.render(vs, 0, cursor)
Index: fenfire/org/fenfire/loom/StatementSelector.java
diff -u fenfire/org/fenfire/loom/StatementSelector.java:1.3 
fenfire/org/fenfire/loom/StatementSelector.java:1.4
--- fenfire/org/fenfire/loom/StatementSelector.java:1.3 Mon Mar 10 16:54:10 2003
+++ fenfire/org/fenfire/loom/StatementSelector.java     Tue Mar 11 17:52:22 2003
@@ -24,7 +24,7 @@
 /*
  * Written by Benja Fallenstein
  */
-package gzz.loom;
+package org.fenfire.loom;
 
 import java.util.*;
 import com.hp.hpl.mesa.rdf.jena.model.*;
Index: fenfire/org/fenfire/loom/View.java
diff -u fenfire/org/fenfire/loom/View.java:1.2 
fenfire/org/fenfire/loom/View.java:1.3
--- fenfire/org/fenfire/loom/View.java:1.2      Tue Mar  4 06:17:19 2003
+++ fenfire/org/fenfire/loom/View.java  Tue Mar 11 17:52:22 2003
@@ -24,7 +24,7 @@
 /*
  * Written by Benja Fallenstein
  */
-package gzz.loom;
+package org.fenfire.loom;
 import gzz.vob.*;
 import com.hp.hpl.mesa.rdf.jena.model.*;
 
Index: fenfire/org/fenfire/loom/WheelView.java
diff -u fenfire/org/fenfire/loom/WheelView.java:1.5 
fenfire/org/fenfire/loom/WheelView.java:1.6
--- fenfire/org/fenfire/loom/WheelView.java:1.5 Tue Mar  4 11:49:25 2003
+++ fenfire/org/fenfire/loom/WheelView.java     Tue Mar 11 17:52:22 2003
@@ -24,7 +24,7 @@
 /*
  * Written by Asko Soukka
  */
-package gzz.loom;
+package org.fenfire.loom;
 import gzz.client.*;
 import gzz.vob.*;
 import gzz.vob.vobs.*;
Index: fenfire/org/fenfire/loom/WheelView.test
diff -u fenfire/org/fenfire/loom/WheelView.test:1.8 
fenfire/org/fenfire/loom/WheelView.test:1.9
--- fenfire/org/fenfire/loom/WheelView.test:1.8 Fri Mar  7 15:48:11 2003
+++ fenfire/org/fenfire/loom/WheelView.test     Tue Mar 11 17:52:22 2003
@@ -19,10 +19,10 @@
 # MA  02111-1307  USA
 #
 
-import gzz, java
+import org.fenfire, java
 import jarray
 import math
-import gzz.loom.NodeView.Nodespec as Spec
+import org.fenfire.loom.NodeView.Nodespec as Spec
 from org.fenfire.test.gfx import getvs
 from com.hp.hpl.mesa.rdf import jena
 
@@ -42,9 +42,9 @@
 
     nodes, dirs, props = {}, {}, {}
 
-    view = gzz.loom.WheelView(NodeView())
+    view = org.fenfire.loom.WheelView(NodeView())
     
-class NodeView(gzz.loom.NodeView):
+class NodeView(org.fenfire.loom.NodeView):
     def render(self, vs, cs, spec):
         nodes[spec.node] = cs
         dirs[spec.node] = spec.dir
@@ -103,9 +103,9 @@
     w.addProperty(p, r)
 
     vs = getvs()
-    cursor = gzz.loom.Cursor(Cmp(lambda stmt: stmt.getSubject()),
+    cursor = org.fenfire.loom.Cursor(Cmp(lambda stmt: stmt.getSubject()),
                              Cmp(lambda stmt: stmt.getObject()),
-                             gzz.loom.StatementSelector.SimpleSelector(),
+                             
org.fenfire.loom.StatementSelector.SimpleSelector(),
                              r, 1, s)
     assert cursor.rotation == 0
     view.render(vs, 0, cursor)