Changeset 2657 in josm

Timestamp:

Dec 19, 2009 12:55:50 PM (3 years ago)

Author:

jttt

Message:

Cache list of used tags in properties dialog (faster adding of keys in large datasets)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSet.java (modified) (1 diff)
• data/osm/OsmPrimitive.java (modified) (9 diffs)
• data/osm/event/TagsChangedEvent.java (modified) (3 diffs)
• gui/MapFrame.java (modified) (1 diff)
• gui/dialogs/properties (added)
• gui/dialogs/properties/ListOfUsedTags.java (added)
• gui/dialogs/properties/PropertiesDialog.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java) (15 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -849 +849 @@
     }
 
-    void fireTagsChanged(OsmPrimitive prim) {
-        fireEvent(new TagsChangedEvent(this, prim));
+    void fireTagsChanged(OsmPrimitive prim, Map<String, String> originalKeys) {
+        fireEvent(new TagsChangedEvent(this, prim, originalKeys));
     }
 

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -717 +717 @@
      */
     public void setKeys(Map<String, String> keys) {
+        Map<String, String> originalKeys = getKeys();
         if (keys == null) {
             this.keys = null;
+            keysChangedImpl(originalKeys);
             return;
         }
@@ -728 +730 @@
         }
         this.keys = newKeys;
-        keysChangedImpl();
+        keysChangedImpl(originalKeys);
     }
 
@@ -741 +743 @@
      */
     public final void put(String key, String value) {
+        Map<String, String> originalKeys = getKeys();
         if (key == null)
             return;
@@ -747 +750 @@
         } else if (keys == null || keys.length == 0){
             keys = new String[] {key, value};
-            keysChangedImpl();
+            keysChangedImpl(originalKeys);
         } else {
             for (int i=0; i<keys.length;i+=2) {
                 if (keys[i].equals(key)) {
                     keys[i+1] = value;
-                    keysChangedImpl();
+                    keysChangedImpl(originalKeys);
                     return;
                 }
@@ -764 +767 @@
             newKeys[keys.length + 1] = value;
             keys = newKeys;
-            keysChangedImpl();
+            keysChangedImpl(originalKeys);
         }
     }
@@ -776 +779 @@
         if (!hasKey(key))
             return;
+        Map<String, String> originalKeys = getKeys();
         if (keys.length == 2) {
             keys = null;
-            keysChangedImpl();
+            keysChangedImpl(originalKeys);
             return;
         }
@@ -790 +794 @@
         }
         keys = newKeys;
-        keysChangedImpl();
+        keysChangedImpl(originalKeys);
     }
 
@@ -799 +803 @@
      */
     public final void removeAll() {
-        keys = null;
-        keysChangedImpl();
+        if (keys != null) {
+            Map<String, String> originalKeys = getKeys();
+            keys = null;
+            keysChangedImpl(originalKeys);
+        }
     }
 
@@ -854 +861 @@
     }
 
-    private void keysChangedImpl() {
+    private void keysChangedImpl(Map<String, String> originalKeys) {
         clearCached();
         updateHasDirectionKeys();
         updateTagged();
         if (dataSet != null) {
-            dataSet.fireTagsChanged(this);
+            dataSet.fireTagsChanged(this, originalKeys);
         }
     }

trunk/src/org/openstreetmap/josm/data/osm/event/TagsChangedEvent.java

@@ -4 +4 @@
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -11 +12 @@
 
     private final OsmPrimitive primitive;
+    private final Map<String, String> originalKeys;
 
-    public TagsChangedEvent(DataSet dataSet, OsmPrimitive primitive) {
+    public TagsChangedEvent(DataSet dataSet, OsmPrimitive primitive, Map<String, String> originalKeys) {
         super(dataSet);
         this.primitive = primitive;
+        this.originalKeys = originalKeys;
     }
 
@@ -36 +39 @@
     }
 
+    public Map<String, String> getOriginalKeys() {
+        return originalKeys;
+    }
+
 }

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

@@ -37 +37 @@
 import org.openstreetmap.josm.gui.dialogs.HistoryDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
-import org.openstreetmap.josm.gui.dialogs.PropertiesDialog;
 import org.openstreetmap.josm.gui.dialogs.RelationListDialog;
 import org.openstreetmap.josm.gui.dialogs.SelectionListDialog;
 import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.dialogs.UserListDialog;
+import org.openstreetmap.josm.gui.dialogs.properties.PropertiesDialog;
 import org.openstreetmap.josm.tools.Destroyable;
 

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

@@ -1 +1 @@
 
-package org.openstreetmap.josm.gui.dialogs;
+package org.openstreetmap.josm.gui.dialogs.properties;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -20 +20 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -27 +28 @@
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.TreeSet;
 import java.util.Vector;
 import java.util.Map.Entry;
@@ -63 +63 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.event.DatasetEventManager;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -68 +69 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.SideButton;
-import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
+import org.openstreetmap.josm.gui.dialogs.ToggleDialog;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -139 +140 @@
 
     private final Map<String, Map<String, Integer>> valueCount = new TreeMap<String, Map<String, Integer>>();
