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

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/10/01 09:06:10

Modified files:
        .              : Gzz.py 
        gzz/client     : Fallback.java 
        gzz/mediaserver: MediaserverFiler.java 
        gzz/view       : CellVobFactory.java ViewContext.java 
                         VobVanishingClient.java ZZViewContext.java 
                         pagespanview.py 
        gzz/vob        : HBox.java 

Log message:
        supply CellView and CellContentView in Gzz.py
        (this not only makes things more configurable, but
        also makes it easier to supply Python impls)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Gzz.py.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/client/Fallback.java.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/mediaserver/MediaserverFiler.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CellVobFactory.java.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/ViewContext.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/VobVanishingClient.java.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/ZZViewContext.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/pagespanview.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/vob/HBox.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gzz/Gzz.py
diff -c gzz/Gzz.py:1.35 gzz/Gzz.py:1.36
*** gzz/Gzz.py:1.35     Mon Sep 30 05:26:58 2002
--- gzz/Gzz.py  Tue Oct  1 09:06:10 2002
***************
*** 7,12 ****
--- 7,13 ----
  # java imports
  import java.lang
  import java.io
+ import java.awt.Font
  
  # Gzz imports
  import gzz
***************
*** 31,38 ****
          # if System.getProperty("gzzclient") == "gl":
          #   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()
  
  
--- 32,44 ----
          # if System.getProperty("gzzclient") == "gl":
          #   import gzz.gfx.gl.debugswitches
          #   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)]
!         self.cellView = gzz.view.CellVobFactory()
!         self.cellContentView = gzz.view.TextCellContentView(self.style)
!         gzz.client.Fallback(self.space.getHomeCell(), self.linkSpace, 
!                             self.dimensions, self.views, self.cellView, 
!                             self.cellContentView, self.filers)
          gzz.client.AbstractUpdateManager.chg()
  
  
Index: gzz/gzz/client/Fallback.java
diff -c gzz/gzz/client/Fallback.java:1.40 gzz/gzz/client/Fallback.java:1.41
*** gzz/gzz/client/Fallback.java:1.40   Sat Sep 28 14:45:15 2002
--- gzz/gzz/client/Fallback.java        Tue Oct  1 09:06: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.40 2002/09/28 
18:45:15 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.41 2002/10/01 
13:06:10 benja Exp $";
      public static boolean dbg = false;
      private static void pa(String s) { System.err.println(s); }
  
***************
*** 115,120 ****
--- 115,123 ----
      public Space space;
      public View[] viewList;
      public FallbackBinder binder = new FallbackBinder(this);
+     
+     CellView cellView;
+     CellContentView cellContentView;
  
      /** A name and a dimension object.
       */
***************
*** 187,192 ****
--- 190,201 ----
        public boolean isMarked(Cell c) {
            return binder.markedCells.contains(c);
        }
+         public CellView getCellView() {
+             return cellView;
+         }
+         public CellContentView getCellContentView() {
+             return cellContentView;
+         }
          public Cell getWindow() {
              throw new UnsupportedOperationException(
                  "Getting window cell in Fallback client");
***************
*** 296,307 ****
      }
  
      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);
  
--- 305,319 ----
      }
  
      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;
+         this.cellView = cellView;
+         this.cellContentView = cellContentView;
          
          xuIndexer = IndexManager.getXuIndexer(linkSpace);
  
Index: gzz/gzz/mediaserver/MediaserverFiler.java
diff -c gzz/gzz/mediaserver/MediaserverFiler.java:1.8 
gzz/gzz/mediaserver/MediaserverFiler.java:1.9
*** gzz/gzz/mediaserver/MediaserverFiler.java:1.8       Sun Sep 29 13:09:28 2002
--- gzz/gzz/mediaserver/MediaserverFiler.java   Tue Oct  1 09:06:10 2002
***************
*** 113,119 ****
                Version v = diff.applyTo(from);
  
                if(!id.equals(getVersionId(v, headerTo)))
!                   throw new IOException("Version doesn't match: "+v);
  
                  if(hdr != null)
                      hdr[0] = headerTo;
--- 113,122 ----
                Version v = diff.applyTo(from);
  
                if(!id.equals(getVersionId(v, headerTo)))
