[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 09:06:30

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

Log message:
        Make pageinfo in pimagescroll work

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/PageImageScroll.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/stormalph.test.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: alph/org/nongnu/alph/impl/PageImageScroll.java
diff -u alph/org/nongnu/alph/impl/PageImageScroll.java:1.10 
alph/org/nongnu/alph/impl/PageImageScroll.java:1.11
--- alph/org/nongnu/alph/impl/PageImageScroll.java:1.10 Tue Apr 22 07:53:01 2003
+++ alph/org/nongnu/alph/impl/PageImageScroll.java      Tue Apr 22 09:06:30 2003
@@ -42,9 +42,8 @@
  */
 
 public class PageImageScroll extends AbstractScrollBlock implements 
PageScrollBlock{
-String rcsid = "$Id: PageImageScroll.java,v 1.10 2003/04/22 11:53:01 benja Exp 
$";
+String rcsid = "$Id: PageImageScroll.java,v 1.11 2003/04/22 13:06:30 tjl Exp 
$";
     public static boolean dbg = true;
-    final static void p(String s) { if(dbg) System.out.println(s); }
     final static void pa(String s) { System.out.println(s); }
 
 
@@ -83,6 +82,15 @@
            new PyString(alph.getBlockFile(this).getFilename()),
            new PyString(dsc.getPath()),
        });
+       if(! res.__nonzero__())
+           throw new Error("Couldn't generate .dsc");
+
+       res = interp.get("pinf").__call__(
+           new PyString(dsc.getPath())
+               );
+
+
+       if(dbg) pa("Result from dsc: "+res);
        pageInfo= (PageInfo)res.__tojava__(PageInfo.class);
     }
 
Index: alph/org/nongnu/alph/impl/stormalph.test
diff -u alph/org/nongnu/alph/impl/stormalph.test:1.4 
alph/org/nongnu/alph/impl/stormalph.test:1.5
--- alph/org/nongnu/alph/impl/stormalph.test:1.4        Tue Apr 22 08:21:26 2003
+++ alph/org/nongnu/alph/impl/stormalph.test    Tue Apr 22 09:06:30 2003
@@ -28,7 +28,7 @@
     salph = alph.impl.StormAlph(pool)
     sb = salph.addFile(java.io.File('testdata/test1.pdf'),
                        'application/pdf')
-    assert sb.getCurrent().getLength() == 2
+    assert sb.getCurrent().length() == 2