Changeset 8468 in josm for trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java

Timestamp:

2015-06-06T01:48:41+02:00 (9 years ago)

Author:

Don-vip

Message:

fix some minor sonar/code style issues:

• Avoid Protected Field In Final Class
• Class defines fields that are used only as locals

File:

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

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

@@ -36 +36 @@
 
     /** (preference key => return value) mappings valid for the current operation (no, those two maps cannot be combined) */
-    protected static final Map<String, Integer> sessionChoices = new HashMap<>();
+    private static final Map<String, Integer> sessionChoices = new HashMap<>();
     /** (preference key =&gt; return value) mappings valid for the current session */
-    protected static final Map<String, Integer> immediateChoices = new HashMap<>();
+    private static final Map<String, Integer> immediateChoices = new HashMap<>();
     /** a set indication that (preference key) is or may be stored for the currently active bulk operation */
-    protected static final Set<String> immediateActive = new HashSet<>();
+    private static final Set<String> immediateActive = new HashSet<>();
 
     /**
@@ -243 +243 @@
 
     /**
-     * This is a message panel used in dialogs which can be enabled/disabled with a preference
-     * setting.
+     * This is a message panel used in dialogs which can be enabled/disabled with a preference setting.
      * In addition to the normal message any {@link JOptionPane} would display it includes
      * a checkbox for enabling/disabling this particular dialog.
@@ -250 +249 @@
      */
     static class MessagePanel extends JPanel {
-        private final ButtonGroup group = new ButtonGroup();
         private final JRadioButton cbShowPermanentDialog = new JRadioButton(NotShowAgain.PERMANENT.getLabel());
         private final JRadioButton cbShowSessionDialog = new JRadioButton(NotShowAgain.SESSION.getLabel());
@@ -258 +256 @@
         /**
          * Constructs a new panel.
-         * @param message the the message (null to add no message, Component instances are added directly, otherwise a JLabel with the string representation is added)
+         * @param message the the message (null to add no message, Component instances are added directly,
+         *                otherwise a JLabel with the string representation is added)
          * @param displayImmediateOption whether to provide "Do not show again (this session)"
          */
         public MessagePanel(Object message, boolean displayImmediateOption) {
             cbStandard.setSelected(true);
+            ButtonGroup group = new ButtonGroup();
             group.add(cbShowPermanentDialog);
             group.add(cbShowSessionDialog);