[ff-cvs] alph doc/pegboard/imagescrollblock--humppake/pe...

[Asko Soukka]

CVSROOT:        /cvsroot/alph
Module name:    alph
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/09/08 08:28:30

Modified files:
        doc/pegboard/imagescrollblock--humppake: peg.rst 
        org/nongnu/alph/impl: AbstractScrollBlock.java 
                              SimpleImageScroll.java 
        org/nongnu/alph/xml: SpanReader.java SpanSerializer.java 
Added files:
        org/nongnu/alph: ImageScrollBlock.java 

Log message:
        implement imagescrollblock

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/doc/pegboard/imagescrollblock--humppake/peg.rst.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/ImageScrollBlock.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/AbstractScrollBlock.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/SimpleImageScroll.java.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/xml/SpanReader.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/xml/SpanSerializer.java.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: alph/doc/pegboard/imagescrollblock--humppake/peg.rst
diff -u alph/doc/pegboard/imagescrollblock--humppake/peg.rst:1.7 
alph/doc/pegboard/imagescrollblock--humppake/peg.rst:1.8
--- alph/doc/pegboard/imagescrollblock--humppake/peg.rst:1.7    Mon Sep  8 
08:09:47 2003
+++ alph/doc/pegboard/imagescrollblock--humppake/peg.rst        Mon Sep  8 
08:28:29 2003
@@ -4,9 +4,9 @@
 
 :Authors:  Asko Soukka
 :Date-Created: 2003-09-03
-:Last-Modified: $Date: 2003/09/08 12:09:47 $
-:Revision: $Revision: 1.7 $
-:Status:   Accepted
+:Last-Modified: $Date: 2003/09/08 12:28:29 $
+:Revision: $Revision: 1.8 $
+:Status:   Implemented
 :Scope:    Minor
 :Type:     Interface
 
Index: alph/org/nongnu/alph/impl/AbstractScrollBlock.java
diff -u alph/org/nongnu/alph/impl/AbstractScrollBlock.java:1.6 
alph/org/nongnu/alph/impl/AbstractScrollBlock.java:1.7
--- alph/org/nongnu/alph/impl/AbstractScrollBlock.java:1.6      Wed Jun 11 
13:50:18 2003
+++ alph/org/nongnu/alph/impl/AbstractScrollBlock.java  Mon Sep  8 08:28:29 2003
@@ -90,6 +90,7 @@
            return new PermanentTextScroll(alph, id, ct);
 
        } else if(type.equals("image")) {
+           return new SimpleImageScroll(alph, id, ct);
        } else if(type.equals("application")) {
            return new PageImageScroll(alph, id, ct);
        } 
Index: alph/org/nongnu/alph/impl/SimpleImageScroll.java
diff -u alph/org/nongnu/alph/impl/SimpleImageScroll.java:1.5 
alph/org/nongnu/alph/impl/SimpleImageScroll.java:1.6
--- alph/org/nongnu/alph/impl/SimpleImageScroll.java:1.5        Mon Apr 21 
14:50:35 2003
+++ alph/org/nongnu/alph/impl/SimpleImageScroll.java    Mon Sep  8 08:28:29 2003
@@ -38,8 +38,8 @@
 /** An image scrollblock
  */
 
-public class SimpleImageScroll extends AbstractScrollBlock {
-String rcsid = "$Id: SimpleImageScroll.java,v 1.5 2003/04/21 18:50:35 tjl Exp 
$";
+public class SimpleImageScroll extends AbstractScrollBlock implements 
ImageScrollBlock{
+String rcsid = "$Id: SimpleImageScroll.java,v 1.6 2003/09/08 12:28:29 humppake 
Exp $";
 
     int width=-1, height=-1;
 
Index: alph/org/nongnu/alph/xml/SpanReader.java
diff -u alph/org/nongnu/alph/xml/SpanReader.java:1.10 
alph/org/nongnu/alph/xml/SpanReader.java:1.11
--- alph/org/nongnu/alph/xml/SpanReader.java:1.10       Tue Jun 17 11:18:33 2003
+++ alph/org/nongnu/alph/xml/SpanReader.java    Mon Sep  8 08:28:30 2003
@@ -78,6 +78,10 @@
            int e = Integer.parseInt(attributes.getValue("e"));
            spans.add(((PageScrollBlock)(alph.getScrollBlock(b)))
                .getSpan(s, e));
+       } else if(qName.equals("is")) {
+           String b = attributes.getValue("b");
+           spans.add(((ImageScrollBlock)(alph.getScrollBlock(b)))
+               .getCurrent());
        } else if(qName.equals("pis")) {
            try {
                String b = attributes.getValue("b");
Index: alph/org/nongnu/alph/xml/SpanSerializer.java
diff -u alph/org/nongnu/alph/xml/SpanSerializer.java:1.10 
alph/org/nongnu/alph/xml/SpanSerializer.java:1.11
--- alph/org/nongnu/alph/xml/SpanSerializer.java:1.10   Wed Jun 11 13:50:18 2003
+++ alph/org/nongnu/alph/xml/SpanSerializer.java        Mon Sep  8 08:28:30 2003
@@ -63,6 +63,11 @@
                        "ps b=\""+s.getScrollId()+
                        "\" s=\""+s.offset()+
                        "\" e=\""+(s.offset()+s.length())+"\"/>";
+       } else if(s0 instanceof ImageSpan) {
+           ImageSpan s = (ImageSpan)s0;
+           return "<" + (namespace == null ? "" : 
+                                             namespace+":") +
+                       "is b=\""+s.getScrollId()+"\"/>";
        } else if(s0 instanceof PageImageSpan) { 
            PageImageSpan s = (PageImageSpan)s0;
            java.awt.Point p = s.getLocation();