Changeset 807 in josm

Timestamp:

2008-08-18T16:15:04+02:00 (16 years ago)

Author:

stoecker

Message:

minor fix

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (12 diffs)
• gui/download/BoundingBoxSelection.java (modified) (3 diffs)

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

@@ -21 +21 @@
 import org.openstreetmap.josm.tools.ColorHelper;
 
-
 /**
  * This class holds all preferences for JOSM.
- * 
+ *
  * Other classes can register their beloved properties here. All properties will be
  * saved upon set-access.
- * 
+ *
  * @author imi
  */
@@ -82 +81 @@
          */
         public Collection<String> getAllPossiblePreferenceDirs() {
-            LinkedList<String> locations = new LinkedList<String>();
-        locations.add(Main.pref.getPreferencesDir());
-        String s;
-        if ((s = System.getenv("JOSM_RESOURCES")) != null) {
-                if (!s.endsWith("/") && !s.endsWith("\\"))
-                        s = s + "/";
-                locations.add(s);
-        }
-        if ((s = System.getProperty("josm.resources")) != null) {
-                if (!s.endsWith("/") && !s.endsWith("\\"))
-                        s = s + "/";
-                locations.add(s);
-        }
-        String appdata = System.getenv("APPDATA");
-        if (System.getenv("ALLUSERSPROFILE") != null && appdata != null && appdata.lastIndexOf("\\") != -1) {
-                appdata = appdata.substring(appdata.lastIndexOf("\\"));
-                locations.add(System.getenv("ALLUSERSPROFILE")+appdata+"/JOSM/");
-        }
-        locations.add("/usr/local/share/josm/");
-        locations.add("/usr/local/lib/josm/");
-        locations.add("/usr/share/josm/");
-        locations.add("/usr/lib/josm/");
-            return locations;
-        }
-
+                LinkedList<String> locations = new LinkedList<String>();
+                locations.add(Main.pref.getPreferencesDir());
+                String s;
+                if ((s = System.getenv("JOSM_RESOURCES")) != null) {
+                        if (!s.endsWith("/") && !s.endsWith("\\"))
+                                s = s + "/";
+                        locations.add(s);
+                }
+                if ((s = System.getProperty("josm.resources")) != null) {
+                        if (!s.endsWith("/") && !s.endsWith("\\"))
+                                s = s + "/";
+                        locations.add(s);
+                }
+                String appdata = System.getenv("APPDATA");
+                if (System.getenv("ALLUSERSPROFILE") != null && appdata != null && appdata.lastIndexOf("\\") != -1) {
+                        appdata = appdata.substring(appdata.lastIndexOf("\\"));
+                        locations.add(System.getenv("ALLUSERSPROFILE")+appdata+"/JOSM/");
+                }
+                locations.add("/usr/local/share/josm/");
+                locations.add("/usr/local/lib/josm/");
+                locations.add("/usr/share/josm/");
+                locations.add("/usr/lib/josm/");
+                return locations;
+        }
 
         synchronized public boolean hasKey(final String key) {
                 return override.containsKey(key) ? override.get(key) != null : properties.containsKey(key);
         }
+
         synchronized public String get(final String key) {
                 putDefault(key, null);
@@ -119 +118 @@
                 return properties.get(key);
         }
+
         synchronized public String get(final String key, final String def) {
                 putDefault(key, def);
-                if (override.containsKey(key)) 
+                if (override.containsKey(key))
                         return override.get(key);
                 final String prop = properties.get(key);
@@ -128 +128 @@
                 return prop;
         }
+
         synchronized public Map<String, String> getAllPrefix(final String prefix) {
                 final Map<String,String> all = new TreeMap<String,String>();
@@ -141 +142 @@
                 return all;
         }
-        
+
         synchronized public Map<String, String> getDefaults()
         {
                 return defaults;
         }
+
         synchronized public void putDefault(final String key, final String def) {
                 if(!defaults.containsKey(key) || defaults.get(key) == null)
@@ -152 +154 @@
                         System.out.println("Defaults for " + key + " differ: " + def + " != " + defaults.get(key));
         }
-        
+
         synchronized public boolean getBoolean(final String key) {
                 putDefault(key, null);
@@ -159 +161 @@
                 return properties.containsKey(key) ? Boolean.parseBoolean(properties.get(key)) : false;
         }
+
         synchronized public boolean getBoolean(final String key, final boolean def) {
                 putDefault(key, Boolean.toString(def));
@@ -174 +177 @@
                 firePreferenceChanged(key, value);
         }
+
         synchronized public void put(final String key, final boolean value) {
                 properties.put(key, Boolean.toString(value));
@@ -201 +205 @@
                         // do not message anything, since this can be called from strange
                         // places.
-                }               
+                }
         }
 
@@ -279 +283 @@
                 out.close();
         }
-        
+
         /**
          * Convenience method for accessing colour preferences.
-         * 
+         *
          * @param colName name of the colour
          * @param def default value
@@ -295 +299 @@
                 return ColorHelper.html2color(colStr);
         }
+
         // only for compatibility. Don't use any more.
+        @Deprecated
         public static Color getPreferencesColor(String colName, Color def)
         {
@@ -322 +328 @@
                 return ColorHelper.html2color(colStr);
         }
+
         synchronized public void putColor(String colName, Color val) {
                 put("color."+colName, ColorHelper.color2html(val));
         }
 
-        public int getInteger(String key, int def) {
-            String v = get(key);
-            if(null == v)
-                return def;
-            
-            try {
-                return Integer.parseInt(v);
-            } catch(NumberFormatException e) {
-                // fall out
-            }
-            
-            return def;
-    }
+        synchronized public int getInteger(String key, int def) {
+                String v = get(key);
+                if(null == v)
+                        return def;
+
+                try {
+                        return Integer.parseInt(v);
+                } catch(NumberFormatException e) {
+                        // fall out
+                }
+                return def;
+        }
 }

trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java

@@ -41 +41 @@
                         new JTextField(11) };
         final JTextArea osmUrl = new JTextArea();
+        String noteUrl = tr("You can paste an URL here to download the area.");
         String oldUrl = "";
         
@@ -48 +49 @@
 
                 JPanel dlg = new JPanel(new GridBagLayout());
-                osmUrl.setText(tr("You can paste an URL here to download the area."));
+                osmUrl.setText(noteUrl);
 
                 final FocusListener dialogUpdater = new FocusAdapter() {
@@ -169 +170 @@
                 }
                 // setting old URL prevents refresh based on this URL
-                oldUrl = "http://www.openstreetmap.org/index.html?mlat="+lat+"&mlon="+lon+"&zoom="+zoom;
+                oldUrl = noteUrl+"\n"+"http://www.openstreetmap.org/index.html?mlat="+lat+"&mlon="+lon+"&zoom="+zoom;
                 osmUrl.setText(oldUrl);
         }