[Gzz-commits] gzz ./Gzz.py gzz/client/Fallback.java gzz/view/...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/09/28 14:45:15

Modified files:
        .              : Gzz.py 
        gzz/client     : Fallback.java 
        gzz/view       : FallbackBinder.java 

Log message:
        Use second space in client, for storing links

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Gzz.py.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/Fallback.java.diff?tr1=1.39&tr2=1.40&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/FallbackBinder.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: gzz/Gzz.py
diff -c gzz/Gzz.py:1.32 gzz/Gzz.py:1.33
*** gzz/Gzz.py:1.32     Wed Sep 25 05:45:01 2002
--- gzz/Gzz.py  Sat Sep 28 14:45:14 2002
***************
*** 32,38 ****
          #   import gzz.gfx.gl.debugswitches
          #   gzz.gfx.gl.debugswitches.DebugSwitches(gldbg)
          self.views = [gzz.view.VobVanishingClient(), gzz.view.RowColView(0), 
gzz.view.RowColView(1)]
!         gzz.client.Fallback(self.space.getHomeCell(), self.dimensions, 
self.views, self.filers)
          gzz.client.AbstractUpdateManager.chg()
  
  
--- 32,38 ----
          #   import gzz.gfx.gl.debugswitches
          #   gzz.gfx.gl.debugswitches.DebugSwitches(gldbg)
          self.views = [gzz.view.VobVanishingClient(), gzz.view.RowColView(0), 
gzz.view.RowColView(1)]
!         gzz.client.Fallback(self.space.getHomeCell(), self.linkSpace, 
self.dimensions, self.views, self.filers)
          gzz.client.AbstractUpdateManager.chg()
  
  
***************
*** 55,64 ****
      def set_defaults(self):
          self.spanType = java.lang.System.getProperty("gzz.spanType")
          self.spaceType = java.lang.System.getProperty("gzz.spaceType")
!         self.obsTrigger = gzz.impl.SimpleObsTrigger();
          self.cellManager = gzz.impl.PlainCellManager()
          self.identityManager = gzz.impl.DummyIdentityManager()
          self.slicer = gzz.impl.SingleSlicer("gzz_fallback_slice")
          self.enfMaker = gzz.media.impl.Enfilade1DImpl.Enfilade1DImplMaker()
          self.cacheStorer = None
  
--- 55,67 ----
      def set_defaults(self):
          self.spanType = java.lang.System.getProperty("gzz.spanType")
          self.spaceType = java.lang.System.getProperty("gzz.spaceType")
!         self.obsTrigger = gzz.impl.SimpleObsTrigger()
          self.cellManager = gzz.impl.PlainCellManager()
+         self.linkCellManager = gzz.impl.PlainCellManager()
          self.identityManager = gzz.impl.DummyIdentityManager()
+         self.linkIdentityManager = gzz.impl.DummyIdentityManager()
          self.slicer = gzz.impl.SingleSlicer("gzz_fallback_slice")
+         self.linkSlicer = gzz.impl.SingleSlicer("gzz_fallback_slice_links")
          self.enfMaker = gzz.media.impl.Enfilade1DImpl.Enfilade1DImplMaker()
          self.cacheStorer = None
  
