[Gzz-commits] alph/org/nongnu/alph xml/SpanSerializer.java ut...

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/alph
Module name:    alph
Changes by:     Tuomas J. Lukka <address@hidden>        03/04/13 02:31:45

Modified files:
        org/nongnu/alph/xml: SpanSerializer.java 
Added files:
        org/nongnu/alph/util: XMLUtil.java 

Log message:
        Abstract XML util

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/util/XMLUtil.java?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/alph/alph/org/nongnu/alph/xml/SpanSerializer.java.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: alph/org/nongnu/alph/xml/SpanSerializer.java
diff -u alph/org/nongnu/alph/xml/SpanSerializer.java:1.4 
alph/org/nongnu/alph/xml/SpanSerializer.java:1.5
--- alph/org/nongnu/alph/xml/SpanSerializer.java:1.4    Sun Apr  6 06:55:59 2003
+++ alph/org/nongnu/alph/xml/SpanSerializer.java        Sun Apr 13 02:31:45 2003
@@ -2,6 +2,7 @@
 
 package org.nongnu.alph.xml;
 import org.nongnu.alph.*;
+import org.nongnu.alph.util.*;
 import java.util.List;
 import java.util.Iterator;
 
@@ -10,22 +11,6 @@
 
 public class SpanSerializer {
 
-    public static String escapeXML(String s) {
-       StringBuffer buf = new StringBuffer();
-       for(int i=0; i<s.length(); i++) {
-           switch(s.charAt(i)) {
-               case '&': buf.append("&amp;"); break;
-               case '<': buf.append("&lt;"); break;
-               case '>': buf.append("&gt;"); break;
-               case '\'': buf.append("&apos;"); break;
-               case '\"': buf.append("&quot;"); break;
-               default:
-                         buf.append(s.charAt(i)); break;
-           }
-       }
-       return buf.toString();
-    }
-
     public String namespace;
 
     public String span2xml(Span s0) {
@@ -33,7 +18,7 @@
            org.nongnu.alph.impl.URN5TextSpan t = 
(org.nongnu.alph.impl.URN5TextSpan)s0;
            return "<uts b=\""+t.getScrollId()+
                    "\" o=\""+t.offset()+
-                   "\" t=\""+escapeXML(t.getText())+"\"/>";
+                   "\" t=\""+XMLUtil.escapeXML(t.getText())+"\"/>";
        } else if(s0 instanceof TextSpan) {
            TextSpan s = (TextSpan)s0;
            return "<" + (namespace == null ? "" :