Ticket #5502: GenericRelationEditor.java.patch

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

@@ -66 +66 @@
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
+import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.properties.PresetListPanel.PresetHandler;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -536 +536 @@
         JToolBar tb = new JToolBar(JToolBar.VERTICAL);
         tb.setFloatable(false);
 
+        // -- add at start action
+        AddSelectedAtStartAction addSelectionAction = new AddSelectedAtStartAction();
+        selectionTableModel.addTableModelListener(addSelectionAction);
+        tb.add(addSelectionAction);
+
+        // -- add before selected action
+        AddSelectedBeforeSelection addSelectedBeforeSelectionAction = new AddSelectedBeforeSelection();
+        selectionTableModel.addTableModelListener(addSelectedBeforeSelectionAction);
+        memberTableModel.getSelectionModel().addListSelectionListener(addSelectedBeforeSelectionAction);
+        tb.add(addSelectedBeforeSelectionAction);
+
+        // -- add after selected action
+        AddSelectedAfterSelection addSelectedAfterSelectionAction = new AddSelectedAfterSelection();
+        selectionTableModel.addTableModelListener(addSelectedAfterSelectionAction);
+        memberTableModel.getSelectionModel().addListSelectionListener(addSelectedAfterSelectionAction);
+        tb.add(addSelectedAfterSelectionAction);
+
         // -- add at end action
         AddSelectedAtEndAction addSelectedAtEndAction = new AddSelectedAtEndAction();
         selectionTableModel.addTableModelListener(addSelectedAtEndAction);
         tb.add(addSelectedAtEndAction);
 
+        tb.addSeparator();
+
         // -- select members action
         SelectedMembersForSelectionAction selectMembersForSelectionAction = new SelectedMembersForSelectionAction();
         selectionTableModel.addTableModelListener(selectMembersForSelectionAction);
         memberTableModel.addTableModelListener(selectMembersForSelectionAction);
         tb.add(selectMembersForSelectionAction);
 
-        tb.addSeparator();
-
-        // -- remove selected action
-        RemoveSelectedAction removeSelectedAction = new RemoveSelectedAction();
-        selectionTableModel.addTableModelListener(removeSelectedAction);
-        tb.add(removeSelectedAction);
-
         // -- select action
         SelectPrimitivesForSelectedMembersAction selectAction = new SelectPrimitivesForSelectedMembersAction();
         memberTable.getSelectionModel().addListSelectionListener(selectAction);
@@ -561 +573 @@
 
         tb.addSeparator();
 
-        // -- add at start action
-        AddSelectedAtStartAction addSelectionAction = new AddSelectedAtStartAction();
-        selectionTableModel.addTableModelListener(addSelectionAction);
-        tb.add(addSelectionAction);
-
-        // -- add before selected action
-        AddSelectedBeforeSelection addSelectedBeforeSelectionAction = new AddSelectedBeforeSelection();
-        selectionTableModel.addTableModelListener(addSelectedBeforeSelectionAction);
-        memberTableModel.getSelectionModel().addListSelectionListener(addSelectedBeforeSelectionAction);
-        tb.add(addSelectedBeforeSelectionAction);
-
-        // -- add after selected action
-        AddSelectedAfterSelection addSelectedAfterSelectionAction = new AddSelectedAfterSelection();
-        selectionTableModel.addTableModelListener(addSelectedAfterSelectionAction);
-        memberTableModel.getSelectionModel().addListSelectionListener(addSelectedAfterSelectionAction);
-        tb.add(addSelectedAfterSelectionAction);
+        // -- remove selected action
+        RemoveSelectedAction removeSelectedAction = new RemoveSelectedAction();
+        selectionTableModel.addTableModelListener(removeSelectedAction);
+        tb.add(removeSelectedAction);
 
         return tb;
     }
@@ -734 +734 @@
         }
 
         protected void refreshEnabled() {
-            setEnabled(selectionTableModel.getRowCount() > 0 && memberTableModel.getRowCount() > 0);
+            setEnabled(selectionTableModel.getRowCount() > 0);
         }
 
         public void actionPerformed(ActionEvent e) {