***************
*** 95,100 ****
--- 98,110 ----
              self.version = self.filers.getFiler("gzz_fallback_slice").load()
              self.space = gzz.impl.ModularSpace(self.version, self.cellTexter, 
self.cellManager, 
                      self.dimManager, self.identityManager, self.slicer, 
self.obsTrigger)
+                     
+             self.linkCellTexter = 
gzz.impl.SimpleVStreamTexter(self.spanMaker, self.enfMaker, self.enfAligner)
+             self.linkDimManager = gzz.impl.SimpleDim.SimpleDimManager()
+             self.linkVersion = 
self.filers.getFiler("gzz_fallback_slice_links").load()
+             self.linkSpace = gzz.impl.ModularSpace(self.linkVersion, 
self.linkCellTexter, self.linkCellManager, 
+                     self.linkDimManager, self.linkIdentityManager, 
self.linkSlicer, self.obsTrigger)
+                     
              self.dimensions = [
              gzz.client.Fallback.FallbackDim(s, self.space.getDim(id)) for (s, 
id)
                  in  (("d.1", gzz.zzutil.Ids.d_1), ("d.2", gzz.zzutil.Ids.d_2),
Index: gzz/gzz/client/Fallback.java
diff -c gzz/gzz/client/Fallback.java:1.39 gzz/gzz/client/Fallback.java:1.40
*** gzz/gzz/client/Fallback.java:1.39   Sat Sep 28 13:50:35 2002
--- gzz/gzz/client/Fallback.java        Sat Sep 28 14:45:15 2002
***************
*** 24,29 ****
--- 24,30 ----
  import gzz.*;
  import gzz.errors.*;
  import gzz.impl.*;
+ import gzz.index.*;
  import gzz.mediaserver.*;
  import gzz.mediaserver.storage.*;
  import gzz.util.Filer;
***************
*** 72,78 ****
   * It implements a subset of the 0.6.0 bindings.
   */
  public class Fallback {
! public static final String rcsid = "$Id: Fallback.java,v 1.39 2002/09/28 
17:50:35 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
--- 73,79 ----
   * It implements a subset of the 0.6.0 bindings.
   */
  public class Fallback {
! public static final String rcsid = "$Id: Fallback.java,v 1.40 2002/09/28 
18:45:15 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 102,107 ****
--- 103,116 ----
      /** The group of filers we use for saving.
       */
      public Filer.Group filers;
+     
+     /** The XuIndexer-- in a different space for now.
+      */
+     public XuIndexer xuIndexer;
+     
+     /** The Space we use for xu links for now.
+      */
+     public Space linkSpace;
  
      public Space space;
      public View[] viewList;
***************
*** 286,297 ****
        return w;
      }
  
!     public Fallback(Cell start, FallbackDim[] dimList,
                      View[] viewList, Filer.Group filers) {
        this.dimList = dimList;
          this.viewList = viewList;
        this.filers = filers;
        this.space = start.space;
  
          /*
        windows[0] = new Win(new Color(163, 255, 26),
--- 295,309 ----
        return w;
      }
  
!     public Fallback(Cell start, Space linkSpace, FallbackDim[] dimList,
                      View[] viewList, Filer.Group filers) {
        this.dimList = dimList;
          this.viewList = viewList;
        this.filers = filers;
        this.space = start.space;
+         this.linkSpace = linkSpace;
+         
+         xuIndexer = IndexManager.getXuIndexer(linkSpace);
  
          /*
        windows[0] = new Win(new Color(163, 255, 26),
Index: gzz/gzz/view/FallbackBinder.java
diff -c gzz/gzz/view/FallbackBinder.java:1.17 
gzz/gzz/view/FallbackBinder.java:1.18
*** gzz/gzz/view/FallbackBinder.java:1.17       Sat Sep 28 13:18:11 2002
--- gzz/gzz/view/FallbackBinder.java    Sat Sep 28 14:45:15 2002
***************
*** 33,38 ****
--- 33,40 ----
  import java.awt.event.*;
  import org.python.util.PythonInterpreter;
  import gzz.vob.*;
+ import gzz.index.*;
+ import gzz.media.*;
  import gzz.fuzzy.EnfiladeAligner;
  
  import java.awt.*;
***************
*** 40,46 ****
  /** Keybindings for the Fallback client.
   */
  public class FallbackBinder {
! public static final String rcsid = "$Id: FallbackBinder.java,v 1.17 
2002/09/28 17:18:11 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
--- 42,48 ----
  /** Keybindings for the Fallback client.
   */
  public class FallbackBinder {
! public static final String rcsid = "$Id: FallbackBinder.java,v 1.18 
2002/09/28 18:45:15 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 235,240 ****
--- 237,244 ----
            save();
        } else if(k.equals("Ctrl-E")) {
            editPlainText(fallback.windows[1].cursor);
+         } else if(k.equals("Ctrl-L")) {
+             makeLink();
          } else if(k.equals("Ctrl-F")) {
              fallback.mode = fallback.SEARCH;
              buffer = "";
***************
*** 395,400 ****
--- 399,422 ----
          w.viewIndex += dir;
          if(w.viewIndex < 0) w.viewIndex = fallback.viewList.length - 1;
          else if(w.viewIndex >= fallback.viewList.length) w.viewIndex = 0;
+     }
+     
+     void makeLink() {
+         Cell c = fallback.windows[1].cursor;
+         VStreamCellTexter ct = (VStreamCellTexter)c.space.getCellTexter();
+         Enfilade1D from = ct.getEnfilade(c, null);
+         
+         Enfilade1D to = from.getMaker().makeEnfilade();
+         for(Iterator i=marks.iterator(); i.hasNext();) {
+             Mark m = (Mark)i.next();
+             to = to.plus(m.getEnfilade());
+         }
+         
+         XuLink l = new XuLink(from, to);
+         fallback.xuIndexer.add(l);
+         
+         marks = new ArrayList();
+         markedCells = new HashSet();
      }
  
      /** Edit a cell's content as plain text.