Changeset 2974 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java

Timestamp:

13.02.2010 17:45:10 (2 years ago)

Author:

Gubaer

Message:

fixed #4506: relation-editor: tag-delete-button does not work
removed duplicated code
fixed selection behaviour for tags tag in RelationEditor and UploadDialog

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java

@@ -10 +10 @@
 
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionCache;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPritority;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem;
 
 /**
@@ -26 +24 @@
     private AutoCompletingTextField editor = null;
     private TagModel currentTag = null;
-    private TagEditorModel tagEditorModel = null;
-    private int currentColumn = 0;
 
     /** the cache of auto completion items derived from the current JOSM data set */
@@ -99 +95 @@
         if (column == 0) {
             editor.setText(currentTag.getName());
-            currentColumn = 0;
             TagEditorModel model = (TagEditorModel)table.getModel();
             initAutoCompletionListForKeys(model, currentTag);
@@ -112 +107 @@
                 editor.setText("");
             }
-            currentColumn = 1;
             initAutoCompletionListForValues(currentTag.getName());
             return editor;
@@ -123 +117 @@
     public Object getCellEditorValue() {
         return editor.getText();
-    }
-
-    @Override
-    public void cancelCellEditing() {
-        super.cancelCellEditing();
-    }
-
-    @Override
-    public boolean stopCellEditing() {
-        if (tagEditorModel == null) {
-            logger.warning("no tag editor model set. Can't update edited values. Please set tag editor model first");
-            return super.stopCellEditing();
-        }
-
-        if (currentColumn == 0) {
-            tagEditorModel.updateTagName(currentTag, editor.getText());
-        } else if (currentColumn == 1){
-            if (currentTag.getValueCount() > 1 && ! editor.getText().equals("")) {
-                tagEditorModel.updateTagValue(currentTag, editor.getText());
-            } else if (currentTag.getValueCount() <= 1) {
-                tagEditorModel.updateTagValue(currentTag, editor.getText());
-            }
-        }
-        return super.stopCellEditing();
     }
 
@@ -180 +150 @@
         return editor;
     }
-
-    /**
-     * sets the tag editor model
-     *
-     * @param tagEditorModel  the tag editor model
-     */
-    public void setTagEditorModel(TagEditorModel tagEditorModel) {
-        this.tagEditorModel = tagEditorModel;
-    }
 }