Changeset 2358 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-10-31T13:15:29+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3305: Version is UNKNOWN
fixed #3429: created_by=* includes the wrong language when uploading from a new layer

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AboutAction.java (modified) (7 diffs)
• ShowStatusReportAction.java (modified) (2 diffs)

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

@@ -9 +9 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Properties;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import javax.swing.BorderFactory;
@@ -28 +19 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.UrlLabel;
@@ -43 +34 @@
  * @author imi
  */
-/**
- * @author Stephan
- *
- */
 public class AboutAction extends JosmAction {
-
-    private static final String version;
-
-    private final static JTextArea revision;
-    private static String time;
-
-    static {
-        boolean manifest = false;
-        URL u = Main.class.getResource("/REVISION");
-        if(u == null) {
-            try {
-                manifest = true;
-                u = new URL("jar:" + Main.class.getProtectionDomain().getCodeSource().getLocation().toString()
-                        + "!/META-INF/MANIFEST.MF");
-            } catch (MalformedURLException e) {
-                e.printStackTrace();
-            }
-        }
-        revision = loadFile(u, manifest);
-        System.out.println("Revision: " + revision.getText());
-
-        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");
-
-        Pattern timePattern = Pattern.compile(".*?(?:Last Changed Date|Main-Date): ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
-        match = timePattern.matcher(revision.getText());
-        time = match.matches() ? match.group(1) : tr("UNKNOWN");
-    }
-
-    /**
-     * Return string describing version.
-     * Note that the strinc contains the version number plus an optional suffix of " SVN" to indicate an unofficial development build.
-     * @return version string
-     */
-    static public String getVersionString() {
-        return version;
-    }
-
-    static public String getTextBlock() {
-        return revision.getText();
-    }
-
-    static public void setUserAgent() {
-        Properties sysProp = System.getProperties();
-        sysProp.put("http.agent", "JOSM/1.5 ("+(version.equals(tr("UNKNOWN"))?"UNKNOWN":version)+" "+LanguageInfo.getJOSMLocaleCode()+")");
-        System.setProperties(sysProp);
-    }
-
-    /**
-     * Return the number part of the version string.
-     * @return integer part of version number or Integer.MAX_VALUE if not available
-     */
-    public static int getVersionNumber() {
-        int myVersion=Integer.MAX_VALUE;
-        try {
-            myVersion = Integer.parseInt(version.split(" ")[0]);
-        } catch (NumberFormatException e) {
-            // e.printStackTrace();
-        }
-        return myVersion;
-    }
-
-    /**
-     * check whether the version is a development build out of SVN.
-     * @return true if it is a SVN unofficial build
-     */
-    public static boolean isDevelopmentVersion() {
-        return version.endsWith(" SVN") || version.equals(tr("UNKNOWN"));
-    }
-
+  
     public AboutAction() {
         super(tr("About"), "about", tr("Display the about screen."), Shortcut.registerShortcut("system:about", tr("About"), KeyEvent.VK_F1, Shortcut.GROUP_DIRECT, Shortcut.SHIFT_DEFAULT), true);
@@ -125 +42 @@
     public void actionPerformed(ActionEvent e) {
         JTabbedPane about = new JTabbedPane();
+        
+        JTextArea readme = new JTextArea();
+        readme.setEditable(false);
+        readme.setText(Version.loadResourceFile(Main.class.getResource("/README")));
 
-        JTextArea readme = loadFile(Main.class.getResource("/README"), false);
-        JTextArea contribution = loadFile(Main.class.getResource("/CONTRIBUTION"), false);
-        JTextArea license = loadFile(Main.class.getResource("/LICENSE"), false);
+        JTextArea contribution = new JTextArea();
+        contribution.setEditable(false);
+        contribution.setText(Version.loadResourceFile(Main.class.getResource("/CONTRIBUTION")));
+
+        JTextArea license = new JTextArea();
+        license.setEditable(false);
+        license.setText(Version.loadResourceFile(Main.class.getResource("/LICENSE")));
+        
+        Version version = Version.getInstance();
 
         JPanel info = new JPanel(new GridBagLayout());
@@ -135 +62 @@
         info.add(caption, GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
         info.add(GBC.glue(0,10), GBC.eol());
-        info.add(new JLabel(tr("Version {0}",version)), GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
+        info.add(new JLabel(tr("Version {0}", version.getVersionString())), GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
         info.add(GBC.glue(0,5), GBC.eol());
-        info.add(new JLabel(tr("Last change at {0}",time)), GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
+        info.add(new JLabel(tr("Last change at {0}",version.getTime())), GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
         info.add(GBC.glue(0,5), GBC.eol());
         info.add(new JLabel(tr("Java Version {0}",System.getProperty("java.version"))), GBC.eol().fill(GBC.HORIZONTAL).insets(10,0,0,0));
@@ -146 +73 @@
         info.add(new UrlLabel("http://josm.openstreetmap.de/newticket"), GBC.eol().fill(GBC.HORIZONTAL));
 
+        JTextArea revision = new JTextArea();
+        revision.setEditable(false);
+        revision.setText(version.getRevision());
         about.addTab(tr("Info"), info);
         about.addTab(tr("Readme"), createScrollPane(readme));
@@ -167 +97 @@
         return sp;
     }
-
-    /**
-     * Retrieve the latest JOSM version from the JOSM homepage.
-     * @return An string with the latest version or "UNKNOWN" in case
-     *      of problems (e.g. no internet connection).
-     */
-    public static String checkLatestVersion() {
-        String latest;
-        try {
-            InputStream s = new URL("http://josm.openstreetmap.de/current").openStream();
-            latest = new BufferedReader(new InputStreamReader(s)).readLine();
-            s.close();
-        } catch (IOException x) {
-            x.printStackTrace();
-            return tr("UNKNOWN");
-        }
-        return latest;
-    }
-
-    /**
-     * Load the specified resource into an TextArea and return it.
-     * @param resource The resource url to load
-     * @return  An read-only text area with the content of "resource"
-     */
-    private static JTextArea loadFile(URL resource, boolean manifest) {
-        JTextArea area = new JTextArea(tr("File could not be found."));
-        area.setEditable(false);
-        Font font = Font.getFont("monospaced");
-        if (font != null) {
-            area.setFont(font);
-        }
-        if (resource == null)
-            return area;
-        BufferedReader in;
-        try {
-            in = new BufferedReader(new InputStreamReader(resource.openStream()));
-            String s = "";
-            for (String line = in.readLine(); line != null; line = in.readLine()) {
-                s += line + "\n";
-            }
-            if (manifest) {
-                s = Pattern.compile("\n ", Pattern.DOTALL).matcher(s).replaceAll("");
-                s = Pattern.compile("^(SHA1-Digest|Name): .*?$", Pattern.DOTALL|Pattern.MULTILINE).matcher(s).replaceAll("");
-                s = Pattern.compile("\n+$", Pattern.DOTALL).matcher(s).replaceAll("");
-            }
-            area.setText(s);
-            area.setCaretPosition(0);
-        } catch (IOException e) {
-            System.err.println("Cannot load resource " + resource + ": " + e.getMessage());
-            //e.printStackTrace();
-        }
-        return area;
-    }
 }

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

@@ -21 +21 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.plugins.PluginHandler;
@@ -46 +47 @@
     {
         StringBuilder text = new StringBuilder();
-        text.append(AboutAction.getTextBlock());
+        text.append(Version.getInstance().getRevision());
         text.append("\n");
         text.append("Memory Usage: ");