Changeset 12758 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java

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)

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java (modified) (3 diffs)

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