[Gzz-commits] gzz/gzz/view CellVobFactory.java VobVanishingCl...

[Benja Fallenstein]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Benja Fallenstein <address@hidden>      02/09/26 10:36:22

Modified files:
        gzz/view       : CellVobFactory.java VobVanishingClient.java 

Log message:
        Use CellView interface in CellVobFactory

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/CellVobFactory.java.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/view/VobVanishingClient.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gzz/gzz/view/CellVobFactory.java
diff -c gzz/gzz/view/CellVobFactory.java:1.11 
gzz/gzz/view/CellVobFactory.java:1.12
*** gzz/gzz/view/CellVobFactory.java:1.11       Wed Sep 25 15:27:32 2002
--- gzz/gzz/view/CellVobFactory.java    Thu Sep 26 10:36:22 2002
***************
*** 46,52 ****
   */
  
  public class CellVobFactory implements CellView {
! public static final String rcsid = "$Id: CellVobFactory.java,v 1.11 
2002/09/25 19:27:32 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.12 
2002/09/26 14:36:22 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); }
***************
*** 86,92 ****
        */
      }
  
!     public void setCenter(Cell center) {
        setSpace(center.space);
        sliceId = getSliceId(center);
      }
--- 86,95 ----
        */
      }
  
!     Cell center;
!     void setCenter(Cell center) {
!         if(center == this.center || center.equals(this.center)) return;
!       this.center = center;
        setSpace(center.space);
        sliceId = getSliceId(center);
      }
***************
*** 128,133 ****
--- 131,137 ----
       */
      public void addCellVobs(final Cell c, final VobScene v, int cs, final Vob 
content,
                              final ViewContext context, final float scale) {
+       setCenter(context.getAccursed());
        if(d_clone == null)
            throw new NullPointerException("clone dim not set in 
CellVobFactory");
  
Index: gzz/gzz/view/VobVanishingClient.java
diff -c gzz/gzz/view/VobVanishingClient.java:1.7 
gzz/gzz/view/VobVanishingClient.java:1.8
*** gzz/gzz/view/VobVanishingClient.java:1.7    Wed Sep 25 14:18:51 2002
--- gzz/gzz/view/VobVanishingClient.java        Thu Sep 26 10:36:22 2002
***************
*** 90,96 ****
        this.into = into;
        this.intoCS = intoCS;
          this.context = context;
-       cvf.setCenter(context.getAccursed());
        Dimension d = into.getSize();
        p("fallback: "+d+" "+context.getAccursed());
        vanishing.render(this, context, d.width / 2, d.height / 2);
--- 90,95 ----
***************
*** 109,115 ****
  
      ViewContext context;
  
!     CellVobFactory cvf = new CellVobFactory();
  
      /*
  
--- 108,114 ----
  
      ViewContext context;
  
!     CellView cvf = new CellVobFactory();
  
      /*
  
***************
*** 166,172 ****
                int depth, float rot) {
        Vob v = (Vob)o;
        int cs = into.coordsys(intoCS, c, depth, x0, y0, x1-x0, y1-y0);
!       cvf.addCellVobs(c, into, cs, v, context, fract);
      }
  
      public void connect(Cell cell1, Cell cell2, int dx, int dy) {
--- 165,172 ----
                int depth, float rot) {
        Vob v = (Vob)o;
        int cs = into.coordsys(intoCS, c, depth, x0, y0, x1-x0, y1-y0);
!       if(v != null) ((CellVobFactory)cvf).addCellVobs(c, into, cs, v, 
context, fract);
!       cvf.place(c, into, cs, context, fract);
      }
  
      public void connect(Cell cell1, Cell cell2, int dx, int dy) {