Changeset 4259 in josm

Timestamp:

Jul 20, 2011 4:04:43 PM (2 years ago)

Author:

bastiK

Message:

see #5906 - start option --version

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Version.java (modified) (5 diffs)
• gui/MainApplication.java (modified) (3 diffs)

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

@@ -66 +66 @@
 
     private int version;
-    private String revision;
+    private String releaseDescription;
     private String time;
     private boolean isLocalBuild;
@@ -96 +96 @@
     protected void initFromRevisionInfo(String revisionInfo) {
         if (revisionInfo == null) {
-            this.revision = tr("UNKNOWN");
+            this.releaseDescription = tr("UNKNOWN");
             this.version = JOSM_UNKNOWN_VERSION;
             this.time = null;
@@ -137 +137 @@
             sb.append(property.getKey()).append(":").append(property.getValue()).append("\n");
         }
-        revision = sb.toString();
+        releaseDescription = sb.toString();
     }
 
@@ -145 +145 @@
             System.err.println(tr("Warning: the revision file ''/REVISION'' is missing."));
             version = 0;
-            revision = "";
+            releaseDescription = "";
             return;
         }
         initFromRevisionInfo(loadResourceFile(u));
-        System.out.println(revision);
     }
 
@@ -168 +167 @@
      */
     public String getReleaseAttributes() {
-        return revision;
+        return releaseDescription;
     }
 

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -29 +29 @@
 import org.openstreetmap.josm.data.AutosaveTask;
 import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -122 +123 @@
             if ("-h".equals(arg) || "-?".equals(arg)) {
                 arg = "--help";
+            } else if ("-v".equals(arg)) {
+                arg = "--version";
             }
             // handle simple arguments like file names, URLs, bounds
@@ -172 +175 @@
         // initialize the platform hook, and
         Main.determinePlatformHook();
-        // call the really early hook before we anything else
+        // call the really early hook before we do anything else
         Main.platform.preStartupHook();
 
         // construct argument table
         final Map<String, Collection<String>> args = buildCommandLineArgumentMap(argArray);
+
+        if (args.containsKey("version")) {
+            System.out.println(Version.getInstance().getAgentString());
+            System.exit(0);
+        } else {
+            System.out.println(Version.getInstance().getReleaseAttributes());
+        }
 
         Main.pref.init(args.containsKey("reset-preferences"));