Changeset 1879 in josm for trunk/src/org/openstreetmap/josm/actions/AboutAction.java

Timestamp:

02.08.2009 14:36:40 (3 years ago)

Author:

Gubaer

Message:

towards a fix for #3142: JOSM applet class no longer functional

File:

• trunk/src/org/openstreetmap/josm/actions/AboutAction.java (modified) (4 diffs)

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

@@ -58 +58 @@
         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();
-            }
+            //            try {
+            manifest = true;
+            //                u = new URL("jar:" + Main.class.getProtectionDomain().getCodeSource().getLocation().toString()
+            //                        + "!/META-INF/MANIFEST.MF");
+            u = Main.class.getResource("/META-INF/MANIFEST.MF");
+            //            } catch (MalformedURLException e) {
+            //                e.printStackTrace();
+            //            }
         }
         revision = loadFile(u, manifest);
@@ -155 +156 @@
 
         JOptionPane.showMessageDialog(Main.parent, about, tr("About JOSM..."),
-        JOptionPane.INFORMATION_MESSAGE, ImageProvider.get("logo"));
+                JOptionPane.INFORMATION_MESSAGE, ImageProvider.get("logo"));
     }
 
@@ -194 +195 @@
         area.setEditable(false);
         Font font = Font.getFont("monospaced");
-        if (font != null)
+        if (font != null) {
             area.setFont(font);
+        }
         if (resource == null)
             return area;
@@ -202 +204 @@
             in = new BufferedReader(new InputStreamReader(resource.openStream()));
             String s = "";
-            for (String line = in.readLine(); line != null; line = in.readLine())
+            for (String line = in.readLine(); line != null; line = in.readLine()) {
                 s += line + "\n";
+            }
             if (manifest) {
                 s = Pattern.compile("\n ", Pattern.DOTALL).matcher(s).replaceAll("");