Changeset 10082 in josm for trunk

Timestamp:

2016-03-30T02:55:55+02:00 (8 years ago)

Author:

Don-vip

Message:

remove useless code

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/relation/RunnableAction.java (deleted)
• tagging/TagTable.java (modified) (9 diffs)

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

@@ -38 +38 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Tag;
-import org.openstreetmap.josm.gui.dialogs.relation.RunnableAction;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
@@ -162 +161 @@
      *
      */
-    class DeleteAction extends RunnableAction implements ListSelectionListener {
+    class DeleteAction extends AbstractAction implements ListSelectionListener {
 
         DeleteAction() {
@@ -197 +196 @@
 
         @Override
-        public void run() {
+        public void actionPerformed(ActionEvent e) {
             if (!isEnabled())
                 return;
@@ -251 +250 @@
      *
      */
-    class AddAction extends RunnableAction implements PropertyChangeListener {
+    class AddAction extends AbstractAction implements PropertyChangeListener {
         AddAction() {
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
@@ -260 +259 @@
 
         @Override
-        public void run() {
+        public void actionPerformed(ActionEvent e) {
             CellEditor editor = getCellEditor();
             if (editor != null) {
@@ -285 +284 @@
      * Action to be run when the user wants to paste tags from buffer
      */
-    class PasteAction extends RunnableAction implements PropertyChangeListener {
+    class PasteAction extends AbstractAction implements PropertyChangeListener {
         PasteAction() {
             putValue(SMALL_ICON, ImageProvider.get("", "pastetags"));
@@ -294 +293 @@
 
         @Override
-        public void run() {
+        public void actionPerformed(ActionEvent e) {
             Relation relation = new Relation();
             model.applyToPrimitive(relation);
@@ -333 +332 @@
 
     /** the delete action */
-    private RunnableAction deleteAction;
+    private DeleteAction deleteAction;
 
     /** the add action */
-    private RunnableAction addAction;
+    private AddAction addAction;
 
     /** the tag paste action */
-    private RunnableAction pasteAction;
-
-    /**
-     *
+    private PasteAction pasteAction;
+
+    /**
+     * Returns the delete action.
      * @return the delete action used by this table
      */
-    public RunnableAction getDeleteAction() {
+    public DeleteAction getDeleteAction() {
         return deleteAction;
     }
 
-    public RunnableAction getAddAction() {
+    /**
+     * Returns the add action.
+     * @return the add action used by this table
+     */
+    public AddAction getAddAction() {
         return addAction;
     }
 
-    public RunnableAction getPasteAction() {
+    /**
+     * Returns the paste action.
+     * @return the paste action used by this table
+     */
+    public PasteAction getPasteAction() {
         return pasteAction;
     }
@@ -429 +436 @@
                 //
                 return super.processKeyBinding(ks, e, condition, pressed);
-            getDeleteAction().run();
+            getDeleteAction().actionPerformed(null);
         }
         return super.processKeyBinding(ks, e, condition, pressed);