Changeset 10179 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

Timestamp:

2016-05-11T02:44:10+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:AssignmentInSubExpressionCheck - Assignments should not be made from within sub-expressions

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

@@ -37 +37 @@
 public class PreferenceDialog extends JDialog {
 
-    private PreferenceTabbedPane tpPreferences;
+    private final PreferenceTabbedPane tpPreferences = new PreferenceTabbedPane();
     private boolean canceled;
+
+    /**
+     * Constructs a new {@code PreferenceDialog}.
+     * @param parent parent component
+     */
+    public PreferenceDialog(Component parent) {
+        super(GuiHelper.getFrameForComponent(parent), tr("Preferences"), ModalityType.DOCUMENT_MODAL);
+        build();
+        this.setMinimumSize(new Dimension(600, 350));
+        // set the maximum width to the current screen. If the dialog is opened on a
+        // smaller screen than before, this will reset the stored preference.
+        this.setMaximumSize(GuiHelper.getScreenSize());
+    }
 
     protected JPanel buildActionPanel() {
@@ -65 +78 @@
         Container c = getContentPane();
         c.setLayout(new BorderLayout());
-        c.add(tpPreferences = new PreferenceTabbedPane(), BorderLayout.CENTER);
+        c.add(tpPreferences, BorderLayout.CENTER);
         tpPreferences.buildGui();
         tpPreferences.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
@@ -75 +88 @@
         getRootPane().getActionMap().put("cancel", new CancelAction());
         HelpUtil.setHelpContext(getRootPane(), HelpUtil.ht("/Action/Preferences"));
-    }
-
-    public PreferenceDialog(Component parent) {
-        super(GuiHelper.getFrameForComponent(parent), tr("Preferences"), ModalityType.DOCUMENT_MODAL);
-        build();
-        this.setMinimumSize(new Dimension(600, 350));
-        // set the maximum width to the current screen. If the dialog is opened on a
-        // smaller screen than before, this will reset the stored preference.
-        this.setMaximumSize(GuiHelper.getScreenSize());
     }
 
@@ -126 +130 @@
     }
 
+    /**
+     * Select preferences tab by name.
+     * @param name preferences tab name (icon)
+     */
     public void selectPreferencesTabByName(String name) {
         tpPreferences.selectTabByName(name);
     }
 
+    /**
+     * Select preferences tab by class.
+     * @param clazz preferences tab class
+     */
     public void selectPreferencesTabByClass(Class<? extends TabPreferenceSetting> clazz) {
         tpPreferences.selectTabByPref(clazz);
     }
 
+    /**
+     * Select preferences sub-tab by class.
+     * @param clazz preferences sub-tab class
+     */
     public void selectSubPreferencesTabByClass(Class<? extends SubPreferenceSetting> clazz) {
         tpPreferences.selectSubTabByPref(clazz);