Changeset 10957 in josm for trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

Timestamp:

2016-09-04T16:32:05+02:00 (8 years ago)

Author:

Don-vip

Message:

see #13479 - make ConflictResolutionDialog inherit from ExtendedDialog

File:

• trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

@@ -146 +146 @@
     }
 
+    /**
+     * Same as above but lets you define if the dialog should be disposed on close.
+     * @param parent The parent element that will be used for position and maximum size
+     * @param title The text that will be shown in the window titlebar
+     * @param buttonTexts String Array of the text that will appear on the buttons. The first button is the default one.
+     * @param modal Set it to {@code true} if you want the dialog to be modal
+     * @param disposeOnClose whether to call {@link #dispose} when closing the dialog
+     */
     public ExtendedDialog(Component parent, String title, String[] buttonTexts, boolean modal, boolean disposeOnClose) {
         super(searchRealParent(parent), title, modal ? ModalityType.DOCUMENT_MODAL : ModalityType.MODELESS);
@@ -329 +337 @@
 
         for (int i = 0; i < bTexts.length; i++) {
-            final int finalI = i;
-            Action action = new AbstractAction(bTexts[i]) {
-                @Override
-                public void actionPerformed(ActionEvent evt) {
-                    buttonAction(finalI, evt);
-                }
-            };
-
-            button = new JButton(action);
+            button = new JButton(createButtonAction(i));
             if (i == defaultButtonIdx-1) {
                 defaultButton = button;
@@ -430 +430 @@
         setSize(d);
         setLocationRelativeTo(parent);
+    }
+
+    protected Action createButtonAction(final int i) {
+        return new AbstractAction(bTexts[i]) {
+            @Override
+            public void actionPerformed(ActionEvent evt) {
+                buttonAction(i, evt);
+            }
+        };
     }