[Gzz-commits] gzz/gzz/media/impl ScrollBlockManager.java

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/10/11 09:37:42

Modified files:
        gzz/media/impl : ScrollBlockManager.java 

Log message:
        Fix failing test: append needs to look at pagespan location and size

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gzz/media/impl/ScrollBlockManager.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gzz/gzz/media/impl/ScrollBlockManager.java
diff -c gzz/gzz/media/impl/ScrollBlockManager.java:1.6 
gzz/gzz/media/impl/ScrollBlockManager.java:1.7
*** gzz/gzz/media/impl/ScrollBlockManager.java:1.6      Wed Oct  2 13:29:17 2002
--- gzz/gzz/media/impl/ScrollBlockManager.java  Fri Oct 11 09:37:42 2002
***************
*** 38,44 ****
   */
  
  public class ScrollBlockManager {
! String rcsid = "$Id: ScrollBlockManager.java,v 1.6 2002/10/02 17:29:17 benja 
Exp $";
      public static boolean dbg = false;
      final static void p(String s) { if(dbg) System.out.println(s); }
      final static void pa(String s) { System.out.println(s); }
--- 38,44 ----
   */
  
  public class ScrollBlockManager {
! String rcsid = "$Id: ScrollBlockManager.java,v 1.7 2002/10/11 13:37:42 tjl 
Exp $";
      public static boolean dbg = false;
      final static void p(String s) { if(dbg) System.out.println(s); }
      final static void pa(String s) { System.out.println(s); }
***************
*** 335,340 ****
--- 335,350 ----
                   s.w == w &&
                   s.h == h;
        }
+ 
+       public Span1D append(Span s) {
+           if(!(s instanceof PageSpanBase)) return null;
+           PageSpanBase sts = (PageSpanBase)s;
+           if(sts.getScrollBlock() != this.getScrollBlock()) return null;
+           if(offs1 != sts.offs0) return null;
+           if(x != sts.x || y != sts.y || w != sts.w || h != sts.h) return 
null;
+           return createNew(offs0, sts.offs1);
+       }
+ 
      }