Changeset 2370 in josm for trunk/src/org/openstreetmap/josm/data/Version.java

Timestamp:

2009-11-01T10:20:23+01:00 (15 years ago)

Author:

stoecker

Message:

reworked user agent string to match established format

File:

• trunk/src/org/openstreetmap/josm/data/Version.java (modified) (13 diffs)

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

@@ -14 +14 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.LanguageInfo;
 
 /**
  * Provides basic information about the currently used JOSM build.
- * 
+ *
  */
 public class Version {
@@ -23 +24 @@
     static public final int JOSM_UNKNOWN_VERSION = 0;
 
-    /** the unique instance */ 
+    /** the unique instance */
     private static Version instance;
-    
+
     /**
      * Load the specified resource as string.
-     * 
+     *
      * @param resource the resource url to load
-     * @return  the content of the resource file; null, if an error occurred 
+     * @return  the content of the resource file; null, if an error occurred
      */
     static public String loadResourceFile(URL resource) {
@@ -48 +49 @@
         return s;
     }
-    
-    /**
-     * Replies the unique instance of the version information 
-     * 
+
+    /**
+     * Replies the unique instance of the version information
+     *
      * @return the unique instance of the version information
      */
-    
+
     static public Version getInstance() {
         if (instance == null) {
@@ -60 +61 @@
             instance.init();
         }
-        return instance;            
-    }
-    
+        return instance;
+    }
+
     private int version;
     private String revision;
     private String time;
     private boolean isLocalBuild;
-    
+
     protected HashMap<String, String> parseManifestStyleFormattedString(String content) {
         HashMap<String, String> properties = new HashMap<String, String>();
@@ -82 +83 @@
         return properties;
     }
-    
-    /**
-     * Initializes the version infos from the revision resource file 
-     * 
-     * @param revisionInfo the revision info loaded from a revision resource file 
+
+    /**
+     * Initializes the version infos from the revision resource file
+     *
+     * @param revisionInfo the revision info loaded from a revision resource file
      */
     protected void initFromRevisionInfo(String revisionInfo) {
@@ -93 +94 @@
             this.version = JOSM_UNKNOWN_VERSION;
             this.time = null;
-            return;        
-        }
-        
+            return;
+        }
+
         HashMap<String, String> properties = parseManifestStyleFormattedString(revisionInfo);
         String value = properties.get("Revision");
@@ -109 +110 @@
             version = JOSM_UNKNOWN_VERSION;
         }
-                
-        // the last changed data 
+
+        // the last changed data
         //
         time = properties.get("Last Changed Date");
@@ -116 +117 @@
             time = properties.get("Build-Date");
         }
-        
+
         // is this a local build ?
         //
-        isLocalBuild = false; 
+        isLocalBuild = false;
         value = properties.get("Is-Local-Build");
         if (value != null && value.trim().toLowerCase().equals("true"))  {
             isLocalBuild = true;
         }
-        
+
         // the revision info
         //
@@ -132 +133 @@
         }
         revision = sb.toString();
-    }    
-       
-    public void init() {    
+    }
+
+    public void init() {
         URL u = Main.class.getResource("/REVISION");
         if (u == null) {
@@ -145 +146 @@
         System.out.println(revision);
     }
-   
-    /**
-     * Replies the version string. Either the SVN revision "1234" (as string) or the 
+
+    /**
+     * Replies the version string. Either the SVN revision "1234" (as string) or the
      * the I18n equivalent of "UNKNOWN".
-     * 
-     * @return the JOSM version 
+     *
+     * @return the JOSM version
      */
     public String getVersionString() {
         return  version == 0 ? tr("UNKNOWN") : Integer.toString(version);
     }
-    
+
     /**
      * Replies a text with the release attributes
-     *  
+     *
      * @return a text with the release attributes
      */
@@ -166 +167 @@
 
     /**
-     * Replies the build date as string 
-     * 
-     * @return the build date as string 
+     * Replies the build date as string
+     *
+     * @return the build date as string
      */
     public String getTime() {
         return time;
     }
-    
-    /**
-     * Replies the JOSM version. Replies {@see #JOSM_UNKNOWN_VERSION} if the version isn't known. 
+
+    /**
+     * Replies the JOSM version. Replies {@see #JOSM_UNKNOWN_VERSION} if the version isn't known.
      * @return the JOSM version
      */
@@ -184 +185 @@
     /**
      * Replies true if this is a local build, i.e. an inofficial development build.
-     * 
+     *
      * @return true if this is a local build, i.e. an inofficial development build.
      */
@@ -190 +191 @@
         return isLocalBuild;
     }
+
+    public String getAgentString() {
+        int v = getVersion();
+        String s = (v == JOSM_UNKNOWN_VERSION) ? "UNKNOWN" : Integer.toString(v);
+        if (isLocalBuild() && v != JOSM_UNKNOWN_VERSION) {
+            s += " SVN";
+        }
+        return "JOSM/1.5 ("+ s+" "+LanguageInfo.getJOSMLocaleCode()+")";
+    }
 }