Changeset 14416 in osm for applications

Timestamp:

2009-04-07T20:56:18+02:00 (16 years ago)

Author:

guggis

Message:

cosmetics

Location:

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

Files:

• TableCellEditor.java (modified) (5 diffs)
• TagEditorModel.java (modified) (3 diffs)

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

@@ -42 +42 @@
         private AutoCompletionList autoCompletionList = null;
         
+
         /**
          * constructor 
@@ -128 +129 @@
                 }
                 
-                logger.info("acCache=" + acCache);
                 for (String value : acCache.getValues(forKey)) {
                         autoCompletionList.add(
@@ -182 +182 @@
         @Override 
         public Object getCellEditorValue() {
-                String value = "";
+                return editor.getText();
+    }
+
+        
+        
+        @Override
+        public void cancelCellEditing() {
+                super.cancelCellEditing();
+        }
+
+        @Override
+        public boolean stopCellEditing() {
+                
                 if (currentColumn == 0) {
                         currentTag.setName(editor.getText());
@@ -192 +204 @@
                         }
                 }
-            return value;
-    }
-
-        
-        
-        @Override
-        public void cancelCellEditing() {
-                super.cancelCellEditing();
-        }
-
-        @Override
-        public boolean stopCellEditing() {
-                boolean ret = super.stopCellEditing();
-                return ret; 
-                
+            
+                return super.stopCellEditing(); 
         }
 
@@ -230 +229 @@
                 this.acCache = acCache;
         }
+        
 
         

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

@@ -89 +89 @@
         @Override public Object getValueAt(int rowIndex, int columnIndex) {
                 if (rowIndex >= getRowCount()) {
-                        return null; 
-                }
-                if (columnIndex >= getColumnCount()) {
-                        return null;
+                        throw new IndexOutOfBoundsException("unexpected rowIndex: rowIndex=" + rowIndex);
                 }
                 
@@ -104 +101 @@
                 }               
     }
+        
         
         /**
@@ -534 +532 @@
                 fireTableDataChanged();
         }
+        
+        
+        public void updateTagName(TagModel tag, String newName) {
+                String oldName = tag.getName();
+                tag.setName(newName);
+                if (! newName.equals(oldName)) {
+                        setDirty(true);
+                }
+        }
+        
+        public void updateTagValue(TagModel tag, String newValue) {
+                String oldValue = tag.getValue();
+                tag.setValue(newValue);
+                if (! newValue.equals(oldValue)) {
+                        setDirty(true);
+                }
+        }
 }