Changeset 4932 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2012-02-14T21:27:53+01:00 (13 years ago)

Author:

stoecker

Message:

fix 6833 - use WindowGeometry for toggle dialogs and mainwindow replacing old custom methods, improve dual screen handling

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (3 diffs)
• osm/visitor/paint/MapRendererFactory.java (modified) (1 diff)
• preferences/AbstractProperty.java (modified) (1 diff)
• preferences/CachedProperty.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -334 +334 @@
     }
 
+ /*   @Deprecated
     synchronized public boolean hasKey(final String key) {
         return properties.containsKey(key);
-    }
+    }*/
 
     /**
@@ -638 +639 @@
             }
         }
+        removeObsolete();
     }
 
@@ -1727 +1729 @@
         return b.toString();
     }
+
+    /**
+     * Removes obsolete preference settings. If you throw out a once-used preference
+     * setting, add it to the list here with an expiry date (written as comment). If you
+     * see something with an expiry date in the past, remove it from the list.
+     */
+    public void removeObsolete() {
+        String[] obsolete = {
+                "edit.make-parallel-way-action.snap-threshold",  // 10/2011 - replaced by snap-threshold-percent. Can be removed mid 2012
+        };
+        for (String key : obsolete) {
+            boolean removed = false;
+            if(properties.containsKey(key)) { properties.remove(key); removed = true; }
+            if(collectionProperties.containsKey(key)) { collectionProperties.remove(key); removed = true; }
+            if(arrayProperties.containsKey(key)) { arrayProperties.remove(key); removed = true; }
+            if(listOfStructsProperties.containsKey(key)) { listOfStructsProperties.remove(key); removed = true; }
+            if(removed)
+                System.out.println(tr("Preference setting {0} has been removed since it is no longer used.", key));
+        }
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapRendererFactory.java

@@ -115 +115 @@
     private MapRendererFactory() {
         registerDefaultRenderers();
-        boolean drawWireframe = false;
-        if (Main.pref.hasKey("draw.wireframe")) {
-            drawWireframe = Main.pref.getBoolean("draw.wireframe",false);
-            /*
-             * transition 05/2011 - 'draw.wireframe' isn't supported anymore. Remove
-             * it from the preferences.
-             * Can be removed after ~ 01/2012
-             */
-            Main.pref.put("draw.wireframe", null);
-        }
-        if (drawWireframe){
-            activate(WireframeMapRenderer.class);
-            return;
-        }
-
         String rendererClassName = Main.pref.get(PREF_KEY_RENDERER_CLASS_NAME, null);
         if (rendererClassName != null) {

trunk/src/org/openstreetmap/josm/data/preferences/AbstractProperty.java

@@ -19 +19 @@
 
     public boolean isSet() {
-        return Main.pref.hasKey(key);
+        return !Main.pref.get(key).isEmpty();
     }
 

trunk/src/org/openstreetmap/josm/data/preferences/CachedProperty.java

@@ -20 +20 @@
 
     protected void updateValue() {
-        if (Main.pref.hasKey(key)) {
+        if (!Main.pref.get(key).isEmpty()) {
             this.value = fromString(Main.pref.get(key));
         } else {