Changeset 3210 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java

Timestamp:

2010-04-26T23:25:10+02:00 (14 years ago)

Author:

bastiK

Message:

autocompletion rework; breaks tageditor plugin and possibly other plugins
(merged the 2 autocompletion systems; adds presets values for the properties dialog )

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java (modified) (4 diffs)

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

@@ -10 +10 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.tagging.AutoCompletingTextField;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionCache;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
 
@@ -19 +20 @@
 
     private AutoCompletingTextField editor = null;
+    private DataSet ds;
 
     /** user input is matched against this list of auto completion items */
@@ -26 +28 @@
      * constructor
      */
-    public MemberRoleCellEditor() {
+    public MemberRoleCellEditor(DataSet ds) {
+        this.ds = ds;
         editor = new AutoCompletingTextField();
         autoCompletionList = new AutoCompletionList();
@@ -40 +43 @@
         String role = (String)value;
         editor.setText(role);
-        AutoCompletionCache.getCacheForLayer(Main.main.getEditLayer()).populateWithMemberRoles(autoCompletionList);
+        ds.getAutoCompletionManager().populateWithMemberRoles(autoCompletionList);
         return editor;
     }