Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 14029) @@ -251,5 +251,5 @@ } }); - + IRelationEditorActionAccess actionAccess = new RelationEditorActionAccess(); @@ -294,7 +294,7 @@ // handle uncommon situation, that user has no keystroke assigned to paste registerCopyPasteAction(new PasteMembersAction(actionAccess) { - private static final long serialVersionUID = 1L; - - @Override + private static final long serialVersionUID = 1L; + + @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); @@ -609,7 +609,7 @@ */ static class LeftButtonToolbar extends JToolBar { - private static final long serialVersionUID = 1L; - - /** + private static final long serialVersionUID = 1L; + + /** * Constructs a new {@code LeftButtonToolbar}. * @param re relation editor @@ -622,30 +622,30 @@ // Move groups.add(buildNativeGroup(10, - new MoveUpAction(editorAccess, "moveUp"), - new MoveDownAction(editorAccess, "moveDown") - )); + new MoveUpAction(editorAccess, "moveUp"), + new MoveDownAction(editorAccess, "moveDown") + )); // Edit groups.add(buildNativeGroup(20, - new EditAction(editorAccess), - new RemoveAction(editorAccess, "removeSelected") - )); + new EditAction(editorAccess), + new RemoveAction(editorAccess, "removeSelected") + )); // Sort groups.add(buildNativeGroup(30, - new SortAction(editorAccess), - new SortBelowAction(editorAccess) - )); + new SortAction(editorAccess), + new SortBelowAction(editorAccess) + )); // Reverse groups.add(buildNativeGroup(40, - new ReverseAction(editorAccess) - )); + new ReverseAction(editorAccess) + )); // Download groups.add(buildNativeGroup(50, - new DownloadIncompleteMembersAction(editorAccess, "downloadIncomplete"), - new DownloadSelectedIncompleteMembersAction(editorAccess) - )); + new DownloadIncompleteMembersAction(editorAccess, "downloadIncomplete"), + new DownloadSelectedIncompleteMembersAction(editorAccess) + )); groups.addAll(RelationEditorHooks.getMemberActions()); - + IRelationEditorActionGroup.fillToolbar(this, groups, editorAccess); - + InputMap inputMap = editorAccess.getMemberTable().getInputMap(MemberTable.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); @@ -654,5 +654,5 @@ inputMap.put((KeyStroke) new MoveDownAction(editorAccess, "moveDown").getValue(AbstractAction.ACCELERATOR_KEY), "moveDown"); inputMap.put((KeyStroke) new DownloadIncompleteMembersAction( - editorAccess, "downloadIncomplete").getValue(AbstractAction.ACCELERATOR_KEY), "downloadIncomplete"); + editorAccess, "downloadIncomplete").getValue(AbstractAction.ACCELERATOR_KEY), "downloadIncomplete"); } } @@ -671,36 +671,36 @@ tb.setFloatable(false); - List groups = new ArrayList<>(); - groups.add(buildNativeGroup(10, - new AddSelectedAtStartAction(editorAccess), - new AddSelectedBeforeSelection(editorAccess), - new AddSelectedAfterSelection(editorAccess), - new AddSelectedAtEndAction(editorAccess) - )); - groups.add(buildNativeGroup(20, - new SelectedMembersForSelectionAction(editorAccess), - new SelectPrimitivesForSelectedMembersAction(editorAccess) - )); - groups.add(buildNativeGroup(30, - new RemoveSelectedAction(editorAccess) - )); - groups.addAll(RelationEditorHooks.getSelectActions()); - + List groups = new ArrayList<>(); + groups.add(buildNativeGroup(10, + new AddSelectedAtStartAction(editorAccess), + new AddSelectedBeforeSelection(editorAccess), + new AddSelectedAfterSelection(editorAccess), + new AddSelectedAtEndAction(editorAccess) + )); + groups.add(buildNativeGroup(20, + new SelectedMembersForSelectionAction(editorAccess), + new SelectPrimitivesForSelectedMembersAction(editorAccess) + )); + groups.add(buildNativeGroup(30, + new RemoveSelectedAction(editorAccess) + )); + groups.addAll(RelationEditorHooks.getSelectActions()); + IRelationEditorActionGroup.fillToolbar(tb, groups, editorAccess); return tb; } - + private static IRelationEditorActionGroup buildNativeGroup(int order, AbstractRelationEditorAction... actions) { - return new IRelationEditorActionGroup() { - @Override - public int order() { - return order; - } - - @Override - public List getActions(IRelationEditorActionAccess editorAccess) { - return Arrays.asList(actions); - } - }; + return new IRelationEditorActionGroup() { + @Override + public int order() { + return order; + } + + @Override + public List getActions(IRelationEditorActionAccess editorAccess) { + return Arrays.asList(actions); + } + }; } @@ -761,7 +761,7 @@ tr("Focus Relation Editor with relation ''{0}'' in layer ''{1}''", name, layerName), null, false, false) { - private static final long serialVersionUID = 1L; - - @Override + private static final long serialVersionUID = 1L; + + @Override public void actionPerformed(ActionEvent e) { ((RelationEditor) getValue("relationEditor")).setVisible(true); @@ -949,42 +949,42 @@ } } - + private class RelationEditorActionAccess implements IRelationEditorActionAccess { - @Override - public MemberTable getMemberTable() { - return memberTable; - } - - @Override - public MemberTableModel getMemberTableModel() { - return memberTableModel; - } - - @Override - public SelectionTable getSelectionTable() { - return selectionTable; - } - - @Override - public SelectionTableModel getSelectionTableModel() { - return selectionTableModel; - } - - @Override - public IRelationEditor getEditor() { - return GenericRelationEditor.this; - } - - @Override - public TagEditorModel getTagModel() { - return tagEditorPanel.getModel(); - } - - @Override - public AutoCompletingTextField getTextFieldRole() { - return tfRole; - } - + @Override + public MemberTable getMemberTable() { + return memberTable; + } + + @Override + public MemberTableModel getMemberTableModel() { + return memberTableModel; + } + + @Override + public SelectionTable getSelectionTable() { + return selectionTable; + } + + @Override + public SelectionTableModel getSelectionTableModel() { + return selectionTableModel; + } + + @Override + public IRelationEditor getEditor() { + return GenericRelationEditor.this; + } + + @Override + public TagEditorModel getTagModel() { + return tagEditorPanel.getModel(); + } + + @Override + public AutoCompletingTextField getTextFieldRole() { + return tfRole; + } + } } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java (revision 14029) @@ -20,7 +20,7 @@ */ public abstract class RelationEditor extends ExtendedDialog implements IRelationEditor { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** the property name for the current relation. + /** the property name for the current relation. * @see #setRelation(Relation) * @see #getRelation() Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditorHooks.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditorHooks.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditorHooks.java (revision 14029) @@ -14,35 +14,35 @@ */ public class RelationEditorHooks { - - private static final CopyOnWriteArrayList memberActions = new CopyOnWriteArrayList<>(); - private static final CopyOnWriteArrayList selectionActions = new CopyOnWriteArrayList<>(); + + private static final CopyOnWriteArrayList memberActions = new CopyOnWriteArrayList<>(); + private static final CopyOnWriteArrayList selectionActions = new CopyOnWriteArrayList<>(); - private RelationEditorHooks() { - // only static methods. - } - - /** - * Adds actions to the members action toolbar - * @param group The group to add - */ - public static void addActionsToMembers(IRelationEditorActionGroup group) { - memberActions.add(group); - } - - /** - * Adds actions to the selection action toolbar - * @param group The group to add - */ - public static void addActionsToSelectio(IRelationEditorActionGroup group) { - selectionActions.add(group); - } - - /* package */ static List getMemberActions() { - return Collections.unmodifiableList(memberActions); - } - - /* package */ static List getSelectActions() { - return Collections.unmodifiableList(selectionActions); - } - + private RelationEditorHooks() { + // only static methods. + } + + /** + * Adds actions to the members action toolbar + * @param group The group to add + */ + public static void addActionsToMembers(IRelationEditorActionGroup group) { + memberActions.add(group); + } + + /** + * Adds actions to the selection action toolbar + * @param group The group to add + */ + public static void addActionsToSelectio(IRelationEditorActionGroup group) { + selectionActions.add(group); + } + + /* package */ static List getMemberActions() { + return Collections.unmodifiableList(memberActions); + } + + /* package */ static List getSelectActions() { + return Collections.unmodifiableList(selectionActions); + } + } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java (revision 14029) @@ -30,57 +30,57 @@ */ public abstract class AbstractRelationEditorAction extends AbstractAction - implements TableModelListener, ListSelectionListener, PropertyChangeListener { - private static final long serialVersionUID = 1L; - protected final transient IRelationEditorActionAccess editorAccess; + implements TableModelListener, ListSelectionListener, PropertyChangeListener { + private static final long serialVersionUID = 1L; + protected final transient IRelationEditorActionAccess editorAccess; - /** - * Create a new relation editor action - * - * @param editorAccess - * The editor this action is for - * @param actionMapKey - * The key for the member table action map. - * @param updateOn - * The events that may cause the enabled state of this button to - * change. - */ - protected AbstractRelationEditorAction(IRelationEditorActionAccess editorAccess, - IRelationEditorUpdateOn... updateOn) { - Objects.requireNonNull(editorAccess, "editorAccess"); - Objects.requireNonNull(updateOn, "updateOn"); - this.editorAccess = editorAccess; - for (IRelationEditorUpdateOn u : updateOn) { - u.register(editorAccess, this); - } - } + /** + * Create a new relation editor action + * + * @param editorAccess + * The editor this action is for + * @param actionMapKey + * The key for the member table action map. + * @param updateOn + * The events that may cause the enabled state of this button to + * change. + */ + protected AbstractRelationEditorAction(IRelationEditorActionAccess editorAccess, + IRelationEditorUpdateOn... updateOn) { + Objects.requireNonNull(editorAccess, "editorAccess"); + Objects.requireNonNull(updateOn, "updateOn"); + this.editorAccess = editorAccess; + for (IRelationEditorUpdateOn u : updateOn) { + u.register(editorAccess, this); + } + } - /** - * Create a new relation editor action - * - * @param editorAccess - * The editor this action is for - * @param actionMapKey - * The key for the member table action map. - * @param updateOn - * The events that may cause the enabled state of this button to - * change. - */ - protected AbstractRelationEditorAction(IRelationEditorActionAccess editorAccess, String actionMapKey, - IRelationEditorUpdateOn... updateOn) { - this(editorAccess, updateOn); - Objects.requireNonNull(actionMapKey, "actionMapKey"); + /** + * Create a new relation editor action + * + * @param editorAccess + * The editor this action is for + * @param actionMapKey + * The key for the member table action map. + * @param updateOn + * The events that may cause the enabled state of this button to + * change. + */ + protected AbstractRelationEditorAction(IRelationEditorActionAccess editorAccess, String actionMapKey, + IRelationEditorUpdateOn... updateOn) { + this(editorAccess, updateOn); + Objects.requireNonNull(actionMapKey, "actionMapKey"); - this.editorAccess.addMemberTableAction(actionMapKey, this); - } + this.editorAccess.addMemberTableAction(actionMapKey, this); + } - @Override - public void tableChanged(TableModelEvent e) { - updateEnabledState(); - } + @Override + public void tableChanged(TableModelEvent e) { + updateEnabledState(); + } - @Override - public void valueChanged(ListSelectionEvent e) { - updateEnabledState(); - } + @Override + public void valueChanged(ListSelectionEvent e) { + updateEnabledState(); + } @Override @@ -89,44 +89,44 @@ } - protected abstract void updateEnabledState(); + protected abstract void updateEnabledState(); - protected final boolean canDownload() { - if (editorAccess.getEditor().getRelation() == null) - return false; - DataSet ds = editorAccess.getEditor().getRelation().getDataSet(); - return !Main.isOffline(OnlineResource.OSM_API) && ds != null && !ds.isLocked() - && !DownloadPolicy.BLOCKED.equals(ds.getDownloadPolicy()); - } + protected final boolean canDownload() { + if (editorAccess.getEditor().getRelation() == null) + return false; + DataSet ds = editorAccess.getEditor().getRelation().getDataSet(); + return !Main.isOffline(OnlineResource.OSM_API) && ds != null && !ds.isLocked() + && !DownloadPolicy.BLOCKED.equals(ds.getDownloadPolicy()); + } - protected MemberTable getMemberTable() { - return editorAccess.getMemberTable(); - } + protected MemberTable getMemberTable() { + return editorAccess.getMemberTable(); + } - protected MemberTableModel getMemberTableModel() { - return editorAccess.getMemberTableModel(); - } + protected MemberTableModel getMemberTableModel() { + return editorAccess.getMemberTableModel(); + } - protected SelectionTable getSelectionTable() { - return editorAccess.getSelectionTable(); - } + protected SelectionTable getSelectionTable() { + return editorAccess.getSelectionTable(); + } - protected SelectionTableModel getSelectionTableModel() { - return editorAccess.getSelectionTableModel(); - } + protected SelectionTableModel getSelectionTableModel() { + return editorAccess.getSelectionTableModel(); + } - protected IRelationEditor getEditor() { - return editorAccess.getEditor(); - } + protected IRelationEditor getEditor() { + return editorAccess.getEditor(); + } - protected TagEditorModel getTagModel() { - return editorAccess.getTagModel(); - } + protected TagEditorModel getTagModel() { + return editorAccess.getTagModel(); + } - protected OsmDataLayer getLayer() { - return editorAccess.getEditor().getLayer(); - } + protected OsmDataLayer getLayer() { + return editorAccess.getEditor().getLayer(); + } - public boolean isExpertOnly() { - return false; - } + public boolean isExpertOnly() { + return false; + } } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddFromSelectionAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddFromSelectionAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddFromSelectionAction.java (revision 14029) @@ -17,8 +17,8 @@ */ abstract class AddFromSelectionAction extends AbstractRelationEditorAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; protected AddFromSelectionAction(IRelationEditorActionAccess editorAccess, - IRelationEditorUpdateOn... updateOn) { + IRelationEditorUpdateOn... updateOn) { super(editorAccess, updateOn); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedAfterSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedAfterSelection.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedAfterSelection.java (revision 14029) @@ -15,5 +15,5 @@ */ public class AddSelectedAfterSelection extends AddFromSelectionAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** @@ -32,6 +32,6 @@ @Override protected void updateEnabledState() { - setEnabled(getSelectionTableModel().getRowCount() > 0 - && getMemberTableModel().getSelectionModel().getMinSelectionIndex() >= 0); + setEnabled(getSelectionTableModel().getRowCount() > 0 + && getMemberTableModel().getSelectionModel().getMinSelectionIndex() >= 0); } @@ -39,6 +39,6 @@ public void actionPerformed(ActionEvent e) { try { - getMemberTableModel().addMembersAfterIdx(filterConfirmedPrimitives(getSelectionTableModel().getSelection()), - getMemberTableModel().getSelectionModel().getMaxSelectionIndex()); + getMemberTableModel().addMembersAfterIdx(filterConfirmedPrimitives(getSelectionTableModel().getSelection()), + getMemberTableModel().getSelectionModel().getMaxSelectionIndex()); } catch (AddAbortException ex) { Logging.trace(ex); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedAtEndAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedAtEndAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedAtEndAction.java (revision 14029) @@ -15,5 +15,5 @@ */ public class AddSelectedAtEndAction extends AddFromSelectionAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** @@ -38,5 +38,5 @@ public void actionPerformed(ActionEvent e) { try { - getMemberTableModel().addMembersAtEnd(filterConfirmedPrimitives(getSelectionTableModel().getSelection())); + getMemberTableModel().addMembersAtEnd(filterConfirmedPrimitives(getSelectionTableModel().getSelection())); } catch (AddAbortException ex) { Logging.trace(ex); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedAtStartAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedAtStartAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedAtStartAction.java (revision 14029) @@ -15,5 +15,5 @@ */ public class AddSelectedAtStartAction extends AddFromSelectionAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** @@ -38,5 +38,5 @@ public void actionPerformed(ActionEvent e) { try { - getMemberTableModel().addMembersAtBeginning(filterConfirmedPrimitives(getSelectionTableModel().getSelection())); + getMemberTableModel().addMembersAtBeginning(filterConfirmedPrimitives(getSelectionTableModel().getSelection())); } catch (AddAbortException ex) { Logging.trace(ex); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedBeforeSelection.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedBeforeSelection.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AddSelectedBeforeSelection.java (revision 14029) @@ -15,5 +15,5 @@ */ public class AddSelectedBeforeSelection extends AddFromSelectionAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** @@ -32,6 +32,6 @@ @Override protected void updateEnabledState() { - setEnabled(getSelectionTableModel().getRowCount() > 0 - && editorAccess.getMemberTableModel().getSelectionModel().getMinSelectionIndex() >= 0); + setEnabled(getSelectionTableModel().getRowCount() > 0 + && editorAccess.getMemberTableModel().getSelectionModel().getMinSelectionIndex() >= 0); } @@ -39,6 +39,6 @@ public void actionPerformed(ActionEvent e) { try { - editorAccess.getMemberTableModel().addMembersBeforeIdx(filterConfirmedPrimitives(getSelectionTableModel().getSelection()), - editorAccess.getMemberTableModel().getSelectionModel().getMinSelectionIndex()); + editorAccess.getMemberTableModel().addMembersBeforeIdx(filterConfirmedPrimitives(getSelectionTableModel().getSelection()), + editorAccess.getMemberTableModel().getSelectionModel().getMinSelectionIndex()); } catch (AddAbortException ex) { Logging.trace(ex); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ApplyAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ApplyAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ApplyAction.java (revision 14029) @@ -13,5 +13,5 @@ */ public class ApplyAction extends SavingAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** @@ -34,5 +34,5 @@ public void actionPerformed(ActionEvent e) { if (applyChanges()) { - editorAccess.getEditor().reloadDataFromRelation(); + editorAccess.getEditor().reloadDataFromRelation(); } } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CancelAction.java (revision 14029) @@ -22,5 +22,5 @@ */ public class CancelAction extends SavingAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CopyMembersAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CopyMembersAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/CopyMembersAction.java (revision 14029) @@ -14,5 +14,5 @@ */ public class CopyMembersAction extends AddFromSelectionAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DeleteCurrentRelationAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DeleteCurrentRelationAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DeleteCurrentRelationAction.java (revision 14029) @@ -18,5 +18,5 @@ */ public class DeleteCurrentRelationAction extends AbstractRelationEditorAction implements PropertyChangeListener { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadIncompleteMembersAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadIncompleteMembersAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadIncompleteMembersAction.java (revision 14029) @@ -19,5 +19,5 @@ */ public class DownloadIncompleteMembersAction extends AbstractRelationEditorAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** @@ -45,5 +45,5 @@ return; MainApplication.worker.submit(new DownloadRelationMemberTask( - getEditor().getRelation(), + getEditor().getRelation(), getMemberTableModel().getIncompleteMemberPrimitives(), getLayer(), Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadSelectedIncompleteMembersAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadSelectedIncompleteMembersAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadSelectedIncompleteMembersAction.java (revision 14029) @@ -16,5 +16,5 @@ */ public class DownloadSelectedIncompleteMembersAction extends AbstractRelationEditorAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** @@ -39,5 +39,5 @@ return; MainApplication.worker.submit(new DownloadRelationMemberTask( - getEditor().getRelation(), + getEditor().getRelation(), getMemberTableModel().getSelectedIncompleteMemberPrimitives(), getLayer(), Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DuplicateRelationAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DuplicateRelationAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DuplicateRelationAction.java (revision 14029) @@ -16,5 +16,5 @@ */ public class DuplicateRelationAction extends AbstractRelationEditorAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/EditAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/EditAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/EditAction.java (revision 14029) @@ -19,5 +19,5 @@ */ public class EditAction extends AbstractRelationEditorAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** @@ -37,6 +37,6 @@ protected void updateEnabledState() { setEnabled(editorAccess.getMemberTable().getSelectedRowCount() == 1 - && editorAccess.getMemberTableModel() - .isEditableRelation(editorAccess.getMemberTable().getSelectedRow())); + && editorAccess.getMemberTableModel() + .isEditableRelation(editorAccess.getMemberTable().getSelectedRow())); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/IRelationEditorActionAccess.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/IRelationEditorActionAccess.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/IRelationEditorActionAccess.java (revision 14029) @@ -20,35 +20,35 @@ public interface IRelationEditorActionAccess { - /** - * Adds a keyboard action to the member table. - * @param actionMapKey The key to use - * @param action The action to map for that key. - */ - default void addMemberTableAction(String actionMapKey, Action action) { - getMemberTable().getActionMap().put(actionMapKey, action); - } + /** + * Adds a keyboard action to the member table. + * @param actionMapKey The key to use + * @param action The action to map for that key. + */ + default void addMemberTableAction(String actionMapKey, Action action) { + getMemberTable().getActionMap().put(actionMapKey, action); + } - /** - * Get the member table that is used by the dialog. - * @return The member table - */ - MemberTable getMemberTable(); - - /** - * Get the model the member table is using. - * @return That model - */ - MemberTableModel getMemberTableModel(); - - /** - * Get the table that displays the current user selection - * @return That table - */ - SelectionTable getSelectionTable(); - - /** - * Get the model that the selection table is based on. - * @return The model - */ + /** + * Get the member table that is used by the dialog. + * @return The member table + */ + MemberTable getMemberTable(); + + /** + * Get the model the member table is using. + * @return That model + */ + MemberTableModel getMemberTableModel(); + + /** + * Get the table that displays the current user selection + * @return That table + */ + SelectionTable getSelectionTable(); + + /** + * Get the model that the selection table is based on. + * @return The model + */ SelectionTableModel getSelectionTableModel(); Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/IRelationEditorActionGroup.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/IRelationEditorActionGroup.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/IRelationEditorActionGroup.java (revision 14029) @@ -17,36 +17,36 @@ public interface IRelationEditorActionGroup { - /** - * Get the position at which the action group should be added. - * - * @return The order index, default is to add at the end. - */ - default int order() { - return 100; - } + /** + * Get the position at which the action group should be added. + * + * @return The order index, default is to add at the end. + */ + default int order() { + return 100; + } - /** - * Get the actions in this action group. - * - * @param editorAccess - * Methods to access the relation editor. - * @return The actions - */ - List getActions(IRelationEditorActionAccess editorAccess); + /** + * Get the actions in this action group. + * + * @param editorAccess + * Methods to access the relation editor. + * @return The actions + */ + List getActions(IRelationEditorActionAccess editorAccess); - static void fillToolbar(JToolBar toolbar, List groups, - IRelationEditorActionAccess editorAccess) { - groups.stream().sorted(Comparator.comparingInt(IRelationEditorActionGroup::order)).forEach(group -> { - if (toolbar.getComponentCount() > 0) { - toolbar.addSeparator(); - } + static void fillToolbar(JToolBar toolbar, List groups, + IRelationEditorActionAccess editorAccess) { + groups.stream().sorted(Comparator.comparingInt(IRelationEditorActionGroup::order)).forEach(group -> { + if (toolbar.getComponentCount() > 0) { + toolbar.addSeparator(); + } - for (AbstractRelationEditorAction action : group.getActions(editorAccess)) { - JButton button = toolbar.add(action); - if (action.isExpertOnly()) { - ExpertToggleAction.addVisibilitySwitcher(button); - } - } - }); - } + for (AbstractRelationEditorAction action : group.getActions(editorAccess)) { + JButton button = toolbar.add(action); + if (action.isExpertOnly()) { + ExpertToggleAction.addVisibilitySwitcher(button); + } + } + }); + } } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/IRelationEditorUpdateOn.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/IRelationEditorUpdateOn.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/IRelationEditorUpdateOn.java (revision 14029) @@ -12,19 +12,19 @@ @FunctionalInterface public interface IRelationEditorUpdateOn { - /** - * Update when the member table contents change - */ - IRelationEditorUpdateOn MEMBER_TABLE_CHANGE = (editor, action) -> editor.getMemberTableModel() - .addTableModelListener(action); - /** - * Update upon a member table selection change - */ - IRelationEditorUpdateOn MEMBER_TABLE_SELECTION = (editor, action) -> editor.getMemberTable().getSelectionModel() - .addListSelectionListener(action); + /** + * Update when the member table contents change + */ + IRelationEditorUpdateOn MEMBER_TABLE_CHANGE = (editor, action) -> editor.getMemberTableModel() + .addTableModelListener(action); + /** + * Update upon a member table selection change + */ + IRelationEditorUpdateOn MEMBER_TABLE_SELECTION = (editor, action) -> editor.getMemberTable().getSelectionModel() + .addListSelectionListener(action); - IRelationEditorUpdateOn TAG_CHANGE = (editor, action) -> editor.getTagModel().addPropertyChangeListener(action); - IRelationEditorUpdateOn SELECTION_TABLE_CHANGE = (editor, action) -> editor.getSelectionTableModel() - .addTableModelListener(action); + IRelationEditorUpdateOn TAG_CHANGE = (editor, action) -> editor.getTagModel().addPropertyChangeListener(action); + IRelationEditorUpdateOn SELECTION_TABLE_CHANGE = (editor, action) -> editor.getSelectionTableModel() + .addTableModelListener(action); - void register(IRelationEditorActionAccess editor, AbstractRelationEditorAction action); + void register(IRelationEditorActionAccess editor, AbstractRelationEditorAction action); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/MoveDownAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/MoveDownAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/MoveDownAction.java (revision 14029) @@ -16,5 +16,5 @@ */ public class MoveDownAction extends AbstractRelationEditorAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** @@ -35,5 +35,5 @@ @Override public void actionPerformed(ActionEvent e) { - editorAccess.getMemberTableModel().moveDown(editorAccess.getMemberTable().getSelectedRows()); + editorAccess.getMemberTableModel().moveDown(editorAccess.getMemberTable().getSelectedRows()); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/MoveUpAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/MoveUpAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/MoveUpAction.java (revision 14029) @@ -16,5 +16,5 @@ */ public class MoveUpAction extends AbstractRelationEditorAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** @@ -35,5 +35,5 @@ @Override public void actionPerformed(ActionEvent e) { - editorAccess.getMemberTableModel().moveUp(editorAccess.getMemberTable().getSelectedRows()); + editorAccess.getMemberTableModel().moveUp(editorAccess.getMemberTable().getSelectedRows()); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/OKAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/OKAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/OKAction.java (revision 14029) @@ -13,5 +13,5 @@ */ public class OKAction extends SavingAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/PasteMembersAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/PasteMembersAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/PasteMembersAction.java (revision 14029) @@ -18,5 +18,5 @@ */ public class PasteMembersAction extends AddFromSelectionAction implements FlavorListener { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RefreshAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RefreshAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RefreshAction.java (revision 14029) @@ -24,5 +24,5 @@ */ public class RefreshAction extends SavingAction implements CommandQueueListener { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RemoveAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RemoveAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RemoveAction.java (revision 14029) @@ -16,5 +16,5 @@ */ public class RemoveAction extends AbstractRelationEditorAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RemoveSelectedAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RemoveSelectedAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/RemoveSelectedAction.java (revision 14029) @@ -14,5 +14,5 @@ */ public class RemoveSelectedAction extends AddFromSelectionAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** @@ -42,5 +42,5 @@ @Override public void actionPerformed(ActionEvent e) { - editorAccess.getMemberTableModel().removeMembersReferringTo(getSelectionTableModel().getSelection()); + editorAccess.getMemberTableModel().removeMembersReferringTo(getSelectionTableModel().getSelection()); } } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ReverseAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ReverseAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/ReverseAction.java (revision 14029) @@ -13,5 +13,5 @@ */ public class ReverseAction extends AbstractRelationEditorAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java (revision 14029) @@ -34,5 +34,5 @@ */ abstract class SavingAction extends AbstractRelationEditorAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; protected final AutoCompletingTextField tfRole; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SelectAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SelectAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SelectAction.java (revision 14029) @@ -14,5 +14,5 @@ */ public class SelectAction extends AbstractRelationEditorAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SelectPrimitivesForSelectedMembersAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SelectPrimitivesForSelectedMembersAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SelectPrimitivesForSelectedMembersAction.java (revision 14029) @@ -14,5 +14,5 @@ */ public class SelectPrimitivesForSelectedMembersAction extends AbstractRelationEditorAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SelectedMembersForSelectionAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SelectedMembersForSelectionAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SelectedMembersForSelectionAction.java (revision 14029) @@ -13,5 +13,5 @@ */ public class SelectedMembersForSelectionAction extends AddFromSelectionAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** @@ -35,5 +35,5 @@ if (enabled) { putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to {0} objects in the current selection", - editorAccess.getMemberTableModel().getChildPrimitives(getLayer().data.getSelected()).size())); + editorAccess.getMemberTableModel().getChildPrimitives(getLayer().data.getSelected()).size())); } else { putValue(SHORT_DESCRIPTION, tr("Select relation members which refer to objects in the current selection")); @@ -44,5 +44,5 @@ @Override public void actionPerformed(ActionEvent e) { - editorAccess.getMemberTableModel().selectMembersReferringTo(getLayer().data.getSelected()); + editorAccess.getMemberTableModel().selectMembersReferringTo(getLayer().data.getSelected()); } } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SetRoleAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SetRoleAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SetRoleAction.java (revision 14029) @@ -21,5 +21,5 @@ */ public class SetRoleAction extends AbstractRelationEditorAction implements DocumentListener { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; private final transient AutoCompletingTextField tfRole; Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SortAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SortAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SortAction.java (revision 14029) @@ -16,5 +16,5 @@ */ public class SortAction extends AbstractRelationEditorAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** @@ -35,5 +35,5 @@ @Override public void actionPerformed(ActionEvent e) { - editorAccess.getMemberTableModel().sort(); + editorAccess.getMemberTableModel().sort(); } Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SortBelowAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SortBelowAction.java (revision 14028) +++ /trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SortBelowAction.java (revision 14029) @@ -13,5 +13,5 @@ */ public class SortBelowAction extends AbstractRelationEditorAction { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; /** @@ -30,5 +30,5 @@ @Override public void actionPerformed(ActionEvent e) { - editorAccess.getMemberTableModel().sortBelow(); + editorAccess.getMemberTableModel().sortBelow(); } @@ -40,5 +40,5 @@ @Override public boolean isExpertOnly() { - return true; + return true; } }