Changeset 12933 in josm for trunk

Timestamp:

2017-10-07T14:39:29+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15368 - Button that selects the relation from relation editor

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (7 diffs)
• src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/relation/actions/SelectAction.java (added)
• test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java (modified) (1 diff)

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

@@ -63 +63 @@
 import org.openstreetmap.josm.gui.ScrollViewport;
 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.AbstractRelationEditorAction;
 import org.openstreetmap.josm.gui.dialogs.relation.actions.AddSelectedAfterSelection;
 import org.openstreetmap.josm.gui.dialogs.relation.actions.AddSelectedAtEndAction;
@@ -83 +84 @@
 import org.openstreetmap.josm.gui.dialogs.relation.actions.RemoveSelectedAction;
 import org.openstreetmap.josm.gui.dialogs.relation.actions.ReverseAction;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.SelectAction;
 import org.openstreetmap.josm.gui.dialogs.relation.actions.SelectPrimitivesForSelectedMembersAction;
 import org.openstreetmap.josm.gui.dialogs.relation.actions.SelectedMembersForSelectionAction;
@@ -143 +145 @@
     private final ApplyAction applyAction;
     /**
+     * Action for performing the {@link SelectAction}
+     */
+    private final SelectAction selectAction;
+    /**
      * Action for performing the {@link DuplicateRelationAction}
      */
@@ -245 +251 @@
         refreshAction = new RefreshAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this);
         applyAction = new ApplyAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this);
+        selectAction = new SelectAction(getLayer(), this);
         duplicateAction = new DuplicateRelationAction(memberTableModel, tagEditorPanel.getModel(), getLayer());
         deleteAction = new DeleteCurrentRelationAction(getLayer(), this);
@@ -252 +259 @@
         cancelAction = new CancelAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this, tfRole);
 
-        getContentPane().add(buildToolBar(refreshAction, applyAction, duplicateAction, deleteAction), BorderLayout.NORTH);
+        getContentPane().add(buildToolBar(refreshAction, applyAction, selectAction, duplicateAction, deleteAction), BorderLayout.NORTH);
         getContentPane().add(tabbedPane, BorderLayout.CENTER);
         getContentPane().add(buildOkCancelButtonPanel(okAction, cancelAction), BorderLayout.SOUTH);
@@ -331 +338 @@
 
     /**
+     * Select relation.
+     * @see SelectAction
+     * @since 12933
+     */
+    public void select() {
+        selectAction.actionPerformed(null);
+    }
+
+    /**
      * Cancel changes.
      * @see CancelAction
@@ -340 +356 @@
     /**
      * Creates the toolbar
-     * @param refreshAction refresh action
-     * @param applyAction apply action
-     * @param duplicateAction duplicate action
-     * @param deleteAction delete action
-     *
+     * @param actions relation toolbar actions
      * @return the toolbar
-     */
-    protected static JToolBar buildToolBar(RefreshAction refreshAction, ApplyAction applyAction,
-            DuplicateRelationAction duplicateAction, DeleteCurrentRelationAction deleteAction) {
+     * @since 12933
+     */
+    protected static JToolBar buildToolBar(AbstractRelationEditorAction... actions) {
         JToolBar tb = new JToolBar();
         tb.setFloatable(false);
-        tb.add(refreshAction);
-        tb.add(applyAction);
-        tb.add(duplicateAction);
-        tb.add(deleteAction);
+        for (AbstractRelationEditorAction action : actions) {
+            tb.add(action);
+        }
         return tb;
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java

@@ -17 +17 @@
  * @since 9496
  */
-abstract class AbstractRelationEditorAction extends AbstractAction implements TableModelListener, ListSelectionListener {
+public abstract class AbstractRelationEditorAction extends AbstractAction implements TableModelListener, ListSelectionListener {
     protected final MemberTable memberTable;
     protected final MemberTableModel memberTableModel;

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java

@@ -23 +23 @@
 import org.openstreetmap.josm.gui.dialogs.relation.actions.OKAction;
 import org.openstreetmap.josm.gui.dialogs.relation.actions.RefreshAction;
+import org.openstreetmap.josm.gui.dialogs.relation.actions.SelectAction;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.tagging.TagEditorModel;
@@ -143 +144 @@
                 new RefreshAction(memberTable, memberTableModel, tagModel, layer, re),
                 new ApplyAction(memberTable, memberTableModel, tagModel, layer, re),
+                new SelectAction(layer, re),
                 new DuplicateRelationAction(memberTableModel, tagModel, layer),
                 new DeleteCurrentRelationAction(layer, re)));

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java

@@ -60 +60 @@
         new PasteMembersAction(memberTable, layer, editor).actionPerformed(null);
 
+        new SelectAction(layer, editor).actionPerformed(null);
         new DeleteCurrentRelationAction(layer, editor).actionPerformed(null);