Changeset 21024 in osm for applications/editors
- Timestamp:
- 2010-04-29T18:00:23+02:00 (14 years ago)
- Location:
- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java
r20058 r21024 31 31 import org.openstreetmap.josm.data.osm.DataSet; 32 32 import org.openstreetmap.josm.data.osm.OsmPrimitive; 33 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletion Cache;33 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager; 34 34 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList; 35 35 import org.openstreetmap.josm.plugins.tageditor.ac.AutoCompletionListViewer; … … 77 77 78 78 /** the cache of auto completion values used by the tag editor */ 79 private AutoCompletion Cache acCache = null;79 private AutoCompletionManager autocomplete = null; 80 80 81 81 private OKAction okAction = null; … … 115 115 aclViewer = new AutoCompletionListViewer(autoCompletionList); 116 116 tagEditor.setAutoCompletionList(autoCompletionList); 117 tagEditor.setAutoCompletionCache(acCache);118 117 aclViewer.addAutoCompletionListListener(tagEditor); 119 118 tagEditor.addComponentNotStoppingCellEditing(aclViewer); … … 252 251 */ 253 252 protected TagEditorDialog() { 254 acCache = new AutoCompletionCache();255 253 build(); 256 254 } … … 280 278 tagEditor.getModel().clearAppliedPresets(); 281 279 tagEditor.getModel().initFromJOSMSelection(); 282 //acCache.initFromJOSMDataset(); 280 autocomplete = Main.main.getEditLayer().data.getAutoCompletionManager(); 281 tagEditor.setAutoCompletionManager(autocomplete); 283 282 getModel().ensureOneTag(); 284 283 } -
applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditor.java
r20530 r21024 16 16 17 17 import org.openstreetmap.josm.gui.tagging.TagTable; 18 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletion Cache;18 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager; 19 19 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList; 20 20 import org.openstreetmap.josm.plugins.tageditor.ac.IAutoCompletionListListener; … … 179 179 } 180 180 181 public void setAutoCompletion Cache(AutoCompletionCache acCache) {182 tblTagEditor.setAutoCompletion Cache(acCache);181 public void setAutoCompletionManager(AutoCompletionManager autocomplete) { 182 tblTagEditor.setAutoCompletionManager(autocomplete); 183 183 } 184 184 -
applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagSpecificationAwareTagCellEditor.java
r20058 r21024 11 11 import org.openstreetmap.josm.plugins.tageditor.tagspec.TagSpecifications; 12 12 13 public class TagSpecificationAwareTagCellEditor extends TagCellEditor {13 public class TagSpecificationAwareTagCellEditor extends TagCellEditor { 14 14 private static final Logger logger = Logger.getLogger(TagCellEditor.class.getName()); 15 15 … … 42 42 // add the list of keys in the current data set 43 43 // 44 a cCache.populateWithKeys(autoCompletionList, false /* don't append */);44 autocomplete.populateWithKeys(autoCompletionList); 45 45 AutoCompletionContext context = new AutoCompletionContext(); 46 46 try { … … 77 77 } 78 78 autoCompletionList.clear(); 79 a cCache.populateWithTagValues(autoCompletionList, forKey, false /* don't append */);79 autocomplete.populateWithTagValues(autoCompletionList, forKey); 80 80 81 81 AutoCompletionContext context = new AutoCompletionContext(); -
applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java
r15319 r21024 129 129 JPanel pnl = new JPanel(); 130 130 pnl.setLayout(new FlowLayout(FlowLayout.LEFT)); 131 btnApply = new JButton( "Apply");131 btnApply = new JButton(tr("Apply")); 132 132 pnl.add(btnApply); 133 133 btnApply.addActionListener(
Note:
See TracChangeset
for help on using the changeset viewer.