Changeset 2018 in josm

Timestamp:

Aug 30, 2009 10:24:37 PM (4 years ago)

Author:

stoecker

Message:

fixed #2641 - patch by plaicy - exception when reordering columns

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -466 +466 @@
                 if (c instanceof JLabel) {
                     String str = null;
-                    switch (column) {
-                    case 0:
+                    if (value instanceof String) {
                         str = (String) value;
-                        break;
-                    case 1:
-                        Map<String, Integer> v = (Map<String,Integer>) value;
-                        if (v.size()!=1) {
+                    } else if (value instanceof Map) {
+                        Map v = (Map) value;
+                        if (v.size() != 1) {
                             str=tr("<different>");
                             c.setFont(c.getFont().deriveFont(Font.ITALIC));
                         } else {
-                            str=v.entrySet().iterator().next().getKey();
+                            final Map.Entry entry = (Map.Entry) v.entrySet().iterator().next(); 
+                            str = (String) entry.getKey();
                         }
-                        break;
                     }
                     ((JLabel)c).setText(str);