[Gzz-commits] gzz ./Gzz.py ./TODO gfx/demo/viewtest.py gzz/vi...

[Asko Soukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Asko Soukka <address@hidden>    02/11/18 05:28:16

Modified files:
        .              : Gzz.py TODO 
        gfx/demo       : viewtest.py 
        gzz/view       : CellContentView.java DimDecorator.java 
                         LastOpDecorator.java 
                         LinebrokenCellContentView.java 
                         MarkDecorator.java TextCellContentView.java 
                         xubuoy.py 
        test/gzz       : Test.java 
        test/gzz/view  : renderscene.test 
Added files:
        gzz/view       : BoxCellView.java LollipopCellView.java 
        test/gzz/impl  : TestBoxCellView.java 
        test/gzz/view  : boxcellview.test 
Removed files:
        gzz/view       : CellVobFactory.java LollipopCellVobFactory.java 
        test/gzz/impl  : TestCellVobFactory.java 
        test/gzz/view  : cellvobfactory.test 

Log message:
        CellVobFactories renamed to CellViews

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Gzz.py.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/TODO.diff?tr1=1.402&tr2=1.403&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/demo/viewtest.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/BoxCellView.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/LollipopCellView.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CellContentView.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/DimDecorator.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/LastOpDecorator.java.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/LinebrokenCellContentView.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/MarkDecorator.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/TextCellContentView.java.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/xubuoy.py.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/Test.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/impl/TestBoxCellView.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/view/boxcellview.test?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/test/gzz/view/renderscene.test.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gzz/Gzz.py
diff -u gzz/Gzz.py:1.45 gzz/Gzz.py:1.46
--- gzz/Gzz.py:1.45     Sat Nov  9 10:07:08 2002
+++ gzz/Gzz.py  Mon Nov 18 05:28:15 2002
@@ -36,7 +36,7 @@
                       gzz.view.RowColView(0), gzz.view.RowColView(1),
                       ]
         self.viewSpecificBinders = java.util.HashMap()
-        self.cellView = gzz.view.CellVobFactory()
+        self.cellView = gzz.view.BoxCellView()
         self.cellContentView  = gzz.view.TextCellContentView(self.style)
         if self.gl:
             xubuoy = gzz.view.xubuoy.XuPDF_ViewBinder()
Index: gzz/TODO
diff -u gzz/TODO:1.402 gzz/TODO:1.403
--- gzz/TODO:1.402      Sat Nov 16 12:08:08 2002
+++ gzz/TODO    Mon Nov 18 05:28:15 2002
@@ -189,16 +189,14 @@
        + speed up tests: currently too much execfile().. could
          pre-compile and exec compiled in the same globals().
     humppake:
-       - CellVobFactories should be renamed to CellViews
-         - gzz.view, demos, test, some modules
         - rethink interfaces between PlainVanishing and VobScene
-         eg. correct implementation of LollipopCellVobFactor needs
+         eg. correct implementation of LollipopCellView needs
           to affect connections' coordsys (through box?)
            - first have to understand current interfaces :)
            - new PEG
            - UMLs would be good
            - more about PEG1018 - generalizing VobVanishingClient
-       - finish LollipopCellVobFactory (LollipopCellView)
+       - finish LollipopCellView
        - opengl demo, which uses view (made in python)
            + make brokentext demo work again 
        + fix the way nonlinearity of coordsys is handled.
Index: gzz/gfx/demo/viewtest.py
diff -u gzz/gfx/demo/viewtest.py:1.1 gzz/gfx/demo/viewtest.py:1.2
--- gzz/gfx/demo/viewtest.py:1.1        Fri Nov 15 09:30:19 2002
+++ gzz/gfx/demo/viewtest.py    Mon Nov 18 05:28:16 2002
@@ -17,7 +17,7 @@
 
 from gzz import Dim
 from gzz.client import GraphicsAPI
-from gzz.view import ViewContext, LollipopCellVobFactory, 
LinebrokenCellContentView, \
+from gzz.view import ViewContext, LollipopCellView, LinebrokenCellContentView, 
\
      View, TextCellContentView
 from gzz.impl import ModularSpace
 from gzz.zzutil.Ids import *
@@ -39,7 +39,7 @@
 
         self.d = [d1, d2, d3]
         self.v = TestView()
-        self.cv = LollipopCellVobFactory()
+        self.cv = LollipopCellView()
         self.ccv = LinebrokenCellContentView(self.style)
         self.home = self.space.getHomeCell()
 
