[Gzz-commits] gzz/gzz/modules/pp PPMouseEvents.java PPView2.j...

[Matti Katila]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Matti Katila <address@hidden>   03/01/03 14:40:57

Modified files:
        gzz/modules/pp : PPMouseEvents.java PPView2.java demotest.py 

Log message:
        clean

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPMouseEvents.java.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/PPView2.java.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/modules/pp/demotest.py.diff?tr1=1.39&tr2=1.40&r1=text&r2=text

Patches:
Index: gzz/gzz/modules/pp/PPMouseEvents.java
diff -u gzz/gzz/modules/pp/PPMouseEvents.java:1.14 
gzz/gzz/modules/pp/PPMouseEvents.java:1.15
--- gzz/gzz/modules/pp/PPMouseEvents.java:1.14  Fri Jan  3 14:05:24 2003
+++ gzz/gzz/modules/pp/PPMouseEvents.java       Fri Jan  3 14:40:57 2003
@@ -28,13 +28,12 @@
  */
 
 public class PPMouseEvents {
-public static final String rcsid = "$Id: PPMouseEvents.java,v 1.14 2003/01/03 
19:05:24 mudyc Exp $";
+public static final String rcsid = "$Id: PPMouseEvents.java,v 1.15 2003/01/03 
19:40:57 mudyc Exp $";
     public static boolean dbg = false;
     private static void pa(String s) { System.out.println(s); }
 
     private PPView2 ppv;
     PPActions ppactions;
-    Space space;
 
     private PPMouseEvents m_ev;
 
@@ -43,10 +42,9 @@
     public VobScene vs;
     public AbstractViewContext context;
 
-    public PPMouseEvents(PPView2 pv, PPActions pa, Space s) {
+    public PPMouseEvents(PPView2 pv, PPActions pa) {
        this.ppv = pv;
        this.ppactions = pa;
-       this.space = s;
        this.m_ev = this;
 
        // press state saving
@@ -183,9 +181,9 @@
            try {
                pa("Deleting paper!");
                Cell c = context.getAccursed();
-               if (space.getHomeCell() != c) {
+               if (ppv.space.getHomeCell() != c) {
                    ppactions.deletePaper(c.getId() );
-                   context.setAccursed(space.getHomeCell());
+                   context.setAccursed(ppv.space.getHomeCell());
                }
            } catch (Exception e) { pa(e.getMessage()); }
            AbstractUpdateManager.chg();
Index: gzz/gzz/modules/pp/PPView2.java
diff -u gzz/gzz/modules/pp/PPView2.java:1.38 
gzz/gzz/modules/pp/PPView2.java:1.39
--- gzz/gzz/modules/pp/PPView2.java:1.38        Fri Jan  3 14:05:24 2003
+++ gzz/gzz/modules/pp/PPView2.java     Fri Jan  3 14:40:57 2003
@@ -36,7 +36,7 @@
 import java.util.*;
 
 public class PPView2 implements View {
-public static final String rcsid = "$Id: PPView2.java,v 1.38 2003/01/03 
19:05:24 mudyc Exp $";
+public static final String rcsid = "$Id: PPView2.java,v 1.39 2003/01/03 
19:40:57 mudyc Exp $";
     public static boolean dbg = true;
     private static void pa(String s) { System.err.println(s); }
 
@@ -137,7 +137,7 @@
     public boolean useStencil = true;
 
     private PPActions ppactions;
-    Space space;
+    public Space space;
     public PPDims d;
 
     Vob black = GLCache.getCallList("Color 0 0 0\n");
@@ -323,7 +323,7 @@
        this.window = w;
        this.coordinatePlaneView = new CoordinatePlaneView(d.contains, d.pan);
        this.ppactions = ppactions;
-       pp_events = new PPMouseEvents(this, ppactions, space);
+       pp_events = new PPMouseEvents(this, ppactions);
     }
 
     TextStyle style = GraphicsAPI.getInstance().getTextStyle("Sans", 0, 20);
Index: gzz/gzz/modules/pp/demotest.py
diff -u gzz/gzz/modules/pp/demotest.py:1.39 gzz/gzz/modules/pp/demotest.py:1.40
--- gzz/gzz/modules/pp/demotest.py:1.39 Fri Jan  3 14:05:24 2003
+++ gzz/gzz/modules/pp/demotest.py      Fri Jan  3 14:40:57 2003
@@ -80,6 +80,22 @@
        self.mode = 0
         self.space = space
 
+        # Next, the mediaserver we'll save to.
+        self.ms = gzz.mediaserver.SimpleMediaserver(
+            gzz.mediaserver.storage.DirStorer(File("/tmp/pp/")))
+
+        # We'll use a fake mediaserver pointer
+        self.pointer_id = "FOO"
+
+        # We need to get a "filer" for storing versions of our space.
+        # Accept this part as 'magic' for now...
+        self.filers = gzz.mediaserver.MediaserverFiler.Group(
+            gzz.slices.SliceVersion.EMPTY_VERSION, self.ms,
+            gzz.slices.YAMLVersionFormatter.YAMLVersionFormat(self.ms, 
enfMaker))
+
+        self.filer = self.filers.getFiler("FOO")
+
+
     def key(self, key):
        if key == "Ctrl-I":
            print "INTERPLIST"
@@ -89,42 +105,15 @@
             print 'Save...'
             print 'Be sure you got "/tmp/pp/" directory'
 
-            # Next, the mediaserver we'll save to.
-            ms = gzz.mediaserver.SimpleMediaserver(
-                gzz.mediaserver.storage.DirStorer(File("/tmp/pp/")))
-
-            # We'll use a fake mediaserver pointer
-            pointer_id = "FOObar"
-
-            # We need to get a "filer" for storing versions of our space.
-            # Accept this part as 'magic' for now...
-            filers = gzz.mediaserver.MediaserverFiler.Group(
-                gzz.slices.SliceVersion.EMPTY_VERSION, ms,
-                gzz.slices.YAMLVersionFormatter.YAMLVersionFormat(ms, 
enfMaker))
-            filer = filers.getFiler("FOObar")
-
             # Now, saving the space is a one-liner:
-            filers.saveAll(self.space.getSlicer().exportAll())
+            self.filers.saveAll(self.ppv.space.getSlicer().exportAll())
             
+        # Loading
         if key == "Ctrl-Z":
             print 'Loading scene'
+            self.space = gzz.impl.ModularSpace(self.filer.load(), 
*tools.spaceArgList())
+            self.ppv.space = self.space
 
-            # Next, the mediaserver we'll save to.
-            ms = gzz.mediaserver.SimpleMediaserver(
-                gzz.mediaserver.storage.DirStorer(File("/tmp/pp/")))
-
-            # We'll use a fake mediaserver pointer
-            pointer_id = "FOObar"
-
-            # We need to get a "filer" for storing versions of our space.
-            # Accept this part as 'magic' for now...
-            filers = gzz.mediaserver.MediaserverFiler.Group(
-                gzz.slices.SliceVersion.EMPTY_VERSION, ms,
-                gzz.slices.YAMLVersionFormatter.YAMLVersionFormat(ms, 
enfMaker))
-            filer = filers.getFiler("FOObar")
-
-            # Loading:
-            self.space = gzz.impl.ModularSpace(filer.load(), 
*tools.spaceArgList())
             
        if key == "Ctrl-P":
            rotatelist(self.poly)