[Gzz-commits] alph/org/nongnu/alph/impl PageImageScroll.java ...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/alph
Module name:    alph
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/28 04:56:23

Modified files:
        org/nongnu/alph/impl: PageImageScroll.java stormalph.test 

Log message:
        Fix pagespan overlap bug

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/PageImageScroll.java.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/stormalph.test.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: alph/org/nongnu/alph/impl/PageImageScroll.java
diff -u alph/org/nongnu/alph/impl/PageImageScroll.java:1.13 
alph/org/nongnu/alph/impl/PageImageScroll.java:1.14
--- alph/org/nongnu/alph/impl/PageImageScroll.java:1.13 Tue Apr 22 21:45:13 2003
+++ alph/org/nongnu/alph/impl/PageImageScroll.java      Mon Apr 28 04:56:23 2003
@@ -42,7 +42,7 @@
  */
 
 public class PageImageScroll extends AbstractScrollBlock implements 
PageScrollBlock{
-String rcsid = "$Id: PageImageScroll.java,v 1.13 2003/04/23 01:45:13 tjl Exp 
$";
+String rcsid = "$Id: PageImageScroll.java,v 1.14 2003/04/28 08:56:23 tjl Exp 
$";
     public static boolean dbg = true;
     final static void pa(String s) { System.out.println(s); }
 
@@ -137,6 +137,11 @@
        public boolean equals(Object o) {
            return super.equals(o) &&
                    ((PageImageSpanImpl)o).page == page;
+       }
+
+       public boolean intersects(Span s) {
+           return super.intersects(s) &&
+                   ((PageImageSpanImpl)s).page == page;
        }
 
        public int hashCode() {
Index: alph/org/nongnu/alph/impl/stormalph.test
diff -u alph/org/nongnu/alph/impl/stormalph.test:1.8 
alph/org/nongnu/alph/impl/stormalph.test:1.9
--- alph/org/nongnu/alph/impl/stormalph.test:1.8        Tue Apr 22 21:45:13 2003
+++ alph/org/nongnu/alph/impl/stormalph.test    Mon Apr 28 04:56:23 2003
@@ -45,6 +45,10 @@
 
     assert not (sp0.hashCode() == sp1.hashCode())
 
+    assert not sp0.intersects(sp1)
+    assert sp0.intersects(sp0)
+    assert sp1.intersects(sp1_1)
+
 def testAddTwice():
     pool = storm.impl.TransientPool(java.util.HashSet())
     salph = alph.impl.StormAlph(pool)