Changeset 1509 in josm for trunk/src/org

Timestamp:

2009-03-20T08:17:45+01:00 (15 years ago)

Author:

stoecker

Message:

Version information now directly in webpage

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/GpxExportAction.java (modified) (1 diff)
• gui/GettingStarted.java (modified) (2 diffs)

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

@@ -132 +132 @@
             gpxData = ((GpxLayer)layer).data;
         else
-            gpxData = OsmDataLayer.toGpxData(Main.ds);
+            gpxData = OsmDataLayer.toGpxData(Main.ds, file);
         // TODO: add copyright, etc.
         try {

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

@@ -85 +85 @@
                 }
             }
-            try {
-                vers = wr.read(baseurl + "/version?format=txt");
-                motd = motd.replace("</html>", getVersionNumber(vers)+"</html>");
-            } catch (IOException ioe) {}
+            motd = motd.replace("<!-- VERSION -->", tr("- running version is {0}",
+            AboutAction.getVersionString()));
             // Save this to prefs in case JOSM is updated so MOTD can be refreshed
             Main.pref.putInteger("cache.motd.html.version", myVersion);
@@ -105 +103 @@
             //    everytime because of something we can't read.
             return Main.pref.getInteger("cache.motd.html.version", myVersion) == myVersion;
-        }
-
-        /**
-         * Tries to read the version number from a given Future<String>
-         * @param Future<String> that contains the version page
-         * @return String with HTML Code
-         */
-        private String getVersionNumber(String str) {
-            try {
-                Matcher m = Pattern.compile(".*josm-tested\\.jar: *(\\d+).*", Pattern.DOTALL).matcher(str);
-                m.matches();
-                int curVersion = Integer.parseInt(m.group(1));
-                m = Pattern.compile(".*josm-latest\\.jar: *(\\d+).*", Pattern.DOTALL).matcher(str);
-                m.matches();
-                int latest = Integer.parseInt(m.group(1));
-                return "<div style=\"text-align:right;font-size:small;font-weight:normal;\">"
-                + "<b>"
-                + (curVersion > myVersion ? tr("Update available") + " &#151; ": "")
-                + tr("Version Details:") + "</b> "
-                + tr("Yours: {2}; Current: {0}; <font style=\"font-size:x-small\">"
-                + "(latest untested: {1} &#150; not recommended)</font>",
-                curVersion, latest, myVersion)
-                + "</div>";
-            } catch(Exception e) {
-              // e.printStackTrace();
-            }
-
-            return "";
         }
     }