Index: gzz/gzz/view/CellContentView.java
diff -u gzz/gzz/view/CellContentView.java:1.8 
gzz/gzz/view/CellContentView.java:1.9
--- gzz/gzz/view/CellContentView.java:1.8       Fri Nov  1 20:23:45 2002
+++ gzz/gzz/view/CellContentView.java   Mon Nov 18 05:28:16 2002
@@ -30,9 +30,9 @@
  *  For example, this could show some text or an image. It does not
  *  draw a box around the cell or anything like that;
  *  that is the responsibility of the CellView
- *  (currently CellVobFactory). The same content should be showable
+ *  (currently BoxCellView). The same content should be showable
  *  with different kinds of boxes.
  */
 public abstract class CellContentView extends CellInBox {
-public static final String rcsid = "$Id: CellContentView.java,v 1.8 2002/11/02 
01:23:45 benja Exp $";
+public static final String rcsid = "$Id: CellContentView.java,v 1.9 2002/11/18 
10:28:16 humppake Exp $";
 }
Index: gzz/gzz/view/DimDecorator.java
diff -u gzz/gzz/view/DimDecorator.java:1.14 gzz/gzz/view/DimDecorator.java:1.15
--- gzz/gzz/view/DimDecorator.java:1.14 Fri Nov  1 20:23:45 2002
+++ gzz/gzz/view/DimDecorator.java      Mon Nov 18 05:28:16 2002
@@ -34,12 +34,12 @@
  *  vob scene.
  */
 public class DimDecorator implements FallbackSceneDecorator {
-String rcsid = "$Id: DimDecorator.java,v 1.14 2002/11/02 01:23:45 benja Exp $";
+String rcsid = "$Id: DimDecorator.java,v 1.15 2002/11/18 10:28:16 humppake Exp 
$";
     public static boolean dbg = true;
     private static void p(String s) { if(dbg) pa(s); }
     private static void pa(String s) { System.err.println(s); }
 
-    static CellVobFactory cvf = new CellVobFactory();
+    static BoxCellView cvf = new BoxCellView();
     static TextStyle style = cvf.style;
     static float[] size = new float[2];
     static {
Index: gzz/gzz/view/LastOpDecorator.java
diff -u gzz/gzz/view/LastOpDecorator.java:1.21 
gzz/gzz/view/LastOpDecorator.java:1.22
--- gzz/gzz/view/LastOpDecorator.java:1.21      Fri Nov  1 20:23:45 2002
+++ gzz/gzz/view/LastOpDecorator.java   Mon Nov 18 05:28:16 2002
@@ -34,7 +34,7 @@
  *  directional op entered.
  */
 public class LastOpDecorator implements FallbackSceneDecorator {
-String rcsid = "$Id: LastOpDecorator.java,v 1.21 2002/11/02 01:23:45 benja Exp 
$";
+String rcsid = "$Id: LastOpDecorator.java,v 1.22 2002/11/18 10:28:16 humppake 
Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
@@ -42,7 +42,7 @@
        GraphicsAPI.getInstance().getTextStyle("SansSerif", Font.PLAIN, 16);
     static Object key = new Object();
     static SimpleLinebreaker breaker = new SimpleLinebreaker();
-    static CellVobFactory cvf = new CellVobFactory();
+    static BoxCellView cvf = new BoxCellView();
 
     int padding = 15;
 
Index: gzz/gzz/view/LinebrokenCellContentView.java
diff -u gzz/gzz/view/LinebrokenCellContentView.java:1.14 
gzz/gzz/view/LinebrokenCellContentView.java:1.15
--- gzz/gzz/view/LinebrokenCellContentView.java:1.14    Fri Nov  1 20:23:45 2002
+++ gzz/gzz/view/LinebrokenCellContentView.java Mon Nov 18 05:28:16 2002
@@ -1,5 +1,5 @@
 /*
-CellVobFactory.java
+BoxCellView.java
  *
  *    Copyright (c) 1999-2000, Ted Nelson and Tuomas Lukka
  *
@@ -40,7 +40,7 @@
  */
 
 public class LinebrokenCellContentView extends CellContentView {
-public static final String rcsid = "$Id: LinebrokenCellContentView.java,v 1.14 
2002/11/02 01:23:45 benja Exp $";
+public static final String rcsid = "$Id: LinebrokenCellContentView.java,v 1.15 
2002/11/18 10:28:16 humppake Exp $";
     public static boolean dbg = false;
     private static void p(String s) { if(dbg) pa(s); }
     private static void pa(String s) { System.err.println(s); }
Index: gzz/gzz/view/MarkDecorator.java
diff -u gzz/gzz/view/MarkDecorator.java:1.12 
gzz/gzz/view/MarkDecorator.java:1.13
--- gzz/gzz/view/MarkDecorator.java:1.12        Fri Nov  1 20:23:45 2002
+++ gzz/gzz/view/MarkDecorator.java     Mon Nov 18 05:28:16 2002
@@ -33,7 +33,7 @@
 public class MarkDecorator implements FallbackSceneDecorator {
     static Object KEY = new Object(), TEXT_KEY = new Object();
     static final int PAD = 10;
-    static CellView cv = new CellVobFactory();
+    static CellView cv = new BoxCellView();
     static TextStyle style =
        GraphicsAPI.getInstance().getTextStyle("SansSerif", Font.PLAIN, 12);
     static String str = "Marked cells:";
Index: gzz/gzz/view/TextCellContentView.java
diff -u gzz/gzz/view/TextCellContentView.java:1.23 
gzz/gzz/view/TextCellContentView.java:1.24
--- gzz/gzz/view/TextCellContentView.java:1.23  Mon Nov  4 17:15:04 2002
+++ gzz/gzz/view/TextCellContentView.java       Mon Nov 18 05:28:16 2002
@@ -1,5 +1,5 @@
 /*
-CellVobFactory.java
+BoxCellView.java
  *
  *    Copyright (c) 1999-2000, Ted Nelson and Tuomas Lukka
  *
@@ -39,7 +39,7 @@
  */
 
 public class TextCellContentView extends CellContentView {
-public static final String rcsid = "$Id: TextCellContentView.java,v 1.23 
2002/11/04 22:15:04 tjl Exp $";
+public static final String rcsid = "$Id: TextCellContentView.java,v 1.24 
2002/11/18 10:28:16 humppake Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.err.println(s); }
 
Index: gzz/gzz/view/xubuoy.py
diff -u gzz/gzz/view/xubuoy.py:1.31 gzz/gzz/view/xubuoy.py:1.32
--- gzz/gzz/view/xubuoy.py:1.31 Thu Nov 14 09:10:20 2002
+++ gzz/gzz/view/xubuoy.py      Mon Nov 18 05:28:16 2002
@@ -83,7 +83,7 @@
     
 style = GraphicsAPI.getInstance().getTextStyle("SansSerif", 
java.awt.Font.PLAIN, 10)
 contview = gzz.view.LinebrokenCellContentView(style)
-cellview = gzz.view.CellVobFactory(contview)
+cellview = gzz.view.BoxCellView(contview)
 
 class EmptyContext(gzz.view.ViewContext):
     emptylist = java.util.ArrayList()
Index: gzz/test/gzz/Test.java
diff -u gzz/test/gzz/Test.java:1.1 gzz/test/gzz/Test.java:1.2
--- gzz/test/gzz/Test.java:1.1  Wed Sep 11 02:16:56 2002
+++ gzz/test/gzz/Test.java      Mon Nov 18 05:28:16 2002
@@ -42,7 +42,7 @@
  */
 
 public class Test {
-public static final String rcsid = "$Id: Test.java,v 1.1 2002/09/11 06:16:56 
tjl Exp $";
+public static final String rcsid = "$Id: Test.java,v 1.2 2002/11/18 10:28:16 
humppake Exp $";
 
     public static File zdir;
     public static Mediaserver zms;
@@ -98,7 +98,7 @@
 
            suite.addTestSuite(gzz.impl.TestSimpleObsTrigger.class);
            suite.addTestSuite(gzz.impl.TestCloning.class);
-           suite.addTestSuite(gzz.impl.TestCellVobFactory.class);
+           suite.addTestSuite(gzz.impl.TestBoxCellView.class);
            suite.addTestSuite(gzz.impl.TestMSLeak.class);
            // The following has build problems: it's not passed to javac
            // for some reason. Comment out till this has been fixed,
Index: gzz/test/gzz/view/renderscene.test
diff -u gzz/test/gzz/view/renderscene.test:1.4 
gzz/test/gzz/view/renderscene.test:1.5
--- gzz/test/gzz/view/renderscene.test:1.4      Sun Nov 10 18:08:55 2002
+++ gzz/test/gzz/view/renderscene.test  Mon Nov 18 05:28:16 2002
@@ -29,7 +29,7 @@
 
 def testRenderScene():
     view = gzz.view.RowColView(0)
-    cellview = gzz.view.CellVobFactory()
+    cellview = gzz.view.BoxCellView()
     contentview = 
gzz.view.TextCellContentView(win.getGraphicsAPI().getTextStyle(
                                       "sans", 0, 20))