Changeset 1832 in josm for trunk/src/org

Timestamp:

2009-07-25T12:14:01+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3078: New relation editor overemphasizes relation ordering

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (3 diffs)

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

@@ -515 +515 @@
         gc.weightx = 0.0;
         gc.weighty = 0.0;
+        AddSelectedAtEndAction addSelectedAtEndAction = new AddSelectedAtEndAction();
+        selectionTableModel.addTableModelListener(addSelectedAtEndAction);
+        pnl.add(new JButton(addSelectedAtEndAction), gc);
+
+        // -----
+        gc.gridy = 1;
+        RemoveSelectedAction removeSelectedAction = new RemoveSelectedAction();
+        selectionTableModel.addTableModelListener(removeSelectedAction);
+        pnl.add(new JButton(removeSelectedAction), gc);
+
+        // ------
+        // just grab the remaining space
+        gc.gridy = 2;
+        gc.weighty = 1.0;
+        gc.fill = GridBagConstraints.BOTH;
+        pnl.add(new JPanel(), gc);
+
+        // -----
+        gc.gridy = 3;
+        gc.weighty = 0.0;
         AddSelectedAtStartAction addSelectionAction = new AddSelectedAtStartAction();
         selectionTableModel.addTableModelListener(addSelectionAction);
@@ -520 +540 @@
 
         // -----
-        gc.gridy = 1;
+        gc.gridy = 4;
         AddSelectedBeforeSelection addSelectedBeforeSelectionAction = new AddSelectedBeforeSelection();
         selectionTableModel.addTableModelListener(addSelectedBeforeSelectionAction);
@@ -527 +547 @@
 
         // -----
-        gc.gridy = 2;
+        gc.gridy = 5;
         AddSelectedAfterSelection addSelectedAfterSelectionAction = new AddSelectedAfterSelection();
         selectionTableModel.addTableModelListener(addSelectedAfterSelectionAction);
         memberTableModel.getSelectionModel().addListSelectionListener(addSelectedAfterSelectionAction);
         pnl.add(new JButton(addSelectedAfterSelectionAction), gc);
-
-        // -----
-        gc.gridy = 3;
-        AddSelectedAtEndAction addSelectedAtEndAction = new AddSelectedAtEndAction();
-        selectionTableModel.addTableModelListener(addSelectedAtEndAction);
-        pnl.add(new JButton(addSelectedAtEndAction), gc);
-
-        // -----
-        gc.gridy = 4;
-        RemoveSelectedAction removeSelectedAction = new RemoveSelectedAction();
-        selectionTableModel.addTableModelListener(removeSelectedAction);
-        pnl.add(new JButton(removeSelectedAction), gc);
-
-        // ------
-        // just grab the remaining space
-        gc.gridy = 5;
-        gc.weighty = 1.0;
-        gc.fill = GridBagConstraints.BOTH;
-        pnl.add(new JPanel(), gc);
 
         return pnl;