Changeset 6314 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

Timestamp:

2013-10-07T16:23:05+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8512 - Do not display discardable keys by default. Expert users can display them by enabling "Display discardable keys" in OSM Data preferences, and change their display colour

File:

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

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

@@ -60 +60 @@
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
+import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.IRelation;
@@ -113 +115 @@
  * @author imi
  */
-public class PropertiesDialog extends ToggleDialog implements SelectionChangedListener, MapView.EditLayerChangeListener, DataSetListenerAdapter.Listener {
+public class PropertiesDialog extends ToggleDialog implements SelectionChangedListener, MapView.EditLayerChangeListener, DataSetListenerAdapter.Listener, PreferenceChangedListener {
 
     /**
@@ -272 +274 @@
 
         editHelper.loadTagsIfNeeded();
+        
+        Main.pref.addPreferenceChangeListener(this);
     }
 
@@ -281 +285 @@
         propertyTable.getTableHeader().setReorderingAllowed(false);
 
-        propertyTable.getColumnModel().getColumn(1).setCellRenderer(new DefaultTableCellRenderer(){
-            @Override public Component getTableCellRendererComponent(JTable table, Object value,
-                    boolean isSelected, boolean hasFocus, int row, int column) {
-                Component c = super.getTableCellRendererComponent(table, value, isSelected, false, row, column);
-                if (value == null)
-                    return this;
-                if (c instanceof JLabel) {
-                    String str = null;
-                    if (value instanceof String) {
-                        str = (String) value;
-                    } else if (value instanceof Map<?, ?>) {
-                        Map<?, ?> v = (Map<?, ?>) value;
-                        if (v.size() != 1) {
-                            str=tr("<different>");
-                            c.setFont(c.getFont().deriveFont(Font.ITALIC));
-                        } else {
-                            final Map.Entry<?, ?> entry = v.entrySet().iterator().next();
-                            str = (String) entry.getKey();
-                        }
-                    }
-                    ((JLabel)c).putClientProperty("html.disable", Boolean.TRUE); // Fix #8730
-                    ((JLabel)c).setText(str);
-                }
-                return c;
-            }
-        });
+        PropertiesCellRenderer cellRenderer = new PropertiesCellRenderer();
+        propertyTable.getColumnModel().getColumn(0).setCellRenderer(cellRenderer);
+        propertyTable.getColumnModel().getColumn(1).setCellRenderer(cellRenderer);
     }
 
@@ -562 +543 @@
     public void destroy() {
         super.destroy();
+        Main.pref.removePreferenceChangeListener(this);
         for (JosmAction action : josmActions) {
             action.destroy();
@@ -594 +576 @@
         propertyData.setRowCount(0);
 
+        final boolean displayDiscardableKeys = Main.pref.getBoolean("display.discardable-keys", false);
         final Map<String, Integer> keyCount = new HashMap<String, Integer>();
         final Map<String, String> tags = new HashMap<String, String>();
@@ -601 +584 @@
             types.add(TaggingPresetType.forPrimitive(osm));
             for (String key : osm.keySet()) {
-                String value = osm.get(key);
-                keyCount.put(key, keyCount.containsKey(key) ? keyCount.get(key) + 1 : 1);
-                if (valueCount.containsKey(key)) {
-                    Map<String, Integer> v = valueCount.get(key);
-                    v.put(value, v.containsKey(value) ? v.get(value) + 1 : 1);
-                } else {
-                    TreeMap<String, Integer> v = new TreeMap<String, Integer>();
-                    v.put(value, 1);
-                    valueCount.put(key, v);
+                if (displayDiscardableKeys || !OsmPrimitive.getDiscardableKeys().contains(key)) {
+                    String value = osm.get(key);
+                    keyCount.put(key, keyCount.containsKey(key) ? keyCount.get(key) + 1 : 1);
+                    if (valueCount.containsKey(key)) {
+                        Map<String, Integer> v = valueCount.get(key);
+                        v.put(value, v.containsKey(value) ? v.get(value) + 1 : 1);
+                    } else {
+                        TreeMap<String, Integer> v = new TreeMap<String, Integer>();
+                        v.put(value, 1);
+                        valueCount.put(key, v);
+                    }
                 }
             }
@@ -1254 +1239 @@
         }
     }
+
+    @Override
+    public void preferenceChanged(PreferenceChangeEvent e) {
+        if ("display.discardable-keys".equals(e.getKey())) {
+            if (Main.main.getCurrentDataSet() != null) {
+                // Re-load data when display preference change
+                selectionChanged(Main.main.getCurrentDataSet().getSelected());
+            }
+        }
+    }
 }