Changeset 14338 in osm for applications/editors/josm

Timestamp:

2009-03-29T20:01:34+02:00 (16 years ago)

Author:

guggis

Message:

 

Location:

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

Files:

• TagEditorDialog.java (modified) (2 diffs)
• editor/PresetManager.java (modified) (1 diff)
• editor/TableCellEditor.java (modified) (2 diffs)
• editor/TagEditor.java (modified) (1 diff)
• editor/TagEditorModel.java (modified) (3 diffs)
• editor/TagTable.java (modified) (2 diffs)

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

@@ -173 +173 @@
                 aclViewer = new AutoCompletionListViewer(autoCompletionList);
                 tagEditor.setAutoCompletionList(autoCompletionList);
+                tagEditor.setAutoCompletionCache(acCache);
                 aclViewer.addAutoCompletionListListener(tagEditor);             
                 
@@ -305 +306 @@
          */
         public void startEditSession() {                
-                model.initFromJOSMSelection();
+                model.clearAppliedPresets();
+                model.initFromJOSMSelection();          
                 acCache.initFromJOSMDataset();
                 getModel().ensureOneTag();

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

@@ -85 +85 @@
                 Item item= (Item)presets.getSelectedItem();
                 if (item != null && model !=null) {
-                        model.removeAppliedItem(item);
+                        model.removeAppliedPreset(item);
                 }
         }

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

@@ -128 +128 @@
                 }
                 
+                logger.info("acCache=" + acCache);
                 for (String value : acCache.getValues(forKey)) {
                         autoCompletionList.add(
@@ -225 +226 @@
         editor.setAutoCompletionList(autoCompletionList);
     }
+        
+        public void setAutoCompletionCache(AutoCompletionCache acCache) {
+                this.acCache = acCache;
+        }
 
         

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

@@ -159 +159 @@
                 tblTagEditor.setAutoCompletionList(autoCompletionList);
         }
+        
+        public void setAutoCompletionCache(AutoCompletionCache acCache) {
+                tblTagEditor.setAutoCompletionCache(acCache);
+        }
 
         @Override

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

@@ -457 +457 @@
                                 } else {
                                         TagModel tagModel = get(tag.getKey());
-                                        tagModel.setValue(tag.getValue());
+                                        // only overwrite an existing value if the preset
+                                        // proposes a value. I.e. don't overwrite
+                                        // existing values for tag 'name' with an empty string
+                                        //
+                                        if (tag.getValue() != null) {
+                                                tagModel.setValue(tag.getValue());
+                                        }
                                 }
                         }
@@ -491 +497 @@
         }
 
-        public void removeAppliedItem(Item item) {
+        public void removeAppliedPreset(Item item) {
                 if (item == null) {
                         return; 
@@ -520 +526 @@
         }
         
+        public void clearAppliedPresets() {
+                appliedPresets.removeAllElements();
+                fireTableDataChanged();
+        }
+        
         public void highlightCurrentPreset() {
                 fireTableDataChanged();

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

@@ -29 +29 @@
 import javax.swing.table.TableModel;
 
+import org.openstreetmap.josm.plugins.tageditor.ac.AutoCompletionCache;
 import org.openstreetmap.josm.plugins.tageditor.ac.AutoCompletionList;
 
@@ -402 +403 @@
         }
         
+        public void setAutoCompletionCache(AutoCompletionCache acCache) {
+                if (acCache == null) {
+                        logger.warning("argument acCache should not be null. Aborting.");
+                        return; 
+                }
+                if (editor != null) {
+                        editor.setAutoCompletionCache(acCache);
+                }
+        }
+        
         public AutoCompletionList getAutoCompletionList() {
                 if (editor != null) {