[Gzz-commits] fenfire lib/libvob.jar org/fenfire/loom/Loom.ja...

[Benja Fallenstein]

CVSROOT:        /cvsroot/fenfire
Module name:    fenfire
Changes by:     Benja Fallenstein <address@hidden>      03/03/16 11:24:12

Modified files:
        lib            : libvob.jar 
        org/fenfire/loom: Loom.java LoomMenuBar.java NodeView.java 
                          PropertiesBox.java SimpleView.java View.java 
                          WheelView.java 
        org/fenfire/test: gfx.py test.py 
Added files:
        org/fenfire/util: Dbg.java __init__.py dbg.py 
Removed files:
        org/fenfire/test: dbg.py 

Log message:
        The big move to the real libvob

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/lib/libvob.jar.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/Loom.java.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/LoomMenuBar.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/NodeView.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/PropertiesBox.java.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.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/View.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/loom/WheelView.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/test/gfx.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/test/test.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/Dbg.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/fenfire/org/fenfire/util/dbg.py?rev=1.1

Patches:
Index: fenfire/lib/libvob.jar
Index: fenfire/org/fenfire/loom/Loom.java
diff -u fenfire/org/fenfire/loom/Loom.java:1.38 
fenfire/org/fenfire/loom/Loom.java:1.39
--- fenfire/org/fenfire/loom/Loom.java:1.38     Sun Mar 16 08:44:14 2003
+++ fenfire/org/fenfire/loom/Loom.java  Sun Mar 16 11:24:12 2003
@@ -25,10 +25,9 @@
  * Written by Benja Fallenstein
  */
 package org.fenfire.loom;
