Changeset 8664 in osm for applications/editors/josm

Timestamp:

2008-07-02T23:58:49+02:00 (17 years ago)

Author:

frederik

Message:

JOSM WMS plugin patches by Bodo Meissner <bodo@…> to fix preferences bug

Location:

applications/editors/josm/plugins/wmsplugin/src/wmsplugin

Files:

• WMSPlugin.java (modified) (3 diffs)
• WMSPreferenceEditor.java (modified) (1 diff)

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPlugin.java

@@ -34 +34 @@
 
         static ArrayList<WMSInfo> wmsList = new ArrayList<WMSInfo>();
+
+       // remember state of menu item to restore on changed preferences
+       static private boolean menuEnabled = false;
         
         public WMSPlugin() {
@@ -118 +121 @@
                 wmsJMenu.addSeparator();
                 wmsJMenu.add(new JMenuItem(new Help_WMSmenuAction()));
-                setEnabledAll(false);
+               setEnabledAll(menuEnabled);
         }
 
@@ -135 +138 @@
                         if(item != null) item.setEnabled(isEnabled);
                 }
+               menuEnabled = isEnabled;
         }
         

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java

@@ -111 +111 @@
                 }
                 
-                // josm doesn't seem to give us an option to delete preferences, 
-                // we can only overwrite them with empty strings...
+               // using null values instead of empty string really deletes
+               // the preferences entry
                 for (WMSInfo i : oldValues.values()) {
-                        i.url = ""; 
-                        i.name = "";
+                       i.url = null;
+                       i.name = null;
                         i.save();
                         change = true;