Changeset 6314 in josm for trunk

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

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapStatus.java (modified) (2 diffs)
• dialogs/properties/PropertiesCellRenderer.java (added)
• dialogs/properties/PropertiesDialog.java (modified) (8 diffs)
• preferences/display/DrawingPreference.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -24 +24 @@
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -341 +342 @@
                             }
                         });
-                    } catch (Exception e) {
+                    } catch (InterruptedException e) {
+                        // Occurs frequently during JOSM shutdown, log set to debug only
+                        Main.debug("InterruptedException in "+MapStatus.class.getSimpleName());
+                    } catch (InvocationTargetException e) {
                         Main.warn(e);
                     }

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());
+            }
+        }
+    }
 }

trunk/src/org/openstreetmap/josm/gui/preferences/display/DrawingPreference.java

@@ -41 +41 @@
     private JCheckBox virtualNodes = new JCheckBox(tr("Draw virtual nodes in select mode"));
     private JCheckBox inactive = new JCheckBox(tr("Draw inactive layers in other color"));
+    private JCheckBox discardableKeys = new JCheckBox(tr("Display discardable keys"));
 
     // Options that affect performance
@@ -117 +118 @@
 
         // outlineOnly
+        outlineOnly.setToolTipText(tr("This option suppresses the filling of areas, overriding anything specified in the selected style."));
         outlineOnly.setSelected(Main.pref.getBoolean("draw.data.area_outline_only", false));
-        outlineOnly.setToolTipText(tr("This option suppresses the filling of areas, overriding anything specified in the selected style."));
-
+
+        // discardable keys
+        discardableKeys.setToolTipText(tr("Display keys which have been deemed uninteresting to the point that they can be silently removed."));
+        discardableKeys.setSelected(Main.pref.getBoolean("display.discardable-keys", false));
+        
         JLabel performanceLabel = new JLabel(tr("Options that affect drawing performance"));
 
@@ -144 +149 @@
         panel.add(sourceBounds, GBC.eop().insets(20,0,0,0));
         panel.add(inactive, GBC.eop().insets(20,0,0,0));
+        panel.add(discardableKeys, GBC.eop().insets(20,0,0,0));
 
         ExpertToggleAction.addVisibilitySwitcher(performanceLabel);
@@ -150 +156 @@
         ExpertToggleAction.addVisibilitySwitcher(useHighlighting);
         ExpertToggleAction.addVisibilitySwitcher(outlineOnly);
+        ExpertToggleAction.addVisibilitySwitcher(discardableKeys);
 
         panel.add(Box.createVerticalGlue(), GBC.eol().fill(GBC.BOTH));
@@ -171 +178 @@
         Main.pref.put("draw.target-highlight", useHighlighting.isSelected());
         Main.pref.put("draw.helper-line", drawHelperLine.isSelected());
+        Main.pref.put("display.discardable-keys", discardableKeys.isSelected());
         int vn = Main.pref.getInteger("mappaint.node.virtual-size", 8);
         if (virtualNodes.isSelected()) {