Ticket #1841: josm-1841-manifest_lookup.patch

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

@@ -12 +12 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Map.Entry;
 import java.util.regex.Matcher;
@@ -50 +51 @@
         private final static JTextArea revision;
         private static String time;
 
-        static {
-                URL u = Main.class.getResource("/REVISION");
-                if(u == null) u = Main.class.getResource("/META-INF/MANIFEST.MF");
+    static {
+        URL u = Main.class.getResource("/REVISION");
+        if(u == null) {
+            try {
+                u = new URL("jar:" + Main.class.getProtectionDomain().getCodeSource().getLocation().toString() 
+                        + "!/META-INF/MANIFEST.MF");
+            } catch (MalformedURLException e) {
+                e.printStackTrace();
+            }
+        }
                 revision = loadFile(u);
 
-                Pattern versionPattern = Pattern.compile(".*?(?:Revision|Main-Version): ([0-9]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
+                Pattern versionPattern = Pattern.compile(".*?(?:Revision|Main-Version): ([0-9]*(?: SVN)?).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
                 Matcher match = versionPattern.matcher(revision.getText());
                 version = match.matches() ? match.group(1) : tr("UNKNOWN");