Changeset 10134 in josm for trunk/src/org/openstreetmap/josm/gui/preferences

Timestamp:

2016-04-10T16:57:50+02:00 (10 years ago)

Author:

Don-vip

Message:

sonar, javadoc

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• display/LanguagePreference.java (modified) (4 diffs)
• imagery/ImageryPreference.java (modified) (1 diff)
• shortcut/PrefJPanel.java (modified) (14 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java

@@ -31 +31 @@
 /**
  * Language preferences.
+ * @since 1065
  */
 public class LanguagePreference implements SubPreferenceSetting {
+
+    private static final String LANGUAGE = "language";
 
     /**
@@ -52 +55 @@
         // Selecting the language BEFORE the JComboBox listens to model changes speed up initialization by ~35ms (see #7386)
         // See https://stackoverflow.com/questions/3194958/fast-replacement-for-jcombobox-basiccomboboxui
-        model.selectLanguage(Main.pref.get("language"));
+        model.selectLanguage(Main.pref.get(LANGUAGE));
         langCombo = new JosmComboBox<>(model);
         langCombo.setRenderer(new LanguageCellRenderer());
@@ -70 +73 @@
     public boolean ok() {
         if (langCombo.getSelectedItem() == null)
-            return Main.pref.put("language", null);
+            return Main.pref.put(LANGUAGE, null);
         else
-            return Main.pref.put("language",
+            return Main.pref.put(LANGUAGE,
                     LanguageInfo.getJOSMLocaleCode((Locale) langCombo.getSelectedItem()));
     }
@@ -84 +87 @@
         }
 
-        public void selectLanguage(String language) {
+        private void selectLanguage(String language) {
             setSelectedItem(null);
             if (language != null) {
-                language = LanguageInfo.getJavaLocaleCode(language);
+                String lang = LanguageInfo.getJavaLocaleCode(language);
                 for (Locale locale: data) {
                     if (locale == null) {
                         continue;
                     }
-                    if (locale.toString().equals(language)) {
+                    if (locale.toString().equals(lang)) {
                         setSelectedItem(locale);
                         return;

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -878 +878 @@
             }
 
-            public OffsetBookmark getRow(int row) {
+            private OffsetBookmark getRow(int row) {
                 return bookmarks.get(row);
             }
 
-            public void addRow(OffsetBookmark i) {
+            private void addRow(OffsetBookmark i) {
                 bookmarks.add(i);
                 int p = getRowCount() - 1;

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

@@ -77 +77 @@
     private static Map<Integer, String> keyList = setKeyList();
 
+    private final JCheckBox cbAlt = new JCheckBox();
+    private final JCheckBox cbCtrl = new JCheckBox();
+    private final JCheckBox cbMeta = new JCheckBox();
+    private final JCheckBox cbShift = new JCheckBox();
+    private final JCheckBox cbDefault = new JCheckBox();
+    private final JCheckBox cbDisable = new JCheckBox();
+    private final JosmComboBox<String> tfKey = new JosmComboBox<>();
+
+    private final JTable shortcutTable = new JTable();
+
+    private final JosmTextField filterField = new JosmTextField();
+
+    /** Creates new form prefJPanel */
+    public PrefJPanel() {
+        this.model = new ScListModel();
+        initComponents();
+    }
+
     private static Map<Integer, String> setKeyList() {
         Map<Integer, String> list = new LinkedHashMap<>();
@@ -89 +107 @@
                         list.put(Integer.valueOf(i), s);
                     }
-                } catch (Exception e) {
+                } catch (IllegalArgumentException | IllegalAccessException e) {
                     Main.error(e);
                 }
@@ -96 +114 @@
         list.put(Integer.valueOf(-1), "");
         return list;
-    }
-
-    private final JCheckBox cbAlt = new JCheckBox();
-    private final JCheckBox cbCtrl = new JCheckBox();
-    private final JCheckBox cbMeta = new JCheckBox();
-    private final JCheckBox cbShift = new JCheckBox();
-    private final JCheckBox cbDefault = new JCheckBox();
-    private final JCheckBox cbDisable = new JCheckBox();
-    private final JosmComboBox<String> tfKey = new JosmComboBox<>();
-
-    private final JTable shortcutTable = new JTable();
-
-    private final JosmTextField filterField = new JosmTextField();
-
-    /** Creates new form prefJPanel */
-    public PrefJPanel() {
-        this.model = new ScListModel();
-        initComponents();
     }
 
@@ -169 +169 @@
             int row1 = shortcutTable.convertRowIndexToModel(row);
             Shortcut sc = (Shortcut) model.getValueAt(row1, -1);
