Changeset 3845 in josm

Timestamp:

2011-02-02T18:54:07+01:00 (13 years ago)

Author:

stoecker

Message:

fix #5899 - added icons

Location:

trunk

Files:

• images/data/closedway.png (modified) ( previous)
• images/data/multipolygon.png (modified) ( previous)
• images_nodist/alternatives (added)
• images_nodist/alternatives/closedway1.png (added)
• images_nodist/alternatives/closedway2.png (added)
• images_nodist/alternatives/relation2.png (added)
• src/org/openstreetmap/josm/data/ServerSidePreferences.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java

@@ -177 +177 @@
         boolean res = false;
         try {
+            /* TODO: parse collection! */
             XmlObjectParser.Uniform<Prop> parser = new XmlObjectParser.Uniform<Prop>(in, "tag", Prop.class);
             for (Prop p : parser) {
@@ -200 +201 @@
                 continue; // do not upload password. It would get stored in plain!
             }
-            b.append("<tag key='");
-            b.append(XmlWriter.encode(p.getKey()));
-            b.append("' value='");
-            b.append(XmlWriter.encode(p.getValue()));
-            b.append("' />\n");
+            String r = p.getValue();
+            if(r.contains("\u001e"))
+            {
+                b.append("<collection key='");
+                b.append(XmlWriter.encode(p.getKey()));
+                b.append(">\n");
+                for (String val : r.split("\u001e", -1))
+                {
+                    b.append("  <entry value='");
+                    b.append(XmlWriter.encode(val));
+                    b.append("' />\n");
+                }
+            }
+            else
+            {
+                b.append("<tag key='");
+                b.append(XmlWriter.encode(p.getKey()));
+                b.append("' value='");
+                b.append(XmlWriter.encode(p.getValue()));
+                b.append("' />\n");
+            }
         }
         b.append("</preferences>");