Changeset 21024 in osm for applications/editors

Timestamp:

2010-04-29T18:00:23+02:00 (15 years ago)

Author:

bastik

Message:

'Updating to JOSM 3141'

Location:

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor

Files:

• TagEditorDialog.java (modified) (5 diffs)
• editor/TagEditor.java (modified) (2 diffs)
• editor/TagSpecificationAwareTagCellEditor.java (modified) (3 diffs)
• preset/ui/TabularPresetSelector.java (modified) (1 diff)

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java

@@ -31 +31 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionCache;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
 import org.openstreetmap.josm.plugins.tageditor.ac.AutoCompletionListViewer;
@@ -77 +77 @@
 
         /** the cache of auto completion values used by the tag editor */
-        private AutoCompletionCache acCache = null;
+        private AutoCompletionManager autocomplete = null;
 
         private OKAction okAction = null;
@@ -115 +115 @@
                 aclViewer = new AutoCompletionListViewer(autoCompletionList);
                 tagEditor.setAutoCompletionList(autoCompletionList);
-                tagEditor.setAutoCompletionCache(acCache);
                 aclViewer.addAutoCompletionListListener(tagEditor);
                 tagEditor.addComponentNotStoppingCellEditing(aclViewer);
@@ -252 +251 @@
          */
         protected TagEditorDialog() {
-                acCache = new AutoCompletionCache();    
                 build();
         }
@@ -280 +278 @@
                 tagEditor.getModel().clearAppliedPresets();
                 tagEditor.getModel().initFromJOSMSelection();
-                //acCache.initFromJOSMDataset();
+                autocomplete = Main.main.getEditLayer().data.getAutoCompletionManager();
+                tagEditor.setAutoCompletionManager(autocomplete);
                 getModel().ensureOneTag();
         }

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditor.java

@@ -16 +16 @@
 
 import org.openstreetmap.josm.gui.tagging.TagTable;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionCache;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
 import org.openstreetmap.josm.plugins.tageditor.ac.IAutoCompletionListListener;
@@ -179 +179 @@
         }
 
-        public void setAutoCompletionCache(AutoCompletionCache acCache) {
-                tblTagEditor.setAutoCompletionCache(acCache);
+        public void setAutoCompletionManager(AutoCompletionManager autocomplete) {
+                tblTagEditor.setAutoCompletionManager(autocomplete);
         }
 

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagSpecificationAwareTagCellEditor.java

@@ -11 +11 @@
 import org.openstreetmap.josm.plugins.tageditor.tagspec.TagSpecifications;
 
-public class TagSpecificationAwareTagCellEditor extends TagCellEditor{
+public class TagSpecificationAwareTagCellEditor extends TagCellEditor {
         private static final Logger logger = Logger.getLogger(TagCellEditor.class.getName());
 
@@ -42 +42 @@
                 // add the list of keys in the current data set
                 //
-                acCache.populateWithKeys(autoCompletionList, false /* don't append */);
+                autocomplete.populateWithKeys(autoCompletionList);
                 AutoCompletionContext context = new AutoCompletionContext();
                 try {
@@ -77 +77 @@
                 }
                 autoCompletionList.clear();
-                acCache.populateWithTagValues(autoCompletionList, forKey, false /* don't append */);
+                autocomplete.populateWithTagValues(autoCompletionList, forKey);
                 
                 AutoCompletionContext context = new AutoCompletionContext();

applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java

@@ -129 +129 @@
                 JPanel pnl = new JPanel();
                 pnl.setLayout(new FlowLayout(FlowLayout.LEFT));
-                btnApply = new JButton("Apply");
+                btnApply = new JButton(tr("Apply"));
                 pnl.add(btnApply);
                 btnApply.addActionListener(