+    private final ListOfUsedTags listOfUsedTags = new ListOfUsedTags();
+
+    @Override
+    public void showNotify() {
+        DatasetEventManager.getInstance().addDatasetListener(listOfUsedTags, false);
+    }
+
+    @Override
+    public void hideNotify() {
+        DatasetEventManager.getInstance().removeDatasetListener(listOfUsedTags);
+    }
+
     /**
      * Edit the value in the properties table row
@@ -158 +171 @@
         panel.add(new JLabel(msg), BorderLayout.NORTH);
 
-        final TreeMap<String, TreeSet<String>> allData = createAutoCompletionInfo(true);
-
         JPanel p = new JPanel(new GridBagLayout());
         panel.add(p, BorderLayout.CENTER);
 
         final AutoCompleteComboBox keys = new AutoCompleteComboBox();
-        keys.setPossibleItems(allData.keySet());
+        keys.setPossibleItems(listOfUsedTags.getUsedKeys());
         keys.setEditable(true);
         keys.setSelectedItem(key);
@@ -194 +205 @@
         });
         values.setEditable(true);
-        updateListData(key, allData, values);
+        values.setPossibleItems(listOfUsedTags.getUsedValues(key));
         Map<String, Integer> m=(Map<String, Integer>)propertyData.getValueAt(row, 1);
         final String selection= m.size()!=1?tr("<different>"):m.entrySet().iterator().next().getKey();
@@ -202 +213 @@
         p.add(Box.createHorizontalStrut(10), GBC.std());
         p.add(values, GBC.eol().fill(GBC.HORIZONTAL));
-        addFocusAdapter(row, allData, keys, values);
+        addFocusAdapter(row, keys, values);
 
         final JOptionPane optionPane = new JOptionPane(panel, JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION) {
@@ -288 +299 @@
 
     /**
-     * @param key
-     * @param allData
-     * @param values
-     */
-    private void updateListData(String key, final TreeMap<String, TreeSet<String>> allData,
-            final AutoCompleteComboBox values) {
-        Collection<String> newItems;
-        if (allData.containsKey(key)) {
-            newItems = allData.get(key);
-        } else {
-            newItems = Collections.emptyList();
-        }
-        values.setPossibleItems(newItems);
-    }
-
-    /**
      * This simply fires up an relation editor for the relation shown; everything else
      * is the editor's business.
@@ -330 +325 @@
                 "This will change up to {0} objects.", sel.size(),sel.size())
                 +"<br><br>"+tr("Please select a key")), BorderLayout.NORTH);
-        final TreeMap<String, TreeSet<String>> allData = createAutoCompletionInfo(false);
         final AutoCompleteComboBox keys = new AutoCompleteComboBox();
-        keys.setPossibleItems(allData.keySet());
+        List<String> usedKeys = new ArrayList<String>(listOfUsedTags.getUsedKeys());
+        for (int i = 0; i < propertyData.getRowCount(); ++i) {
+            usedKeys.remove(propertyData.getValueAt(i, 0));
+        }
+        keys.setPossibleItems(usedKeys);
         keys.setEditable(true);
 
@@ -344 +342 @@
         p2.add(values, BorderLayout.CENTER);
 
-        addFocusAdapter(-1, allData, keys, values);
+        addFocusAdapter(-1, keys, values);
         JOptionPane pane = new JOptionPane(p, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION){
             @Override public void selectInitialValue() {
@@ -373 +371 @@
      * @param values
      */
-    private void addFocusAdapter(final int row, final TreeMap<String, TreeSet<String>> allData,
-            final AutoCompleteComboBox keys, final AutoCompleteComboBox values) {
+    private void addFocusAdapter(final int row, final AutoCompleteComboBox keys, final AutoCompleteComboBox values) {
         // get the combo box' editor component
         JTextComponent editor = (JTextComponent)values.getEditor()
@@ -382 +379 @@
             @Override public void focusGained(FocusEvent e) {
                 String key = keys.getEditor().getItem().toString();
-                updateListData(key, allData, values);
+                values.setPossibleItems(listOfUsedTags.getUsedValues(key));
                 objKey=key;
             }
@@ -388 +385 @@
     }
     private String objKey;
-
-    private TreeMap<String, TreeSet<String>> createAutoCompletionInfo(
-            boolean edit) {
-        final TreeMap<String, TreeSet<String>> allData = new TreeMap<String, TreeSet<String>>();
-        for (OsmPrimitive osm : Main.main.getCurrentDataSet().allNonDeletedPrimitives()) {
-            for (String key : osm.keySet()) {
-                TreeSet<String> values = null;
-                if (allData.containsKey(key)) {
-                    values = allData.get(key);
-                } else {
-                    values = new TreeSet<String>();
-                    allData.put(key, values);
-                }
-                values.add(osm.get(key));
-            }
-        }
-        if (!edit) {
-            for (int i = 0; i < propertyData.getRowCount(); ++i) {
-                allData.remove(propertyData.getValueAt(i, 0));
-            }
-        }
-        return allData;
-    }
 
     /**