Changeset 12933 in josm
- Timestamp:
- 2017-10-07T14:39:29+02:00 (6 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
r12846 r12933 63 63 import org.openstreetmap.josm.gui.ScrollViewport; 64 64 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils; 65 import org.openstreetmap.josm.gui.dialogs.relation.actions.AbstractRelationEditorAction; 65 66 import org.openstreetmap.josm.gui.dialogs.relation.actions.AddSelectedAfterSelection; 66 67 import org.openstreetmap.josm.gui.dialogs.relation.actions.AddSelectedAtEndAction; … … 83 84 import org.openstreetmap.josm.gui.dialogs.relation.actions.RemoveSelectedAction; 84 85 import org.openstreetmap.josm.gui.dialogs.relation.actions.ReverseAction; 86 import org.openstreetmap.josm.gui.dialogs.relation.actions.SelectAction; 85 87 import org.openstreetmap.josm.gui.dialogs.relation.actions.SelectPrimitivesForSelectedMembersAction; 86 88 import org.openstreetmap.josm.gui.dialogs.relation.actions.SelectedMembersForSelectionAction; … … 143 145 private final ApplyAction applyAction; 144 146 /** 147 * Action for performing the {@link SelectAction} 148 */ 149 private final SelectAction selectAction; 150 /** 145 151 * Action for performing the {@link DuplicateRelationAction} 146 152 */ … … 245 251 refreshAction = new RefreshAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this); 246 252 applyAction = new ApplyAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this); 253 selectAction = new SelectAction(getLayer(), this); 247 254 duplicateAction = new DuplicateRelationAction(memberTableModel, tagEditorPanel.getModel(), getLayer()); 248 255 deleteAction = new DeleteCurrentRelationAction(getLayer(), this); … … 252 259 cancelAction = new CancelAction(memberTable, memberTableModel, tagEditorPanel.getModel(), getLayer(), this, tfRole); 253 260 254 getContentPane().add(buildToolBar(refreshAction, applyAction, duplicateAction, deleteAction), BorderLayout.NORTH);261 getContentPane().add(buildToolBar(refreshAction, applyAction, selectAction, duplicateAction, deleteAction), BorderLayout.NORTH); 255 262 getContentPane().add(tabbedPane, BorderLayout.CENTER); 256 263 getContentPane().add(buildOkCancelButtonPanel(okAction, cancelAction), BorderLayout.SOUTH); … … 331 338 332 339 /** 340 * Select relation. 341 * @see SelectAction 342 * @since 12933 343 */ 344 public void select() { 345 selectAction.actionPerformed(null); 346 } 347 348 /** 333 349 * Cancel changes. 334 350 * @see CancelAction … … 340 356 /** 341 357 * Creates the toolbar 342 * @param refreshAction refresh action 343 * @param applyAction apply action 344 * @param duplicateAction duplicate action 345 * @param deleteAction delete action 346 * 358 * @param actions relation toolbar actions 347 359 * @return the toolbar 348 * /349 protected static JToolBar buildToolBar(RefreshAction refreshAction, ApplyAction applyAction,350 DuplicateRelationAction duplicateAction, DeleteCurrentRelationAction deleteAction) {360 * @since 12933 361 */ 362 protected static JToolBar buildToolBar(AbstractRelationEditorAction... actions) { 351 363 JToolBar tb = new JToolBar(); 352 364 tb.setFloatable(false); 353 tb.add(refreshAction); 354 tb.add(applyAction); 355 tb.add(duplicateAction); 356 tb.add(deleteAction); 365 for (AbstractRelationEditorAction action : actions) { 366 tb.add(action); 367 } 357 368 return tb; 358 369 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java
r12846 r12933 17 17 * @since 9496 18 18 */ 19 abstract class AbstractRelationEditorAction extends AbstractAction implements TableModelListener, ListSelectionListener {19 public abstract class AbstractRelationEditorAction extends AbstractAction implements TableModelListener, ListSelectionListener { 20 20 protected final MemberTable memberTable; 21 21 protected final MemberTableModel memberTableModel; -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditorTest.java
r12728 r12933 23 23 import org.openstreetmap.josm.gui.dialogs.relation.actions.OKAction; 24 24 import org.openstreetmap.josm.gui.dialogs.relation.actions.RefreshAction; 25 import org.openstreetmap.josm.gui.dialogs.relation.actions.SelectAction; 25 26 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 26 27 import org.openstreetmap.josm.gui.tagging.TagEditorModel; … … 143 144 new RefreshAction(memberTable, memberTableModel, tagModel, layer, re), 144 145 new ApplyAction(memberTable, memberTableModel, tagModel, layer, re), 146 new SelectAction(layer, re), 145 147 new DuplicateRelationAction(memberTableModel, tagModel, layer), 146 148 new DeleteCurrentRelationAction(layer, re))); -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java
r12564 r12933 60 60 new PasteMembersAction(memberTable, layer, editor).actionPerformed(null); 61 61 62 new SelectAction(layer, editor).actionPerformed(null); 62 63 new DeleteCurrentRelationAction(layer, editor).actionPerformed(null); 63 64
Note:
See TracChangeset
for help on using the changeset viewer.