Changeset 16495 in josm for trunk

Timestamp:

2020-05-24T21:27:18+02:00 (4 years ago)

Author:

GerdP

Message:

see #19257: reduce number of ShowHistoryAction implementations
Add AbstractShowHistoryAction with common texts "History" and "Download and show the history of the selected objects" to reduce number of I18N strings. To be used with popup menus and side buttons where selected objects are known.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AbstractShowHistoryAction.java (added)
• gui/dialogs/SelectionListDialog.java (modified) (3 diffs)
• gui/dialogs/changeset/ChangesetContentPanel.java (modified) (2 diffs)
• gui/dialogs/relation/MemberTable.java (modified) (2 diffs)
• gui/history/ShowHistoryAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -38 +38 @@
 import javax.swing.event.PopupMenuEvent;
 
+import org.openstreetmap.josm.actions.AbstractShowHistoryAction;
 import org.openstreetmap.josm.actions.AbstractSelectAction;
 import org.openstreetmap.josm.actions.AutoScaleAction;
@@ -348 +349 @@
      * The action for showing history information of the current history item.
      */
-    class ShowHistoryAction extends AbstractAction implements ListSelectionListener, DataSelectionListener {
+    class ShowHistoryAction extends AbstractShowHistoryAction implements ListSelectionListener, DataSelectionListener {
         /**
          * Constructs a new {@code ShowHistoryAction}.
          */
         ShowHistoryAction() {
-            putValue(NAME, tr("History"));
-            putValue(SHORT_DESCRIPTION, tr("Display the history of the selected objects."));
-            new ImageProvider("dialogs", "history").getResource().attachImageIcon(this, true);
+            super();
             updateEnabledState(model.getSize());
         }
@@ -371 +370 @@
 
         protected void updateEnabledState(int osmSelectionSize) {
-            // See #10830 - allow to click on history button is a single object is selected, even if not selected again in the list
+            // See #10830 - allow to click on history button if a single object is selected, even if not selected again in the list
             setEnabled(!model.isSelectionEmpty() || osmSelectionSize == 1);
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java

@@ -35 +35 @@
 import javax.swing.event.ListSelectionListener;
 
+import org.openstreetmap.josm.actions.AbstractShowHistoryAction;
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.HistoryInfoAction;
@@ -223 +224 @@
     }
 
-    class ShowHistoryAction extends AbstractAction implements ListSelectionListener {
+    class ShowHistoryAction extends AbstractShowHistoryAction implements ListSelectionListener {
 
         ShowHistoryAction() {
-            putValue(NAME, tr("Show history"));
-            new ImageProvider("dialogs", "history").getResource().attachImageIcon(this);
-            putValue(SHORT_DESCRIPTION, tr("Download and show the history of the selected objects"));
+            super();
             updateEnabledState();
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

@@ -22 +22 @@
 import javax.swing.event.ListSelectionListener;
 
+import org.openstreetmap.josm.actions.AbstractShowHistoryAction;
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.AutoScaleAction.AutoScaleMode;
@@ -106 +107 @@
         menu.add(new SelectPreviousGapAction());
         menu.add(new SelectNextGapAction());
-        menu.add(new HistoryInfoAction() {
+        menu.add(new AbstractShowHistoryAction() {
             @Override
             public void actionPerformed(ActionEvent ae) {

trunk/src/org/openstreetmap/josm/gui/history/ShowHistoryAction.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.history;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
@@ -10 +8 @@
 import java.util.function.Function;
 
-import javax.swing.AbstractAction;
-
+import org.openstreetmap.josm.actions.AbstractShowHistoryAction;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
-import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
  * Open a history browser with the history of an object.
  */
-class ShowHistoryAction extends AbstractAction {
+class ShowHistoryAction extends AbstractShowHistoryAction {
     private transient PrimitiveId primitiveId;
-
-    /**
-     * Constructs a new {@code ShowHistoryAction}.
-     */
-    ShowHistoryAction() {
-        putValue(NAME, tr("Show history"));
-        putValue(SHORT_DESCRIPTION, tr("Display the history of the selected object."));
-        new ImageProvider("dialogs", "history").getResource().attachImageIcon(this, true);
-    }
 
     @Override