[Gzz-commits] alph/org/nongnu/alph impl/URN5SpanMaker.java ut...

[Benja Fallenstein]

CVSROOT:        /cvsroot/alph
Module name:    alph
Branch:         
Changes by:     Benja Fallenstein <address@hidden>      03/06/08 07:18:05

Modified files:
        org/nongnu/alph/impl: URN5SpanMaker.java 
        org/nongnu/alph/util: XMLUtil.java 
        org/nongnu/alph/xml: SpanSerializer.java serialization.test 

Log message:
        fix xml serialization of newlines

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/impl/URN5SpanMaker.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/util/XMLUtil.java.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/xml/SpanSerializer.java.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/xml/serialization.test.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: alph/org/nongnu/alph/impl/URN5SpanMaker.java
diff -u alph/org/nongnu/alph/impl/URN5SpanMaker.java:1.1 
alph/org/nongnu/alph/impl/URN5SpanMaker.java:1.2
--- alph/org/nongnu/alph/impl/URN5SpanMaker.java:1.1    Sun Apr  6 04:24:06 2003
+++ alph/org/nongnu/alph/impl/URN5SpanMaker.java        Sun Jun  8 07:18:04 2003
@@ -4,7 +4,7 @@
 import org.nongnu.alph.*;
 import org.nongnu.storm.util.URN5Namespace;
 
-public class URN5SpanMaker {
+public class URN5SpanMaker implements SpanMaker {
     static URN5Namespace ns = new URN5Namespace();
 
     String urn5;
Index: alph/org/nongnu/alph/util/XMLUtil.java
diff -u alph/org/nongnu/alph/util/XMLUtil.java:1.1 
alph/org/nongnu/alph/util/XMLUtil.java:1.2
--- alph/org/nongnu/alph/util/XMLUtil.java:1.1  Sun Apr 13 02:31:45 2003
+++ alph/org/nongnu/alph/util/XMLUtil.java      Sun Jun  8 07:18:05 2003
@@ -12,6 +12,7 @@
                case '>': buf.append("&gt;"); break;
                case '\'': buf.append("&apos;"); break;
                case '\"': buf.append("&quot;"); break;
+               case '\n': buf.append("&#10;"); break;
                default:
                          buf.append(s.charAt(i)); break;
            }
Index: alph/org/nongnu/alph/xml/SpanSerializer.java
diff -u alph/org/nongnu/alph/xml/SpanSerializer.java:1.8 
alph/org/nongnu/alph/xml/SpanSerializer.java:1.9
--- alph/org/nongnu/alph/xml/SpanSerializer.java:1.8    Fri Apr 25 10:32:53 2003
+++ alph/org/nongnu/alph/xml/SpanSerializer.java        Sun Jun  8 07:18:05 2003
@@ -66,7 +66,7 @@
     }
 
     static public String serialize(Enfilade1D enf) {
-       List l = enf.getList();
+       List l = enf.optimized().getList();
        SpanSerializer ser = new SpanSerializer();
        for(Iterator i = l.iterator(); i.hasNext(); ) {
            ser.addSpan((Span)i.next());
Index: alph/org/nongnu/alph/xml/serialization.test
diff -u alph/org/nongnu/alph/xml/serialization.test:1.8 
alph/org/nongnu/alph/xml/serialization.test:1.9
--- alph/org/nongnu/alph/xml/serialization.test:1.8     Thu May 15 11:48:42 2003
+++ alph/org/nongnu/alph/xml/serialization.test Sun Jun  8 07:18:05 2003
@@ -21,6 +21,11 @@
        return self.sb.getID()
     def toString(self):
        return "[Fake span]"
+    def append(self, other):
+        if self.sb == other.sb and self.e == other.s:
+            return Ts(self.sb, self.s, other.e)
+        else:
+            return None
 
 class Sb(alph.TextScrollBlock):
     def __init__(self, id):
@@ -113,6 +118,20 @@
     assert sp.getText() == "foo&bar"
 
     assert SpanSerializer().span2xml(sp) == str
+
+def testReturn():
+    str = SpanSerializer().span2xml(alph.impl.FakeTextSpan('a\nb'))
+
+    r = SpanReader(TestAlph())
+    parseString(str, r)
+
+    sp = r.getSpans()[0]
+    assert sp.getScrollId() == ""
+    assert sp.offset() == 0
+    assert sp.getText() == "a\nb"
+
+    assert str == """<fts t="a&#10;b"/>"""
+
 
 def testPageImageSpan():
     pool = storm.impl.TransientPool(java.util.HashSet())