!                   throw new IOException("Version doesn't match: "+v+"\n"+
!                         "Wanted id =      "+id+"\n"+
!                         "Regenerated id = "+getVersionId(v, headerTo)+"\n"+
!                         "Using diff: "+diffId+"\n");
  
                  if(hdr != null)
                      hdr[0] = headerTo;
Index: gzz/gzz/view/CellVobFactory.java
diff -c gzz/gzz/view/CellVobFactory.java:1.17 
gzz/gzz/view/CellVobFactory.java:1.18
*** gzz/gzz/view/CellVobFactory.java:1.17       Sun Sep 29 12:33:06 2002
--- gzz/gzz/view/CellVobFactory.java    Tue Oct  1 09:06:10 2002
***************
*** 46,52 ****
   */
  
  public class CellVobFactory implements CellView {
! public static final String rcsid = "$Id: CellVobFactory.java,v 1.17 
2002/09/29 16:33:06 benja 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); }
--- 46,52 ----
   */
  
  public class CellVobFactory implements CellView {
! public static final String rcsid = "$Id: CellVobFactory.java,v 1.18 
2002/10/01 13:06:10 benja 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); }
***************
*** 56,65 ****
      static TextStyle style =
        GraphicsAPI.getInstance().getTextStyle("SansSerif", Font.PLAIN, 10);
  
!     CellContentView ccv = new TextCellContentView(style);
      //CellContentView ccv = new SpanCellContentView(style);
      //CellContentView ccv = new LinebrokenCellContentView(style);
