Changeset 2974 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.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/TagEditorPanel.java (modified) (5 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.tagging;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.BorderLayout;
@@ -8 +6 @@
 import java.awt.GridBagLayout;
 import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
+import java.util.logging.Logger;
 
-import javax.swing.AbstractAction;
 import javax.swing.BoxLayout;
+import javax.swing.DefaultListSelectionModel;
 import javax.swing.JButton;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionCache;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
-import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
  * TagEditorPanel is a {@see JPanel} which can be embedded as UI component in
  * UIs. It provides a spreadsheet like tabular control for editing tag names
- * and tag values. Two action buttons are placed on the left, one for additing
+ * and tag values. Two action buttons are placed on the left, one for adding
  * a new tag and one for deleting the currently selected tags.
- *
  *
  */
 public class TagEditorPanel extends JPanel {
+    static private final Logger logger = Logger.getLogger(TagEditorPanel.class.getName());
     /** the tag editor model */
     private TagEditorModel model;
@@ -50 +43 @@
 
         JPanel pnl = new JPanel();
-        model = new TagEditorModel();
-        tagTable = new TagTable(model);
+        DefaultListSelectionModel rowSelectionModel = new DefaultListSelectionModel();
+        DefaultListSelectionModel colSelectionModel = new DefaultListSelectionModel();
+
+        model = new TagEditorModel(rowSelectionModel, colSelectionModel);
+        tagTable = new TagTable(model, rowSelectionModel, colSelectionModel);
 
         pnl.setLayout(new BorderLayout());
@@ -69 +65 @@
         // add action
         //
-        AddAction addAction = new AddAction();
         JButton btn;
-        pnl.add(btn = new JButton(addAction));
+        pnl.add(btn = new JButton(tagTable.getAddAction()));
         btn.setMargin(new Insets(0,0,0,0));
-        tagTable.addPropertyChangeListener(addAction);
+        tagTable.addComponentNotStoppingCellEditing(btn);
 
         // delete action
-        //
-        DeleteAction deleteAction = new DeleteAction();
-        tagTable.getSelectionModel().addListSelectionListener(deleteAction);
-        tagTable.addPropertyChangeListener(deleteAction);
-        pnl.add(btn = new JButton(deleteAction));
+        pnl.add(btn = new JButton(tagTable.getDeleteAction()));
         btn.setMargin(new Insets(0,0,0,0));
+        tagTable.addComponentNotStoppingCellEditing(btn);
         return pnl;
     }
@@ -129 +121 @@
     }
 
-    /**
-     * The action for adding a tag
-     *
-     */
-    class AddAction extends AbstractAction implements PropertyChangeListener {
-        public AddAction() {
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
-            putValue(SHORT_DESCRIPTION, tr("Add a new tag"));
-            updateEnabledState();
-        }
-
-        public void actionPerformed(ActionEvent e) {
-            model.appendNewTag();
-        }
-
-        protected void updateEnabledState() {
-            setEnabled(tagTable.isEnabled());
-        }
-
-        public void propertyChange(PropertyChangeEvent evt) {
-            updateEnabledState();
-        }
-    }
-
-    /**
-     * The action for deleting the currently selected tags
-     *
-     *
-     */
-    class DeleteAction extends AbstractAction implements ListSelectionListener, PropertyChangeListener {
-        public DeleteAction() {
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
-            putValue(SHORT_DESCRIPTION, tr("Delete the selection in the tag table"));
-            updateEnabledState();
-        }
-
-        public void actionPerformed(ActionEvent e) {
-            run();
-        }
-
-        /**
-         * delete a selection of tag names
-         */
-        protected void deleteTagNames() {
-            int[] rows = tagTable.getSelectedRows();
-            model.deleteTagNames(rows);
-        }
-
-        /**
-         * delete a selection of tag values
-         */
-        protected void deleteTagValues() {
-            int[] rows = tagTable.getSelectedRows();
-            model.deleteTagValues(rows);
-        }
-
-        /**
-         * delete a selection of tags
-         */
-        protected void deleteTags() {
-            model.deleteTags(tagTable.getSelectedRows());
-        }
-
-        public void run() {
-            if (!isEnabled())
-                return;
-            if (tagTable.getSelectedColumnCount() == 1) {
-                if (tagTable.getSelectedColumn() == 0) {
-                    deleteTagNames();
-                } else if (tagTable.getSelectedColumn() == 1) {
-                    deleteTagValues();
-                } else
-                    // should not happen
-                    //
-                    throw new IllegalStateException("unexpected selected column: getSelectedColumn() is "
-                            + tagTable.getSelectedColumn());
-            } else if (tagTable.getSelectedColumnCount() == 2) {
-                deleteTags();
-            }
-            if (model.getRowCount() == 0) {
-                model.ensureOneTag();
-            }
-        }
-
-        public void updateEnabledState() {
-            setEnabled(tagTable.isEnabled() &&
-                    (tagTable.getSelectedRowCount() > 0 || tagTable.getSelectedColumnCount() >0));
-        }
-        public void valueChanged(ListSelectionEvent e) {
-            updateEnabledState();
-        }
-
-        public void propertyChange(PropertyChangeEvent evt) {
-            updateEnabledState();
-        }
-    }
-
     public void initAutoCompletion(OsmDataLayer layer) {
         // initialize the autocompletion infrastructure