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

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/gui/dialogs

Files:

• properties/TagEditHelper.java (modified) (2 diffs)
• relation/GenericRelationEditor.java (modified) (2 diffs)
• relation/MemberRoleCellEditor.java (modified) (2 diffs)

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;
     }