[Gzz-commits] alph/org/nongnu/alph/xml SpanReader.java SpanSe...

[Benja Fallenstein]

CVSROOT:        /cvsroot/alph
Module name:    alph
Changes by:     Benja Fallenstein <address@hidden>      03/04/25 10:29:19

Modified files:
        org/nongnu/alph/xml: SpanReader.java SpanSerializer.java 

Log message:
        page spans and page image spans

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/xml/SpanReader.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/xml/SpanSerializer.java.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: alph/org/nongnu/alph/xml/SpanReader.java
diff -u alph/org/nongnu/alph/xml/SpanReader.java:1.6 
alph/org/nongnu/alph/xml/SpanReader.java:1.7
--- alph/org/nongnu/alph/xml/SpanReader.java:1.6        Tue Apr 15 23:44:23 2003
+++ alph/org/nongnu/alph/xml/SpanReader.java    Fri Apr 25 10:29:19 2003
@@ -48,6 +48,21 @@
        } else if(qName.equals("fts")) {
            String t = attributes.getValue("t");
            spans.add(new org.nongnu.alph.impl.FakeTextSpan(t));
+       } else if(qName.equals("ps")) {
+           String b = attributes.getValue("b");
+           int s = Integer.parseInt(attributes.getValue("s"));
+           int e = Integer.parseInt(attributes.getValue("e"));
+           spans.add(((PageScrollBlock)(scrollBlockFactory.getScrollBlock(b)))
+               .getSpan(s, e));
+       } else if(qName.equals("pis")) {
+           String b = attributes.getValue("b");
+           int p = Integer.parseInt(attributes.getValue("p"));
+           int x = Integer.parseInt(attributes.getValue("x"));
+           int y = Integer.parseInt(attributes.getValue("y"));
+           int w = Integer.parseInt(attributes.getValue("w"));
+           int h = Integer.parseInt(attributes.getValue("h"));
+           spans.add(((PageScrollBlock)(scrollBlockFactory.getScrollBlock(b)))
+               .getPage(p).subArea(x,y,w,h));
        } else {
            throw new Error("Unknown element '"+localName+"'");
        }
Index: alph/org/nongnu/alph/xml/SpanSerializer.java
diff -u alph/org/nongnu/alph/xml/SpanSerializer.java:1.6 
alph/org/nongnu/alph/xml/SpanSerializer.java:1.7
--- alph/org/nongnu/alph/xml/SpanSerializer.java:1.6    Tue Apr 15 23:44:23 2003
+++ alph/org/nongnu/alph/xml/SpanSerializer.java        Fri Apr 25 10:29:19 2003
@@ -32,6 +32,24 @@
                        "ts b=\""+s.getScrollId()+
                        "\" s=\""+s.offset()+
                        "\" e=\""+(s.offset()+s.length())+"\"/>";
+       } else if(s0 instanceof PageSpan) {
+           PageSpan s = (PageSpan)s0;
+           return "<" + (namespace == null ? "" : 
+                                             namespace+":") +
+                       "ps b=\""+s.getScrollId()+
+                       "\" s=\""+s.offset()+
+                       "\" e=\""+(s.offset()+s.length())+"\"/>";
+       } else if(s0 instanceof PageImageSpan) { 
+           PageImageSpan s = (PageImageSpan)s0;
+           java.awt.Point p = s.getLocation();
+           java.awt.Dimension d = s.getSize();
+           return "<" + (namespace == null ? "" : 
+                                             namespace+":") +
+                       "pis b=\""+s.getScrollId()+
+                       "\" p=\""+s.getPageIndex()+
+                       "\" x=\""+p.x+"\" y=\""+p.y+
+                       "\" width=\""+d.width+
+                       "\" height=\""+d.height+"\"/>";
        } else {
            throw new Error("Don't know how to serialize "+s0+" yet");
        }