Changeset 1487 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-03-12T18:40:08+01:00 (16 years ago)

Author:

stoecker

Message:

remove signed data from manifest display

File:

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

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

@@ -54 +54 @@
 
     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");
@@ -63 +65 @@
             }
         }
-        revision = loadFile(u);
+        revision = loadFile(u, manifest);
 
         Pattern versionPattern = Pattern.compile(".*?(?:Revision|Main-Version): ([0-9]*(?: SVN)?).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
@@ -122 +124 @@
         JTabbedPane about = new JTabbedPane();
 
-        JTextArea readme = loadFile(Main.class.getResource("/README"));
-        JTextArea contribution = loadFile(Main.class.getResource("/CONTRIBUTION"));
+        JTextArea readme = loadFile(Main.class.getResource("/README"), false);
+        JTextArea contribution = loadFile(Main.class.getResource("/CONTRIBUTION"), false);
 
         JPanel info = new JPanel(new GridBagLayout());
@@ -187 +189 @@
      * @return  An read-only text area with the content of "resource"
      */
-    private static JTextArea loadFile(URL resource) {
+    private static JTextArea loadFile(URL resource, boolean manifest) {
         JTextArea area = new JTextArea(tr("File could not be found."));
         area.setEditable(false);
@@ -198 +200 @@
         try {
             in = new BufferedReader(new InputStreamReader(resource.openStream()));
-            StringBuilder sb = new StringBuilder();
-            for (String line = in.readLine(); line != null; line = in.readLine()) {
-                sb.append(line);
-                sb.append('\n');
+            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(sb.toString());
+            area.setText(s);
             area.setCaretPosition(0);
         } catch (IOException e) {