Changeset 8996 in josm

Timestamp:

2015-11-07T18:42:58+01:00 (8 years ago)

Author:

simon04

Message:

fix #12073 - Properties dialog: make sorting by values work w/o CCE

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (2 diffs)

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

@@ -98 +98 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
+import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -307 +308 @@
         tagTable.getColumnModel().getColumn(1).setCellRenderer(cellRenderer);
         tagTable.setRowSorter(tagRowSorter);
+
+        tagRowSorter.setComparator(0, AlphanumComparator.getInstance());
+        tagRowSorter.setComparator(1, new Comparator<Object>() {
+            @Override
+            public int compare(Object o1, Object o2) {
+                if (o1 instanceof Map && o2 instanceof Map) {
+                    final String v1 = ((Map) o1).size() == 1 ? (String) ((Map) o1).keySet().iterator().next() : tr("<different>");
+                    final String v2 = ((Map) o2).size() == 1 ? (String) ((Map) o2).keySet().iterator().next() : tr("<different>");
+                    return AlphanumComparator.getInstance().compare(v1, v2);
+                } else {
+                    return AlphanumComparator.getInstance().compare(String.valueOf(o1), String.valueOf(o2));
+                }
+            }
+        });
     }