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

Timestamp:

2009-10-31T13:15:29+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #3305: Version is UNKNOWN
fixed #3429: created_by=* includes the wrong language when uploading from a new layer

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (5 diffs)
• Version.java (added)

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

@@ -30 +30 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.AboutAction;
 import org.openstreetmap.josm.gui.preferences.ProxyPreferences;
 import org.openstreetmap.josm.tools.ColorHelper;
+import org.openstreetmap.josm.tools.LanguageInfo;
 
 /**
@@ -324 +324 @@
     public void save() throws IOException {
         /* currently unused, but may help to fix configuration issues in future */
-        properties.put("josm.version", AboutAction.getVersionString());
-
-        setSystemProperties();
+        properties.put("josm.version", Version.getInstance().getVersionString());
+
+        updateSystemProperties();
         File prefFile = new File(getPreferencesDirFile(), "preferences");
 
@@ -394 +394 @@
         if (!errLines.isEmpty())
             throw new IOException(tr("Malformed config file at lines {0}", errLines));
-        setSystemProperties();
+        updateSystemProperties();
     }
 
@@ -679 +679 @@
             }
         }
-
         return put(key, s);
     }
-
-    private void setSystemProperties() {
+    
+    /**
+     * Updates system properties with the current values in the preferences.
+     * 
+     */
+    public void updateSystemProperties() {
+        Properties sysProp = System.getProperties();
         if (getBoolean(ProxyPreferences.PROXY_ENABLE)) {
-            Properties sysProp = System.getProperties();
             sysProp.put("proxySet", "true");
             sysProp.put("http.proxyHost", get(ProxyPreferences.PROXY_HOST));
@@ -693 +696 @@
                 sysProp.put("proxyPassword", get(ProxyPreferences.PROXY_PASS));
             }
-            System.setProperties(sysProp);
-        }
-        AboutAction.setUserAgent();
+         
+        }
+        int v = Version.getInstance().getVersion();
+        String s = ( v == Version.JOSM_UNKNOWN_VERSION) ? "UNKNOWN" : Integer.toString(v);        
+        sysProp.put("http.agent", "JOSM/1.5 ("+ s+" "+LanguageInfo.getJOSMLocaleCode()+")");
+        System.setProperties(sysProp);
     }
 }