-import gzz.client.*;
-import gzz.vob.*;
-import gzz.vob.impl.DefaultVobMatcher;
-import gzz.vob.vobs.*;
+import org.nongnu.libvob.*;
+import org.nongnu.libvob.impl.DefaultVobMatcher;
+import org.nongnu.libvob.vobs.*;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -341,7 +340,7 @@
        api.startUpdateManager(new Runnable() {
                public void run() {
                    Screen scr = new Screen(api.createWindow(), b, s);
-                   frame = ((gzz.client.awt.FrameScreen)scr.window)
+                   frame = ((org.nongnu.libvob.impl.awt.FrameScreen)scr.window)
                        .getFrame();
                    frame.setTitle("Fenfire Loom");
 
Index: fenfire/org/fenfire/loom/LoomMenuBar.java
diff -u fenfire/org/fenfire/loom/LoomMenuBar.java:1.1 
fenfire/org/fenfire/loom/LoomMenuBar.java:1.2
--- fenfire/org/fenfire/loom/LoomMenuBar.java:1.1       Sun Mar 16 08:44:14 2003
+++ fenfire/org/fenfire/loom/LoomMenuBar.java   Sun Mar 16 11:24:12 2003
@@ -26,7 +26,7 @@
  */
 package org.fenfire.loom;
 
-import gzz.client.*;
+import org.nongnu.libvob.*;
 
 import java.awt.*;
 import java.awt.event.*;
Index: fenfire/org/fenfire/loom/NodeView.java
diff -u fenfire/org/fenfire/loom/NodeView.java:1.6 
fenfire/org/fenfire/loom/NodeView.java:1.7
--- fenfire/org/fenfire/loom/NodeView.java:1.6  Tue Mar 11 17:52:22 2003
+++ fenfire/org/fenfire/loom/NodeView.java      Sun Mar 16 11:24:12 2003
@@ -25,7 +25,7 @@
  * Written by Benja Fallenstein
  */
 package org.fenfire.loom;
-import gzz.vob.*;
+import org.nongnu.libvob.*;
 
 import com.hp.hpl.mesa.rdf.jena.model.*;
 
Index: fenfire/org/fenfire/loom/PropertiesBox.java
diff -u fenfire/org/fenfire/loom/PropertiesBox.java:1.1 
fenfire/org/fenfire/loom/PropertiesBox.java:1.2
--- fenfire/org/fenfire/loom/PropertiesBox.java:1.1     Sat Mar 15 16:57:59 2003
+++ fenfire/org/fenfire/loom/PropertiesBox.java Sun Mar 16 11:24:12 2003
@@ -26,7 +26,7 @@
  */
 package org.fenfire.loom;
 
-import gzz.client.AbstractUpdateManager;
+import org.nongnu.libvob.AbstractUpdateManager;
 
 import java.awt.*;
 import java.awt.event.*;
Index: fenfire/org/fenfire/loom/SimpleView.java
diff -u fenfire/org/fenfire/loom/SimpleView.java:1.7 
fenfire/org/fenfire/loom/SimpleView.java:1.8
--- fenfire/org/fenfire/loom/SimpleView.java:1.7        Thu Mar 13 11:42:27 2003
+++ fenfire/org/fenfire/loom/SimpleView.java    Sun Mar 16 11:24:12 2003
@@ -25,9 +25,8 @@
  * Written by Benja Fallenstein
  */
 package org.fenfire.loom;
-import gzz.client.*;
-import gzz.vob.*;
-import gzz.vob.vobs.*;
+import org.nongnu.libvob.*;
+import org.nongnu.libvob.vobs.*;
 
 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.3 
fenfire/org/fenfire/loom/View.java:1.4
--- fenfire/org/fenfire/loom/View.java:1.3      Tue Mar 11 17:52:22 2003
+++ fenfire/org/fenfire/loom/View.java  Sun Mar 16 11:24:12 2003
@@ -25,7 +25,7 @@
  * Written by Benja Fallenstein
  */
 package org.fenfire.loom;
-import gzz.vob.*;
+import org.nongnu.libvob.*;
 import com.hp.hpl.mesa.rdf.jena.model.*;
 
 /** A simple RDF structure view.
Index: fenfire/org/fenfire/loom/WheelView.java
diff -u fenfire/org/fenfire/loom/WheelView.java:1.10 
fenfire/org/fenfire/loom/WheelView.java:1.11
--- fenfire/org/fenfire/loom/WheelView.java:1.10        Thu Mar 13 12:41:36 2003
+++ fenfire/org/fenfire/loom/WheelView.java     Sun Mar 16 11:24:12 2003
@@ -25,9 +25,8 @@
  * Written by Asko Soukka
  */
 package org.fenfire.loom;
-import gzz.client.*;
-import gzz.vob.*;
-import gzz.vob.vobs.*;
+import org.nongnu.libvob.*;
+import org.nongnu.libvob.vobs.*;
 
 import java.lang.Math;
 import java.util.*;
Index: fenfire/org/fenfire/test/gfx.py
diff -u fenfire/org/fenfire/test/gfx.py:1.2 fenfire/org/fenfire/test/gfx.py:1.3
--- fenfire/org/fenfire/test/gfx.py:1.2 Tue Mar 11 09:33:44 2003
+++ fenfire/org/fenfire/test/gfx.py     Sun Mar 16 11:24:12 2003
@@ -1,20 +1,20 @@
 # 
 # Copyright (c) 2003, Tuomas J. Lukka
 # 
-# This file is part of Gzz.
+# This file is part of Fenfire.
 # 
-# Gzz is free software; you can redistribute it and/or modify it under
+# Fenfire is free software; you can redistribute it and/or modify it under
 # the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 # 
-# Gzz is distributed in the hope that it will be useful, but WITHOUT
+# Fenfire is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
 # Public License for more details.
 # 
 # You should have received a copy of the GNU Lesser General
-# Public License along with Gzz; if not, write to the Free
+# Public License along with Fenfire; if not, write to the Free
 # Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA  02111-1307  USA
 # 
@@ -24,29 +24,28 @@
 from jarray import array, zeros
 
 from java.awt import Color
-from gzz.vob import *
-from gzz.vob.vobs import *
-import gzz
+from org.nongnu.libvob import *
+from org.nongnu.libvob.vobs import *
+
+import org
 
 print "Init test.gfx"
-print dir(gzz)
-print dir(gzz.client)
 
 _didRender = 0
 
-_realwin = gzz.client.GraphicsAPI.getInstance().createWindow()
+_realwin = org.nongnu.libvob.GraphicsAPI.getInstance().createWindow()
 _realwin.setLocation(0, 0, 600, 600)
 
-if gzz.client.GraphicsAPI.getInstance().getTypeString() == "gl":
-    from gzz.gfx.gl import GL
+if org.nongnu.libvob.GraphicsAPI.getInstance().getTypeString() == "gl":
+    from org.nongnu.libvob.gl import GL
     if GL.workaroundStupidBuggyAtiDrivers:
        # Sorry, ATI doesn't let us use pbuffers on R300 except in FireGL.
        # Because of that, don't put another window in front when using
        # this.
        win = _realwin
     else:
-       win = gzz.client.GraphicsAPI.getInstance().createStableOffscreen(500, 
500)
-       from gzz.gfx.gl import GL, GLCache, GLRen
+       win = 
org.nongnu.libvob.GraphicsAPI.getInstance().createStableOffscreen(500, 500)
+       from org.nongnu.libvob.gl import GL, GLCache, GLRen
        _buf = GL.createByteVector(500*500*3)
        _drawbufvs = _realwin.createVobScene()
        _drawbufvs.map.put(SolidBackdropVob(Color(0, 0, 0.2)))
@@ -86,7 +85,7 @@
 def getAvgColor(x, y, w, h):
     
     colors = win.readPixels(x, y, w, h)
-    color = gzz.util.ColorUtil.avgColor(colors)
+    color = org.nongnu.libvob.util.ColorUtil.avgColor(colors)
     return [c*255 for c in color.getComponents(None)]
 
 def checkAvgColor(x, y, w, h, color, delta=10):
Index: fenfire/org/fenfire/test/test.py
diff -u fenfire/org/fenfire/test/test.py:1.4 
fenfire/org/fenfire/test/test.py:1.5
--- fenfire/org/fenfire/test/test.py:1.4        Tue Mar  4 05:50:43 2003
+++ fenfire/org/fenfire/test/test.py    Sun Mar 16 11:24:12 2003
@@ -38,12 +38,12 @@
 import sys
 #sys.path.insert(0, ".")
 import os.path, imp
-import java, gzz
+import java
 import getopt
 import fnmatch
 import re
 import traceback
-import org.fenfire.test.dbg
+import org.fenfire.util.dbg
 
 def test(module):
     tests = [test for test in dir(module) if test.startswith('test')]
@@ -139,12 +139,12 @@
     runfail = [None]
     
     opts, args = getopt.getopt(args, 
-            org.fenfire.test.dbg.short + "f:", 
-            org.fenfire.test.dbg.long + ["--allowfail="])
+            org.fenfire.util.dbg.short + "f:", 
+            org.fenfire.util.dbg.long + ["--allowfail="])
     for o,a in opts:
         print "Opt: ",o,a
-        if o in gzz.util.dbg.all:
-            gzz.util.dbg.option(o,a)
+        if o in org.fenfire.util.dbg.all:
+            org.fenfire.util.dbg.option(o,a)
         elif o in ("-f", "--allowfail"):
             if a == "*":
                 runfail = ["GL", "AWT", "*"]
@@ -177,7 +177,7 @@
 
             java.lang.System.exit(exceptions != [])
 
-    gzz.client.GraphicsAPI.getInstance().startUpdateManager(Starter(dirs))
+    
org.nongnu.libvob.GraphicsAPI.getInstance().startUpdateManager(Starter(dirs))
 
 
 if __name__ == '__main__':