Changeset 29500 in osm for applications/editors/josm

Timestamp:

2013-04-14T19:00:55+02:00 (12 years ago)

Author:

donvip

Message:

fix #josm7357 - Wrong preferences management in FixAdresses plugin + some other things in ColombusCSV and imagery-xml-bounds

Location:

applications/editors/josm/plugins

Files:

• ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java (modified) (2 diffs)
• FixAddresses/.settings/org.eclipse.jdt.core.prefs (added)
• FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java (modified) (1 diff)
• FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPreferences.java (modified) (4 diffs)
• FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java (modified) (1 diff)
• imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/XmlBoundsPreferenceSetting.java (modified) (1 diff)

applications/editors/josm/plugins/ColumbusCSV/src/org/openstreetmap/josm/plugins/columbusCSV/ColumbusCSVPreferences.java

@@ -20 +20 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
-import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 
@@ -28 +27 @@
  * @author Oliver Wieland <oliver.wieland@online.de>
  */
-public class ColumbusCSVPreferences implements PreferenceSetting {
+public class ColumbusCSVPreferences extends DefaultTabPreferenceSetting {
     public static final String PREFIX = "columbuscsv.";
     

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java

@@ -64 +64 @@
         @Override
         public PreferenceSetting getPreferenceSetting() {
-                // TODO Auto-generated method stub
                 return getPreferences();
         }

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPreferences.java

@@ -14 +14 @@
 package org.openstreetmap.josm.plugins.fixAddresses;
 
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import javax.swing.ButtonGroup;
 import javax.swing.JCheckBox;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
-import static org.openstreetmap.josm.tools.I18n.tr;
 
-public class FixAddressesPreferences implements PreferenceSetting {
+public class FixAddressesPreferences extends DefaultTabPreferenceSetting {
         private static final String FIX_ADDRESSES_IGNORE_POST_CODE_KEY = "fixAddresses.ignorePostCode";
         private static final String FIX_ADDRESSES_SELECT_GUESSED_OBJECTS_KEY = "fixAddresses.selectGuessedObjects";
@@ -51 +53 @@
          */
         private void loadFromPrefs() {
-                @SuppressWarnings("unused")
-                boolean test = Main.pref.getBoolean(FIX_ADDRESSES_IGNORE_POST_CODE_KEY, false);
                 setSelectGuessedObjects(Main.pref.getBoolean(FIX_ADDRESSES_SELECT_GUESSED_OBJECTS_KEY, false));
                 setIgnorePostCode(Main.pref.getBoolean(FIX_ADDRESSES_IGNORE_POST_CODE_KEY, false));
@@ -82 +82 @@
         public boolean ok() {
                 saveToPrefs();
-                return true;
+                loadFromPrefs();
+                return false;
         }
 
@@ -117 +118 @@
                 cbIgnorePostCode.setSelected(ignorePostCode);
         }
-
-        @Override
-        public boolean isExpert() {
-            return false;
-        }
-
-
 }

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java

@@ -4 +4 @@
 
 import java.awt.event.ActionEvent;
-import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.util.Collection;

applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/XmlBoundsPreferenceSetting.java

@@ -18 +18 @@
 import javax.swing.JButton;
 
-import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference;
-import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference.ImageryProvidersPanel;
+import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
-import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
+import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference.ImageryProvidersPanel;
 import org.openstreetmap.josm.plugins.imageryxmlbounds.actions.EditEntriesAction;