Changeset 9622 in josm for trunk/src/org

Timestamp:

2016-01-25T01:18:18+01:00 (9 years ago)

Author:

Don-vip

Message:

add more unit tests + fix some sonar issues

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

@@ -72 +72 @@
     private PreferencesTable table;
 
+    private final Map<String, String> profileTypes = new LinkedHashMap<>();
+
+    private final Comparator<PrefEntry> customComparator = new Comparator<PrefEntry>() {
+        @Override
+        public int compare(PrefEntry o1, PrefEntry o2) {
+            if (o1.isChanged() && !o2.isChanged())
+                return -1;
+            if (o2.isChanged() && !o1.isChanged())
+                return 1;
+            if (!(o1.isDefault()) && o2.isDefault())
+                return -1;
+            if (!(o2.isDefault()) && o1.isDefault())
+                return 1;
+            return o1.compareTo(o2);
+        }
+    };
+
     private AdvancedPreference() {
         super(/* ICON(preferences/) */ "advanced", tr("Advanced Preferences"), tr("Setting Preference entries directly. Use with caution!"));
@@ -136 +153 @@
         edit.addActionListener(new ActionListener() {
             @Override public void actionPerformed(ActionEvent e) {
-                boolean ok = table.editPreference(gui);
-                if (ok) applyFilter();
+                if (table.editPreference(gui))
+                    applyFilter();
             }
         });
@@ -211 +228 @@
         if (fc != null) {
             File[] sel = fc.isMultiSelectionEnabled() ? fc.getSelectedFiles() : (new File[]{fc.getSelectedFile()});
-            if (sel.length == 1 && !sel[0].getName().contains(".")) sel[0] = new File(sel[0].getAbsolutePath()+".xml");
+            if (sel.length == 1 && !sel[0].getName().contains("."))
+                sel[0] = new File(sel[0].getAbsolutePath()+".xml");
             return sel;
         }
@@ -254 +272 @@
     private void readPreferencesFromXML() {
         File[] files = askUserForCustomSettingsFiles(false, tr("Open JOSM customization file"));
-        if (files.length == 0) return;
+        if (files.length == 0)
+            return;
 
         Preferences tmpPrefs = CustomConfigurator.clonePreferences(Main.pref);
@@ -276 +295 @@
         applyFilter();
     }
-
-    private final Comparator<PrefEntry> customComparator = new Comparator<PrefEntry>() {
-        @Override
-        public int compare(PrefEntry o1, PrefEntry o2) {
-            if (o1.isChanged() && !o2.isChanged()) return -1;
-            if (o2.isChanged() && !o1.isChanged()) return 1;
-            if (!(o1.isDefault()) && o2.isDefault()) return -1;
-            if (!(o2.isDefault()) && o1.isDefault()) return 1;
-            return o1.compareTo(o2);
-        }
-    };
 
     private List<PrefEntry> prepareData(Map<String, Setting<?>> loaded, Map<String, Setting<?>> orig, Map<String, Setting<?>> defaults) {
@@ -320 +328 @@
         return data;
     }
-
-    private final Map<String, String> profileTypes = new LinkedHashMap<>();
 
     private JPopupMenu buildPopupMenu() {
@@ -459 +465 @@
             }
         }
-        if (table != null) table.fireDataChanged();
+        if (table != null)
+            table.fireDataChanged();
     }