[Gzz-commits] alph/org/nongnu/alph ImageSpan.java PageScrollB...

[Benja Fallenstein]

CVSROOT:        /cvsroot/alph
Module name:    alph
Changes by:     Benja Fallenstein <address@hidden>      03/04/22 07:37:29

Modified files:
        org/nongnu/alph: ImageSpan.java PageScrollBlock.java 
                         PageSpan.java 
        org/nongnu/alph/impl: PageImageScroll.java StdPageSpan.java 
Added files:
        org/nongnu/alph: PageImageSpan.java 

Log message:
        PageImageSpan interface: part of a page as an image

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/PageImageSpan.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/ImageSpan.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/PageScrollBlock.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/PageSpan.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/PageImageScroll.java.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/StdPageSpan.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: alph/org/nongnu/alph/ImageSpan.java
diff -u alph/org/nongnu/alph/ImageSpan.java:1.3 
alph/org/nongnu/alph/ImageSpan.java:1.4
--- alph/org/nongnu/alph/ImageSpan.java:1.3     Sun Apr 20 04:50:02 2003
+++ alph/org/nongnu/alph/ImageSpan.java Tue Apr 22 07:37:29 2003
@@ -33,7 +33,6 @@
 /** An image span - contiguous piece of a permascroll -. 
  * Spans in images are rectangular regions.
  */
-
 public interface ImageSpan extends Span {
 
     /** Get the location of this span in the mediaserver block.
Index: alph/org/nongnu/alph/PageScrollBlock.java
diff -u alph/org/nongnu/alph/PageScrollBlock.java:1.1 
alph/org/nongnu/alph/PageScrollBlock.java:1.2
--- alph/org/nongnu/alph/PageScrollBlock.java:1.1       Mon Apr 21 14:50:35 2003
+++ alph/org/nongnu/alph/PageScrollBlock.java   Tue Apr 22 07:37:29 2003
@@ -13,5 +13,5 @@
      */
     Span getSpan(int offs1, int offs2);
 
-    ImageSpan getPage(int page);
+    PageImageSpan getPage(int page);
 }
Index: alph/org/nongnu/alph/PageSpan.java
diff -u alph/org/nongnu/alph/PageSpan.java:1.3 
alph/org/nongnu/alph/PageSpan.java:1.4
--- alph/org/nongnu/alph/PageSpan.java:1.3      Mon Apr 21 14:50:35 2003
+++ alph/org/nongnu/alph/PageSpan.java  Tue Apr 22 07:37:29 2003
@@ -42,6 +42,6 @@
     /** Get the imagespan pointing to the given page
      * of this span.
      */
-    ImageSpan getPage(int ind);
+    PageImageSpan getPage(int ind);
 }
 
Index: alph/org/nongnu/alph/impl/PageImageScroll.java
diff -u alph/org/nongnu/alph/impl/PageImageScroll.java:1.7 
alph/org/nongnu/alph/impl/PageImageScroll.java:1.8
--- alph/org/nongnu/alph/impl/PageImageScroll.java:1.7  Mon Apr 21 15:33:30 2003
+++ alph/org/nongnu/alph/impl/PageImageScroll.java      Tue Apr 22 07:37:29 2003
@@ -39,7 +39,7 @@
  */
 
 public class PageImageScroll extends AbstractScrollBlock implements 
PageScrollBlock{
-String rcsid = "$Id: PageImageScroll.java,v 1.7 2003/04/21 19:33:30 tjl Exp $";
+String rcsid = "$Id: PageImageScroll.java,v 1.8 2003/04/22 11:37:29 benja 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); }
@@ -111,22 +111,23 @@
        return new StdPageSpan(this, p0, p1);
     }
 
-    private static class PageImageSpan extends AbstractImageSpan {
+    private static class PageImageSpanImpl 
+       extends AbstractImageSpan implements PageImageSpan {
        int page;
 
        protected AbstractImageSpan
                createNew(int x, int y, int w, int h) {
-           return new PageImageSpan(scrollBlock, page, x, y, w, h);
+           return new PageImageSpanImpl(scrollBlock, page, x, y, w, h);
        }
-       public PageImageSpan(ScrollBlock sb, int page, int x, int y, int w, int 
h) {
+       public PageImageSpanImpl(ScrollBlock sb, int page, int x, int y, int w, 
int h) {
            super(sb, x, y, w, h);
            this.page = page;
-
        }
+       public int getPageIndex() { return page; }
     }
 
-    public ImageSpan getPage(int p) {
-       return new PageImageSpan(this, p, 0, 0, WIDTH, HEIGHT);
+    public PageImageSpan getPage(int p) {
+       return new PageImageSpanImpl(this, p, 0, 0, WIDTH, HEIGHT);
     }
 
 
Index: alph/org/nongnu/alph/impl/StdPageSpan.java
diff -u alph/org/nongnu/alph/impl/StdPageSpan.java:1.1 
alph/org/nongnu/alph/impl/StdPageSpan.java:1.2
--- alph/org/nongnu/alph/impl/StdPageSpan.java:1.1      Mon Apr 21 14:50:35 2003
+++ alph/org/nongnu/alph/impl/StdPageSpan.java  Tue Apr 22 07:37:29 2003
@@ -15,7 +15,7 @@
        return new StdPageSpan((PageScrollBlock)scrollBlock, offs0, offs1);
     }
 
-    public ImageSpan getPage(int ind) {
+    public PageImageSpan getPage(int ind) {
        if(ind < 0 || ind >= offs1-offs0)
            throw new IndexOutOfBoundsException();
        PageScrollBlock scrollBlock = (PageScrollBlock)this.scrollBlock;