Changeset 3210 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

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 )

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/tags

Files:

• RelationMemberConflictResolver.java (modified) (3 diffs)
• RelationMemberConflictResolverColumnModel.java (modified) (1 diff)

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

@@ -33 +33 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.JMultilineLabel;
-import org.openstreetmap.josm.gui.tagging.AutoCompletingTextField;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionCache;
+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;
 
@@ -183 +183 @@
 
     public void prepareForEditing() {
-        AutoCompletionCache.getCacheForLayer(Main.main.getEditLayer()).initFromDataSet();
         AutoCompletionList acList = new AutoCompletionList();
-        AutoCompletionCache.getCacheForLayer(Main.main.getEditLayer()).populateWithMemberRoles(acList);
+        Main.main.getEditLayer().data.getAutoCompletionManager().populateWithMemberRoles(acList);
         tfRole.setAutoCompletionList(acList);
         AutoCompletingTextField editor = (AutoCompletingTextField) tblResolver.getColumnModel().getColumn(2).getCellEditor();
@@ -192 +191 @@
         }
         AutoCompletionList acList2 = new AutoCompletionList();
-        AutoCompletionCache.getCacheForLayer(Main.main.getEditLayer()).populateWithKeys(acList2, false /* don'tappend */);
+        Main.main.getEditLayer().data.getAutoCompletionManager().populateWithKeys(acList2);
         tfKey.setAutoCompletionList(acList2);
     }

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

@@ -8 +8 @@
 
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
-import org.openstreetmap.josm.gui.tagging.AutoCompletingTextField;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 
 public class RelationMemberConflictResolverColumnModel extends DefaultTableColumnModel{