Changeset 12758 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2017-09-06T15:29:05+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - deprecate DataSet.getAutoCompletionManager() - replacement: AutoCompletionManager.of(DataSet)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSet.java (modified) (1 diff)
• gui/conflict/tags/RelationMemberConflictResolver.java (modified) (3 diffs)
• gui/dialogs/properties/TagEditHelper.java (modified) (2 diffs)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (2 diffs)
• gui/dialogs/relation/MemberRoleCellEditor.java (modified) (2 diffs)
• gui/tagging/TagEditorPanel.java (modified) (1 diff)
• gui/tagging/ac/AutoCompletionManager.java (modified) (4 diffs)
• gui/tagging/presets/TaggingPresetItem.java (modified) (2 diffs)

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

@@ -334 +334 @@
 
     /**
-     * Maintains a list of used tags for autocompletion.
-     */
-    private AutoCompletionManager autocomplete;
-
-    /**
      * Returns the autocompletion manager, which maintains a list of used tags for autocompletion.
      * @return the autocompletion manager
-     */
+     * @deprecated to be removed end of 2017. Use {@link AutoCompletionManager#of(DataSet)} instead.
+     */
+    @Deprecated
     public AutoCompletionManager getAutoCompletionManager() {
-        if (autocomplete == null) {
-            autocomplete = new AutoCompletionManager(this);
-            addDataSetListener(autocomplete);
-        }
-        return autocomplete;
+        return AutoCompletionManager.of(this);
     }
 

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java

@@ -36 +36 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -203 +204 @@
         OsmDataLayer editLayer = MainApplication.getLayerManager().getEditLayer();
         if (editLayer != null) {
-            editLayer.data.getAutoCompletionManager().populateWithMemberRoles(acList);
+            AutoCompletionManager.of(editLayer.data).populateWithMemberRoles(acList);
         }
         tfRole.setAutoCompletionList(acList);
@@ -212 +213 @@
         AutoCompletionList acList2 = new AutoCompletionList();
         if (editLayer != null) {
-            editLayer.data.getAutoCompletionManager().populateWithKeys(acList2);
+            AutoCompletionManager.of(editLayer.data).populateWithKeys(acList2);
         }
         tfKey.setAutoCompletionList(acList2);

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

@@ -446 +446 @@
             mainPanel.add(p, BorderLayout.CENTER);
 
-            AutoCompletionManager autocomplete = MainApplication.getLayerManager().getEditLayer().data.getAutoCompletionManager();
+            AutoCompletionManager autocomplete = AutoCompletionManager.of(MainApplication.getLayerManager().getEditLayer().data);
             List<AutoCompletionListItem> keyList = autocomplete.getKeys();
             keyList.sort(DEFAULT_AC_ITEM_COMPARATOR);
@@ -692 +692 @@
 
             cacheRecentTags();
-            AutoCompletionManager autocomplete = MainApplication.getLayerManager().getEditLayer().data.getAutoCompletionManager();
+            AutoCompletionManager autocomplete = AutoCompletionManager.of(MainApplication.getLayerManager().getEditLayer().data);
             List<AutoCompletionListItem> keyList = autocomplete.getKeys();
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -94 +94 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetHandler;
@@ -423 +424 @@
                         if (list != null) {
                             list.clear();
-                            re.getLayer().data.getAutoCompletionManager().populateWithMemberRoles(list, re.getRelation());
+                            AutoCompletionManager.of(re.getLayer().data).populateWithMemberRoles(list, re.getRelation());
                         }
                     }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 
 /**
@@ -47 +48 @@
         editor.setText(role);
         autoCompletionList.clear();
-        ds.getAutoCompletionManager().populateWithMemberRoles(autoCompletionList, relation);
+        AutoCompletionManager.of(ds).populateWithMemberRoles(autoCompletionList, relation);
         return editor;
     }

trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java

@@ -181 +181 @@
         CheckParameterUtil.ensureParameterNotNull(layer, "layer");
 
-        AutoCompletionManager autocomplete = layer.data.getAutoCompletionManager();
+        AutoCompletionManager autocomplete = AutoCompletionManager.of(layer.data);
         AutoCompletionList acList = new AutoCompletionList();
 

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java

@@ -6 +6 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
@@ -28 +29 @@
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
+import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
@@ -129 +136 @@
     static final Set<String> PRESET_ROLE_CACHE = new HashSet<>();
 
+    private static final Map<DataSet, AutoCompletionManager> INSTANCES = new HashMap<>();
+
     /**
      * Constructs a new {@code AutoCompletionManager}.
@@ -422 +431 @@
         dirty = true;
     }
+
+    private static void registerListeners(AutoCompletionManager autoCompletionManager) {
+        autoCompletionManager.ds.addDataSetListener(autoCompletionManager);
+        MainApplication.getLayerManager().addLayerChangeListener(new LayerChangeListener() {
+            @Override
+            public void layerRemoving(LayerRemoveEvent e) {
+                if (e.getRemovedLayer() instanceof OsmDataLayer
+                        && ((OsmDataLayer) e.getRemovedLayer()).data == autoCompletionManager.ds) {
+                    INSTANCES.remove(autoCompletionManager.ds);
+                    autoCompletionManager.ds.removeDataSetListener(autoCompletionManager);
+                    MainApplication.getLayerManager().removeLayerChangeListener(this);
+                }
+            }
+
+            @Override
+            public void layerOrderChanged(LayerOrderChangeEvent e) {
+                // Do nothing
+            }
+
+            @Override
+            public void layerAdded(LayerAddEvent e) {
+                // Do nothing
+            }
+        });
+    }
+
+    /**
+     * Returns the {@code AutoCompletionManager} for the given data set.
+     * @param dataSet the data set
+     * @return the {@code AutoCompletionManager} for the given data set
+     * @since 12758
+     */
+    public static AutoCompletionManager of(DataSet dataSet) {
+        AutoCompletionManager result = INSTANCES.get(dataSet);
+        if (result == null) {
+            result = new AutoCompletionManager(dataSet);
+            INSTANCES.put(dataSet, result);
+            registerListeners(result);
+        }
+        return result;
+    }
 }

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java

@@ -24 +24 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
@@ -48 +49 @@
         }
         AutoCompletionList list = new AutoCompletionList();
-        layer.data.getAutoCompletionManager().populateWithTagValues(list, keys);
+        AutoCompletionManager.of(layer.data).populateWithTagValues(list, keys);
         field.setAutoCompletionList(list);
     }