Changeset 1782 in josm for trunk/src/org

Timestamp:

2009-07-13T15:43:40+02:00 (15 years ago)

Author:

stoecker

Message:

fixed #2928 - patch by Michi - unify GUI

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

@@ -110 +110 @@
     protected JPanel buildButtonRow() {
         JPanel pnl = new JPanel();
-        pnl.setLayout(new FlowLayout(FlowLayout.RIGHT));
-
-        JButton btn = new JButton(new CancelAction());
+        pnl.setLayout(new FlowLayout(FlowLayout.CENTER));
+
+        JButton btn = new JButton(new ApplyResolutionAction());
+        btn.setName("button.apply");
+        pnl.add(btn);
+
+        btn = new JButton(new CancelAction());
         btn.setName("button.cancel");
-        pnl.add(btn);
-
-        btn = new JButton(new ApplyResolutionAction());
-        btn.setName("button.apply");
         pnl.add(btn);