-            if (sc == null) return null;
+            if (sc == null)
+                return null;
             JLabel label = (JLabel) super.getTableCellRendererComponent(
                 table, name ? sc.getLongText() : sc.getKeyText(), isSelected, hasFocus, row, column);
@@ -187 +188 @@
 
     private void initComponents() {
-        JPanel listPane = new JPanel(new GridLayout());
-        JScrollPane listScrollPane = new JScrollPane();
-        JPanel shortcutEditPane = new JPanel(new GridLayout(5, 2));
-
         CbAction action = new CbAction(this);
         setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
@@ -197 +194 @@
         // This is the list of shortcuts:
         shortcutTable.setModel(model);
-        shortcutTable.getSelectionModel().addListSelectionListener(new CbAction(this));
+        shortcutTable.getSelectionModel().addListSelectionListener(action);
         shortcutTable.setFillsViewportHeight(true);
         shortcutTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -204 +201 @@
         mod.getColumn(0).setCellRenderer(new ShortcutTableCellRenderer(true));
         mod.getColumn(1).setCellRenderer(new ShortcutTableCellRenderer(false));
+        JScrollPane listScrollPane = new JScrollPane();
         listScrollPane.setViewportView(shortcutTable);
 
+        JPanel listPane = new JPanel(new GridLayout());
         listPane.add(listScrollPane);
-
         add(listPane);
 
@@ -227 +225 @@
         cbMeta.setText(META); // see above for why no tr()
 
+        JPanel shortcutEditPane = new JPanel(new GridLayout(5, 2));
+
         shortcutEditPane.add(cbDefault);
         shortcutEditPane.add(new JLabel());
@@ -266 +266 @@
     }
 
-    private void disableAllModifierCheckboxes() {
-        cbDefault.setEnabled(false);
-        cbDisable.setEnabled(false);
-        cbShift.setEnabled(false);
-        cbCtrl.setEnabled(false);
-        cbAlt.setEnabled(false);
-        cbMeta.setEnabled(false);
-    }
-
     // this allows to edit shortcuts. it:
     //  * sets the edit controls to the selected shortcut
@@ -282 +273 @@
     // are playing ping-pong (politically correct: table tennis, I know) and
     // even have some duplicated code. Feel free to refactor, If you have
-    // more expirience with GUI coding than I have.
-    private class CbAction extends AbstractAction implements ListSelectionListener {
+    // more experience with GUI coding than I have.
+    private static class CbAction extends AbstractAction implements ListSelectionListener {
         private final PrefJPanel panel;
 
         CbAction(PrefJPanel panel) {
             this.panel = panel;
+        }
+
+        private void disableAllModifierCheckboxes() {
+            panel.cbDefault.setEnabled(false);
+            panel.cbDisable.setEnabled(false);
+            panel.cbShift.setEnabled(false);
+            panel.cbCtrl.setEnabled(false);
+            panel.cbAlt.setEnabled(false);
+            panel.cbMeta.setEnabled(false);
         }
 
@@ -303 +303 @@
                 panel.cbMeta.setSelected(sc.getAssignedModifier() != -1 && (sc.getAssignedModifier() & KeyEvent.META_DOWN_MASK) != 0);
                 if (sc.getKeyStroke() != null) {
-                    tfKey.setSelectedItem(keyList.get(sc.getKeyStroke().getKeyCode()));
+                    panel.tfKey.setSelectedItem(keyList.get(sc.getKeyStroke().getKeyCode()));
                 } else {
-                    tfKey.setSelectedItem(keyList.get(-1));
+                    panel.tfKey.setSelectedItem(keyList.get(-1));
                 }
                 if (!sc.isChangeable()) {
@@ -314 +314 @@
                     actionPerformed(null);
                 }
-                model.fireTableRowsUpdated(row, row);
+                panel.model.fireTableRowsUpdated(row, row);
             } else {
-                panel.disableAllModifierCheckboxes();
+                disableAllModifierCheckboxes();
                 panel.tfKey.setEnabled(false);
             }
@@ -357 +357 @@
                 panel.tfKey.setEnabled(state);
             } else {
-                panel.disableAllModifierCheckboxes();
+                disableAllModifierCheckboxes();
                 panel.tfKey.setEnabled(false);
             }
@@ -364 +364 @@
 
     class FilterFieldAdapter implements DocumentListener {
-        public void filter() {
+        private void filter() {
             String expr = filterField.getText().trim();
             if (expr.isEmpty()) {