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

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/10/02 14:55:10

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

Log message:
        now able to use special binders for each view

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Gzz.py.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/Fallback.java.diff?tr1=1.44&tr2=1.45&r1=text&r2=text

Patches:
Index: gzz/Gzz.py
diff -c gzz/Gzz.py:1.38 gzz/Gzz.py:1.39
*** gzz/Gzz.py:1.38     Tue Oct  1 13:08:56 2002
--- gzz/Gzz.py  Wed Oct  2 14:55:09 2002
***************
*** 8,13 ****
--- 8,14 ----
  import java.lang
  import java.io
  import java.awt.Font
+ import java.util
  
  # Gzz imports
  import gzz
***************
*** 34,43 ****
          #   gzz.gfx.gl.debugswitches.DebugSwitches(gldbg)
          self.style = self.graphicsAPI.getTextStyle("SansSerif", 
java.awt.Font.PLAIN, 10);
          self.views = [gzz.view.VobVanishingClient(), gzz.view.RowColView(0), 
gzz.view.RowColView(1), gzz.view.FullScreenView()]
          self.cellView = gzz.view.CellVobFactory()
          self.cellContentView = 
gzz.view.MultitypeCellContentView(gzz.view.TextCellContentView(self.style), 
gzz.view.pagespanview.ContentView())
          gzz.client.Fallback(self.space.getHomeCell(), self.linkSpace, 
!                             self.dimensions, self.views, self.cellView, 
                              self.cellContentView, self.filers)
          gzz.client.AbstractUpdateManager.chg()
  
--- 35,46 ----
          #   gzz.gfx.gl.debugswitches.DebugSwitches(gldbg)
          self.style = self.graphicsAPI.getTextStyle("SansSerif", 
java.awt.Font.PLAIN, 10);
          self.views = [gzz.view.VobVanishingClient(), gzz.view.RowColView(0), 
gzz.view.RowColView(1), gzz.view.FullScreenView()]
+         self.viewSpecificBinders = java.util.HashMap()
          self.cellView = gzz.view.CellVobFactory()
          self.cellContentView = 
gzz.view.MultitypeCellContentView(gzz.view.TextCellContentView(self.style), 
gzz.view.pagespanview.ContentView())
          gzz.client.Fallback(self.space.getHomeCell(), self.linkSpace, 
!                             self.dimensions, self.views, 
!                             self.viewSpecificBinders, self.cellView, 
                              self.cellContentView, self.filers)
          gzz.client.AbstractUpdateManager.chg()
  
Index: gzz/gzz/client/Fallback.java
diff -c gzz/gzz/client/Fallback.java:1.44 gzz/gzz/client/Fallback.java:1.45
*** gzz/gzz/client/Fallback.java:1.44   Wed Oct  2 14:40:43 2002
--- gzz/gzz/client/Fallback.java        Wed Oct  2 14:55:10 2002
***************
*** 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.44 2002/10/02 
18:40:43 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.45 2002/10/02 
18:55:10 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 116,121 ****
--- 116,126 ----
      public View[] viewList;
      public DefaultBinder binder = new DefaultBinder(this);
      
+     /** FallbackBinder objects only used when a given view is active.
+      *  Maps views to binders.
+      */
+     Map viewSpecificBinders;
+     
      CellView cellView;
      CellContentView cellContentView;
  
***************
*** 270,276 ****
          public void timeout(Object o) {}
        public void windowClosed() { getBinder().windowClosed(this); }
          
!         public FallbackBinder getBinder() { return binder; }
  
        Win(ColorScheme colors) {
            for(int i=0; i<dimsIndices.length; i++)
--- 275,285 ----
          public void timeout(Object o) {}
        public void windowClosed() { getBinder().windowClosed(this); }
          
!         public FallbackBinder getBinder() { 
!             if(viewSpecificBinders.get(getView()) != null)
!                 return (FallbackBinder)viewSpecificBinders.get(getView());
!             return binder; 
!         }
  
        Win(ColorScheme colors) {
            for(int i=0; i<dimsIndices.length; i++)
***************
*** 328,337 ****
      }
  
      public Fallback(Cell start, Space linkSpace, FallbackDim[] dimList,
!                     View[] viewList, CellView cellView,
                      CellContentView cellContentView, Filer.Group filers) {
        this.dimList = dimList;
          this.viewList = viewList;
        this.filers = filers;
        this.space = start.space;
          this.linkSpace = linkSpace;
--- 337,347 ----
      }
  
      public Fallback(Cell start, Space linkSpace, FallbackDim[] dimList,
!                     View[] viewList, Map viewSpecificBinders, CellView 
cellView,
                      CellContentView cellContentView, Filer.Group filers) {
        this.dimList = dimList;
          this.viewList = viewList;
+         this.viewSpecificBinders = viewSpecificBinders;
        this.filers = filers;
        this.space = start.space;
          this.linkSpace = linkSpace;