Changeset 31598 in osm for applications/editors/josm/plugins/seachart

Timestamp:

2015-10-06T16:44:11+02:00 (9 years ago)

Author:

malcolmh

Message:

xml escapes

Location:

applications/editors/josm/plugins/seachart/js57toosm

Files:

• build.xml (modified) (2 diffs)
• src/js57toosm/Js57toosm.java (modified) (3 diffs)

applications/editors/josm/plugins/seachart/js57toosm/build.xml

@@ -5 +5 @@
   <property name="ant.build.javac.target" value="1.7"/>
   <property name="ant.build.javac.source" value="1.7"/>
-    
+  <property name="lang.dir" value="/usr/local/bin/commons-lang3-3.4/"/>
+      
   <target name="init">
     <mkdir dir="${build}"/>
@@ -20 +21 @@
         <attribute name="Class-Path" value="$jarfile"/>
       </manifest>
+      <zipgroupfileset dir="${lang.dir}" includes="**/commons-lang3-3.4.jar" />
     </jar>
   </target>

applications/editors/josm/plugins/seachart/js57toosm/src/js57toosm/Js57toosm.java

@@ -12 +12 @@
 import java.io.*;
 import java.util.*;
+
+import org.apache.commons.lang3.StringEscapeUtils;
 
 import s57.S57obj;
@@ -175 +177 @@
                         String valstr = S57val.stringValue(item.getValue(), item.getKey());
                         if (!attstr.isEmpty() && !valstr.isEmpty())
-                                out.format("    <tag k='seamark:%s:%s' v='%s'/>%n", type, attstr, valstr);
+                                out.format("    <tag k='seamark:%s:%s' v='%s'/>%n", type, attstr, StringEscapeUtils.escapeXml10(valstr));
                 }
                 for (Obj obj : feature.objs.keySet()) {
@@ -187 +189 @@
                                         if (!attstr.isEmpty() && !valstr.isEmpty()) {
                                                 if ((ix == 0) && (tab.size() == 1)) {
-                                                        out.format("    <tag k='seamark:%s:%s' v='%s'/>%n", type, attstr, valstr);
+                                                        out.format("    <tag k='seamark:%s:%s' v='%s'/>%n", type, attstr, StringEscapeUtils.escapeXml10(valstr));
                                                 } else {
-                                                        out.format("    <tag k='seamark:%s:%d:%s' v='%s'/>%n", type, ix + 1, attstr, valstr);
+                                                        out.format("    <tag k='seamark:%s:%d:%s' v='%s'/>%n", type, ix + 1, attstr, StringEscapeUtils.escapeXml10(valstr));
                                                 }
                                         }