Changeset 8170 in josm for trunk/src

Timestamp:

2015-04-06T14:18:23+02:00 (9 years ago)

Author:

stoecker

Message:

fix #11275 - improve display of multiple values - original patch by Bryce Nesbitt

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/properties

Files:

• PropertiesCellRenderer.java (modified) (2 diffs)
• PropertiesDialog.java (modified) (1 diff)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.Color;
@@ -51 +52 @@
             } else if (value instanceof Map<?, ?>) {
                 Map<?, ?> v = (Map<?, ?>) value;
-                if (v.size() != 1) {
-                    str=tr("<different>");
+                if (v.size() != 1) {    // Multiple values: give user a short summary of the values
+                    Integer blank_count;
+                    Integer other_count;
+                    if (v.get("") == null) {
+                        blank_count = 0;
+                        other_count = v.size();
+                    } else {
+                        blank_count = (Integer)v.get("");
+                        other_count = v.size()-1;
+                    }
+                    str = "<";
+                    if (other_count == 1) {
+                        for (Map.Entry<?, ?> entry : v.entrySet()) { // Find the non-blank value in the map
+                            if ( entry.getKey() != "") {
+                                str += entry.getValue().toString() + " '" + entry.getKey() + "'";
+                            }
+                        }
+                    } else {
+                        str += tr ("{0} different",  other_count);
+                    }
+                    if(blank_count > 0) {
+                        str += trn(", {0} unset", ", {0} unset", blank_count, blank_count);
+                    }
+                    str += ">";
                     c.setFont(c.getFont().deriveFont(Font.ITALIC));
-                } else {
+
+                } else {                // One value: display the value
                     final Map.Entry<?, ?> entry = v.entrySet().iterator().next();
                     str = (String) entry.getKey();

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

@@ -704 +704 @@
 
         if(tagData.getRowCount() != 0 || membershipData.getRowCount() != 0) {
-            setTitle(tr("Tags: {0} / Memberships: {1}",
+            if(newSel.size() > 1) {
+                setTitle(tr("Objects: {2} / Tags: {0} / Memberships: {1}",
+                    tagData.getRowCount(), membershipData.getRowCount(), newSel.size()));
+            } else {
+                setTitle(tr("Tags: {0} / Memberships: {1}",
                     tagData.getRowCount(), membershipData.getRowCount()));
+            }
         } else {
             setTitle(tr("Tags / Memberships"));