Changeset 10114 in josm for trunk/src

Timestamp:

2016-04-06T23:32:07+02:00 (9 years ago)

Author:

Don-vip

Message:

refactor duplicated code

Location:

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

Files:

• SourceEditor.java (modified) (2 diffs)
• map/MapPaintPreference.java (modified) (3 diffs)
• map/TaggingPresetPreference.java (modified) (5 diffs)

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

@@ -113 +113 @@
     protected final transient List<SourceProvider> sourceProviders;
 
-    protected JTable tblIconPaths;
-    protected IconPathTableModel iconPathsModel;
+    private JTable tblIconPaths;
+    private IconPathTableModel iconPathsModel;
 
     protected boolean sourcesInitiallyLoaded;
@@ -412 +412 @@
      */
     public abstract boolean finish();
+
+    protected boolean doFinish(SourcePrefHelper prefHelper, String iconPref) {
+        boolean changed = prefHelper.put(activeSourcesModel.getSources());
+
+        if (tblIconPaths != null) {
+            List<String> iconPaths = iconPathsModel.getIconPaths();
+
+            if (!iconPaths.isEmpty()) {
+                if (Main.pref.putCollection(iconPref, iconPaths)) {
+                    changed = true;
+                }
+            } else if (Main.pref.putCollection(iconPref, null)) {
+                changed = true;
+            }
+        }
+        return changed;
+    }
 
     /**

trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java

@@ -86 +86 @@
     static class MapPaintSourceEditor extends SourceEditor {
 
-        private static final String iconpref = "mappaint.icon.sources";
+        private static final String ICONPREF = "mappaint.icon.sources";
 
         MapPaintSourceEditor() {
@@ -99 +99 @@
         @Override
         public boolean finish() {
-            List<SourceEntry> activeStyles = activeSourcesModel.getSources();
-
-            boolean changed = MapPaintPrefHelper.INSTANCE.put(activeStyles);
-
-            if (tblIconPaths != null) {
-                List<String> iconPaths = iconPathsModel.getIconPaths();
-
-                if (!iconPaths.isEmpty()) {
-                    if (Main.pref.putCollection(iconpref, iconPaths)) {
-                        changed = true;
-                    }
-                } else if (Main.pref.putCollection(iconpref, null)) {
-                    changed = true;
-                }
-            }
-            return changed;
+            return doFinish(MapPaintPrefHelper.INSTANCE, ICONPREF);
         }
 
@@ -124 +109 @@
         @Override
         public Collection<String> getInitialIconPathsList() {
-            return Main.pref.getCollection(iconpref, null);
+            return Main.pref.getCollection(ICONPREF, null);
         }
 

trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java

@@ -28 +28 @@
 import org.openstreetmap.josm.gui.preferences.SourceEditor;
 import org.openstreetmap.josm.gui.preferences.SourceEditor.ExtendedSourceEntry;
-import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
 import org.openstreetmap.josm.gui.preferences.SourceEntry;
 import org.openstreetmap.josm.gui.preferences.SourceProvider;
@@ -34 +33 @@
 import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
 import org.openstreetmap.josm.tools.GBC;
 import org.xml.sax.SAXException;
@@ -183 +183 @@
     static class TaggingPresetSourceEditor extends SourceEditor {
 
-        private static final String iconpref = "taggingpreset.icon.sources";
+        private static final String ICONPREF = "taggingpreset.icon.sources";
 
         TaggingPresetSourceEditor() {
@@ -196 +196 @@
         @Override
         public boolean finish() {
-            List<SourceEntry> activeStyles = activeSourcesModel.getSources();
-
-            boolean changed = PresetPrefHelper.INSTANCE.put(activeStyles);
-
-            if (tblIconPaths != null) {
-                List<String> iconPaths = iconPathsModel.getIconPaths();
-
-                if (!iconPaths.isEmpty()) {
-                    if (Main.pref.putCollection(iconpref, iconPaths)) {
-                        changed = true;
-                    }
-                } else if (Main.pref.putCollection(iconpref, null)) {
-                    changed = true;
-                }
-            }
-            return changed;
+            return doFinish(PresetPrefHelper.INSTANCE, ICONPREF);
         }
 
@@ -221 +206 @@
         @Override
         public Collection<String> getInitialIconPathsList() {
-            return Main.pref.getCollection(iconpref, null);
+            return Main.pref.getCollection(ICONPREF, null);
         }