[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/22 21:45:13

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

Log message:
        AHA\! There WAS a bug in pageimagespans

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

Patches:
Index: alph/org/nongnu/alph/impl/PageImageScroll.java
diff -u alph/org/nongnu/alph/impl/PageImageScroll.java:1.12 
alph/org/nongnu/alph/impl/PageImageScroll.java:1.13
--- alph/org/nongnu/alph/impl/PageImageScroll.java:1.12 Tue Apr 22 10:52:45 2003
+++ alph/org/nongnu/alph/impl/PageImageScroll.java      Tue Apr 22 21:45:13 2003
@@ -42,7 +42,7 @@
  */
 
 public class PageImageScroll extends AbstractScrollBlock implements 
PageScrollBlock{
-String rcsid = "$Id: PageImageScroll.java,v 1.12 2003/04/22 14:52:45 benja Exp 
$";
+String rcsid = "$Id: PageImageScroll.java,v 1.13 2003/04/23 01:45:13 tjl Exp 
$";
     public static boolean dbg = true;
     final static void pa(String s) { System.out.println(s); }
 
@@ -133,6 +133,15 @@
            this.page = page;
        }
        public int getPageIndex() { return page; }
+
+       public boolean equals(Object o) {
+           return super.equals(o) &&
+                   ((PageImageSpanImpl)o).page == page;
+       }
+
+       public int hashCode() {
+           return super.hashCode() ^ (page * 237);
+       }
     }
 
     public PageImageSpan getPage(int p) {
Index: alph/org/nongnu/alph/impl/stormalph.test
diff -u alph/org/nongnu/alph/impl/stormalph.test:1.7 
alph/org/nongnu/alph/impl/stormalph.test:1.8
--- alph/org/nongnu/alph/impl/stormalph.test:1.7        Tue Apr 22 16:10:15 2003
+++ alph/org/nongnu/alph/impl/stormalph.test    Tue Apr 22 21:45:13 2003
@@ -32,6 +32,19 @@
                        'application/pdf')
     assert sb.getCurrent().length() == 2
 
+    sp0   = sb.getCurrent().getPage(0)
+    sp1   = sb.getCurrent().getPage(1)
+    sp1_1 = sb.getCurrent().subSpan(1).getPage(0)
+
+    assert sp0.getPageIndex() == 0
+    assert sp1 .getPageIndex()== 1
+    assert sp1_1 .getPageIndex()== 1
+
+    assert not sp0.equals(sp1)
+    assert sp1_1.equals(sp1)
+
+    assert not (sp0.hashCode() == sp1.hashCode())
+
 def testAddTwice():
     pool = storm.impl.TransientPool(java.util.HashSet())
     salph = alph.impl.StormAlph(pool)