Changeset 4656 in josm

Timestamp:

Dec 12, 2011 1:37:20 PM (18 months ago)

Author:

bastiK

Message:

Fix ambiguities of empty collection vs. empty array by renaming the top level xml tags. This change breaks forward compatibility. (see #7027)

Location:

trunk

Files:

• data/preferences.xsd (modified) (3 diffs)
• src/org/openstreetmap/josm/data/Preferences.java (modified) (7 diffs)

trunk/data/preferences.xsd

@@ -11 +11 @@
                                 <element name="collection" type="tns:collection" />
                                 <element name="list" type="tns:list" />
+                                <element name="lists" type="tns:lists" />
+                                <element name="maps" type="tns:maps" />
                         </choice>
                 </sequence>
@@ -36 +38 @@
                             <element name="entry" type="tns:entry" minOccurs="0" maxOccurs="unbounded"/>
             </sequence>
+            <!-- deprecated: remove mid 2012 -->
             <sequence>
                             <element name="list" type="tns:slist" minOccurs="0" maxOccurs="unbounded"/>
             </sequence>
+            <!-- deprecated: remove mid 2012 -->
             <sequence>
                             <element name="map" type="tns:map" minOccurs="0" maxOccurs="unbounded"/>
@@ -46 +50 @@
         </complexType>
         
+        <complexType name="lists">
+        <sequence>
+                    <element name="list" type="tns:slist" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+                <attribute name="key" type="string" use="required" />
+        </complexType>
+
+        <complexType name="maps">
+        <sequence>
+                    <element name="map" type="tns:map" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+                <attribute name="key" type="string" use="required" />
+        </complexType>
+
         <complexType name="slist">
         <sequence>

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

@@ -1344 +1344 @@
             }
             public void visit(ListListSetting setting) {
-                changed = putArray(key, (Collection) setting.getValue());
+                @SuppressWarnings("unchecked")
+                boolean changed = putArray(key, (Collection) setting.getValue());
+                this.changed = changed;
             }
             public void visit(MapListSetting setting) {
@@ -1465 +1467 @@
                     properties.put(parser.getAttributeValue(null, "key"), parser.getAttributeValue(null, "value"));
                     jumpToEnd();
-                } else if (parser.getLocalName().equals("list") || parser.getLocalName().equals("collection")) {
+                } else if (parser.getLocalName().equals("list") ||
+                        parser.getLocalName().equals("collection") ||
+                        parser.getLocalName().equals("lists") ||
+                        parser.getLocalName().equals("maps")
+                ) {
                     parseToplevelList();
                 } else {
@@ -1489 +1495 @@
     protected void parseToplevelList() throws XMLStreamException {
         String key = parser.getAttributeValue(null, "key");
+        String name = parser.getLocalName();
+
         List<String> entries = null;
         List<List<String>> lists = null;
@@ -1520 +1528 @@
         if (entries != null) {
             collectionProperties.put(key, Collections.unmodifiableList(entries));
-        }
-        if (lists != null) {
+        } else if (lists != null) {
             arrayProperties.put(key, Collections.unmodifiableList(lists));
-        }
-        if (maps != null) {
+        } else if (maps != null) {
             listOfStructsProperties.put(key, Collections.unmodifiableList(maps));
+        } else {
+            if (name.equals("lists")) {
+                arrayProperties.put(key, Collections.<List<String>>emptyList());
+            } else if (name.equals("maps")) {
+                listOfStructsProperties.put(key, Collections.<Map<String, String>>emptyList());
+            } else {
+                collectionProperties.put(key, Collections.<String>emptyList());
+            }
         }
     }
@@ -1623 +1637 @@
 
         public void visit(ListListSetting setting) {
-            b.append("  <list key='").append(XmlWriter.encode(key)).append("'>\n");
+            b.append("  <lists key='").append(XmlWriter.encode(key)).append("'>\n");
             for (List<String> list : setting.getValue()) {
                 b.append("    <list>\n");
@@ -1631 +1645 @@
                 b.append("    </list>\n");
             }
-            b.append("  </list>\n");
+            b.append("  </lists>\n");
         }
 
         public void visit(MapListSetting setting) {
-            b.append("  <list key='").append(XmlWriter.encode(key)).append("'>\n");
+            b.append("  <maps key='").append(XmlWriter.encode(key)).append("'>\n");
             for (Map<String, String> struct : setting.getValue()) {
                 b.append("    <map>\n");
@@ -1643 +1657 @@
                 b.append("    </map>\n");
             }
-            b.append("  </list>\n");
+            b.append("  </maps>\n");
         }
     }