Changeset 2369 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-11-01T09:22:27+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3305: Version is UNKNOWN
see also howto create a JOSM build

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AboutAction.java (modified) (1 diff)
• actions/ShowStatusReportAction.java (modified) (1 diff)
• data/Preferences.java (modified) (1 diff)
• data/Version.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/AboutAction.java

@@ -75 +75 @@
         JTextArea revision = new JTextArea();
         revision.setEditable(false);
-        revision.setText(version.getRevision());
+        revision.setText(version.getReleaseAttributes());
         about.addTab(tr("Info"), info);
         about.addTab(tr("Readme"), createScrollPane(readme));

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -47 +47 @@
     {
         StringBuilder text = new StringBuilder();
-        text.append(Version.getInstance().getRevision());
+        text.append(Version.getInstance().getReleaseAttributes());
         text.append("\n");
         text.append("Memory Usage: ");

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

@@ -699 +699 @@
         }
         int v = Version.getInstance().getVersion();
-        String s = ( v == Version.JOSM_UNKNOWN_VERSION) ? "UNKNOWN" : Integer.toString(v);        
+        String s = (v == Version.JOSM_UNKNOWN_VERSION) ? "UNKNOWN" : Integer.toString(v);   
+        if (! Version.getInstance().isLocalBuild() && v != Version.JOSM_UNKNOWN_VERSION) {
+            s += " SVN";
+        } else if (Version.getInstance().isLocalBuild() && v != Version.JOSM_UNKNOWN_VERSION) {
+            s += " Local";
+        }
         sysProp.put("http.agent", "JOSM/1.5 ("+ s+" "+LanguageInfo.getJOSMLocaleCode()+")");
         System.setProperties(sysProp);

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

@@ -7 +7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;
@@ -17 +16 @@
 
 /**
- * Provides basic information about JOSM build currently used.
+ * Provides basic information about the currently used JOSM build.
  * 
  */
@@ -67 +66 @@
     private String revision;
     private String time;
-    
+    private boolean isLocalBuild;
     
     protected HashMap<String, String> parseManifestStyleFormattedString(String content) {
@@ -118 +117 @@
         }
         
+        // is this a local build ?
+        //
+        isLocalBuild = false; 
+        value = properties.get("Is-Local-Build");
+        if (value != null && value.trim().toLowerCase().equals("true"))  {
+            isLocalBuild = true;
+        }
+        
         // the revision info
         //
@@ -149 +156 @@
     }
     
-    public String getRevision() {
+    /**
+     * Replies a text with the release attributes
+     *  
+     * @return a text with the release attributes
+     */
+    public String getReleaseAttributes() {
         return revision;
     }
 
+    /**
+     * 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. 
+     * @return the JOSM version
+     */
     public int getVersion() {
         return version;
     }
+
+    /**
+     * 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.
+     */
+    public boolean isLocalBuild() {
+        return isLocalBuild;
+    }
 }