! 
      Dim d_clone;
      /*
      Dim d_cursor;
--- 56,65 ----
      static TextStyle style =
        GraphicsAPI.getInstance().getTextStyle("SansSerif", Font.PLAIN, 10);
  
!     //CellContentView ccv = new TextCellContentView(style);
      //CellContentView ccv = new SpanCellContentView(style);
      //CellContentView ccv = new LinebrokenCellContentView(style);
!     
      Dim d_clone;
      /*
      Dim d_cursor;
***************
*** 131,136 ****
--- 131,138 ----
        setCenter(context.getAccursed());
        if(d_clone == null)
            throw new NullPointerException("clone dim not set in 
CellVobFactory");
+             
+         final CellContentView ccv = context.getCellContentView();
  
        final RectBgVob bg = new RectBgVob();
  
Index: gzz/gzz/view/ViewContext.java
diff -c gzz/gzz/view/ViewContext.java:1.3 gzz/gzz/view/ViewContext.java:1.4
*** gzz/gzz/view/ViewContext.java:1.3   Sat Sep 28 13:18:11 2002
--- gzz/gzz/view/ViewContext.java       Tue Oct  1 09:06:10 2002
***************
*** 41,47 ****
   */
  
  public interface ViewContext {
! String rcsid = "$Id: ViewContext.java,v 1.3 2002/09/28 17:18:11 benja Exp $";
  
      /** Get the accursed cell. */
      Cell getAccursed();
--- 41,47 ----
   */
  
  public interface ViewContext {
! String rcsid = "$Id: ViewContext.java,v 1.4 2002/10/01 13:06:10 benja Exp $";
  
      /** Get the accursed cell. */
      Cell getAccursed();
***************
*** 64,69 ****
--- 64,73 ----
      /** Whether a given cell is marked by the current mark set.
       */
      boolean isMarked(Cell c);
+     
+     View getView();
+     CellView getCellView();
+     CellContentView getCellContentView();
  
      /** Get the maincell of the window, if available.
       *  This cell can be used to acquire more metadata about how to
Index: gzz/gzz/view/VobVanishingClient.java
diff -c gzz/gzz/view/VobVanishingClient.java:1.12 
gzz/gzz/view/VobVanishingClient.java:1.13
*** gzz/gzz/view/VobVanishingClient.java:1.12   Sun Sep 29 10:53:45 2002
--- gzz/gzz/view/VobVanishingClient.java        Tue Oct  1 09:06:10 2002
***************
*** 90,95 ****
--- 90,96 ----
        this.into = into;
        this.intoCS = intoCS;
          this.context = context;
+         this.cvf = context.getCellView();
        Dimension d = into.getSize();
        p("fallback: "+d+" "+context.getAccursed());
        vanishing.render(this, context, d.width / 2, d.height / 2);
***************
*** 107,115 ****
      */
  
      ViewContext context;
! 
!     CellView cvf = new CellVobFactory();
! 
      /*
  
      public void render(VobScene into, Cell window, Cell cursor, int px, int 
py) {
--- 108,115 ----
      */
  
      ViewContext context;
!     CellView cvf;
!     
      /*
  
      public void render(VobScene into, Cell window, Cell cursor, int px, int 
py) {
Index: gzz/gzz/view/ZZViewContext.java
diff -c gzz/gzz/view/ZZViewContext.java:1.3 gzz/gzz/view/ZZViewContext.java:1.4
*** gzz/gzz/view/ZZViewContext.java:1.3 Sat Sep 28 13:18:11 2002
--- gzz/gzz/view/ZZViewContext.java     Tue Oct  1 09:06:10 2002
***************
*** 38,44 ****
   */
  
  public class ZZViewContext implements ViewContext {
! String rcsid = "$Id: ZZViewContext.java,v 1.3 2002/09/28 17:18:11 benja Exp 
$";
  
      public final Cell window;
  
--- 38,44 ----
   */
  
  public class ZZViewContext implements ViewContext {
! String rcsid = "$Id: ZZViewContext.java,v 1.4 2002/10/01 13:06:10 benja Exp 
$";
  
      public final Cell window;
  
***************
*** 63,68 ****
--- 63,80 ----
      }
  
      public boolean isMarked(Cell c) {
+         throw new UnsupportedOperationException("not implemented");
+     }
+     
+     public View getView() {
+         throw new UnsupportedOperationException("not implemented");
+     }
+ 
+     public CellView getCellView() {
+         throw new UnsupportedOperationException("not implemented");
+     }
+ 
+     public CellContentView getCellContentView() {
          throw new UnsupportedOperationException("not implemented");
      }
  
Index: gzz/gzz/view/pagespanview.py
diff -c gzz/gzz/view/pagespanview.py:1.3 gzz/gzz/view/pagespanview.py:1.4
*** gzz/gzz/view/pagespanview.py:1.3    Mon Sep 30 04:15:42 2002
--- gzz/gzz/view/pagespanview.py        Tue Oct  1 09:06:10 2002
***************
*** 3,8 ****
--- 3,9 ----
  import gfx.libpaper.papermill
  from gfx.libutil import nvcode
  from gfx.libutil import effects
+ import gzz
  import java
  
  papermill = gfx.libpaper.papermill.ThePaperMill()
***************
*** 212,214 ****
--- 213,219 ----
        )
  
  
+ class ContentView(gzz.view.CellContentView):
+     def place(cell, scene, coordsys, w, h, viewContext, scale):
+         view = CellPDFView(cell)
+         view.placepapers(scene, coordsys)
\ No newline at end of file
Index: gzz/gzz/vob/HBox.java
diff -c gzz/gzz/vob/HBox.java:1.7 gzz/gzz/vob/HBox.java:1.8
*** gzz/gzz/vob/HBox.java:1.7   Sun Sep 29 10:53:45 2002
--- gzz/gzz/vob/HBox.java       Tue Oct  1 09:06:10 2002
***************
*** 31,37 ****
   */
  
  public interface HBox {
! String rcsid = "$Id: HBox.java,v 1.7 2002/09/29 14:53:45 benja Exp $";
  
      float getWidth(float scale);
  
--- 31,37 ----
   */
  
  public interface HBox {
! String rcsid = "$Id: HBox.java,v 1.8 2002/10/01 13:06:10 benja Exp $";
  
      float getWidth(float scale);
  
***************
*** 79,85 ****
        public void setPrev(HBox b) { }
      }
  
!     Object WH_KEY = new Object();
      /** A useful base class for hboxes that are vobs.
       *  The second coordsys will contain the width and height for this vob.
       */
--- 79,85 ----
        public void setPrev(HBox b) { }
      }
  
!     public Object WH_KEY = new Object();
      /** A useful base class for hboxes that are vobs.
       *  The second coordsys will contain the width and height for this vob.
       */