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

Timestamp:

2015-11-18T00:18:07+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12112 - Use java.util.Properties to read REVISION file in the Version-class (patch by floscher) + checkstyle

File:

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

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.GridBagLayout;
@@ -9 +10 @@
 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 javax.swing.BorderFactory;
@@ -17 +22 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
+import javax.swing.JTextArea;
 
 import org.openstreetmap.josm.Main;
@@ -57 +63 @@
         JosmTextArea readme = new JosmTextArea();
         readme.setEditable(false);
-        readme.setText(Version.loadResourceFile(Main.class.getResource("/README")));
+        setTextFromResourceFile(readme, "/README");
         readme.setCaretPosition(0);
 
@@ -67 +73 @@
         JosmTextArea contribution = new JosmTextArea();
         contribution.setEditable(false);
-        contribution.setText(Version.loadResourceFile(Main.class.getResource("/CONTRIBUTION")));
+        setTextFromResourceFile(contribution, "/CONTRIBUTION");
         contribution.setCaretPosition(0);
 
         JosmTextArea license = new JosmTextArea();
         license.setEditable(false);
-        license.setText(Version.loadResourceFile(Main.class.getResource("/LICENSE")));
+        setTextFromResourceFile(license, "/LICENSE");
         license.setCaretPosition(0);
 
@@ -111 +117 @@
     }
 
+    /**
+     * Reads the contents of the resource file that is described by the {@code filePath}-attribute and puts that text
+     * into the {@link JTextArea} given by the {@code ta}-attribute.
+     * @param ta the {@link JTextArea} to put the files contents into
+     * @param filePath the path where the resource file to read resides
+     */
+    private void setTextFromResourceFile(JTextArea ta, String filePath) {
+        InputStream is = getClass().getResourceAsStream(filePath);
+        if (is == null) {
+            displayErrorMessage(ta, tr("Failed to locate resource ''{0}''.", filePath));
+        } else {
+            try {
+                BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
+                String line;
+                while ((line = br.readLine()) != null) {
+                    ta.append(line+'\n');
+                }
+                br.close();
+            } catch (IOException e) {
+                Main.warn(e);
+                displayErrorMessage(ta, tr("Failed to load resource ''{0}'', error is {1}.", filePath, e.toString()));
+            }
+        }
+    }
+
+    private static void displayErrorMessage(JTextArea ta, String msg) {
+        Main.warn(msg);
+        ta.setForeground(new Color(200, 0, 0));
+        ta.setText(msg);
+    }
+
     private static JScrollPane createScrollPane(JosmTextArea area) {
         area.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));