Changeset 11044 in josm for trunk

Timestamp:

2016-09-23T21:09:16+02:00 (8 years ago)

Author:

simon04

Message:

fix #13687 - Use CachedFile class for /data/help-browser.css in HelpBrowser class (patch by sebastic, modified)

File:

• trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

@@ -14 +14 @@
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
@@ -50 +48 @@
 import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
 import org.openstreetmap.josm.gui.widgets.JosmHTMLEditorKit;
+import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.InputMapUtils;
@@ -139 +138 @@
     protected StyleSheet buildStyleSheet() {
         StyleSheet ss = new StyleSheet();
-        StringBuilder css = new StringBuilder();
-        try (BufferedReader breader = new BufferedReader(
-                new InputStreamReader(
-                        getClass().getResourceAsStream("/data/help-browser.css"), StandardCharsets.UTF_8
-                )
-        )) {
-            String line;
-            while ((line = breader.readLine()) != null) {
-                css.append(line);
-                css.append('\n');
-            }
+        final String css;
+        try (CachedFile cf = new CachedFile("resource://data/help-browser.css")) {
+            css = new String(cf.getByteContent(), StandardCharsets.ISO_8859_1);
         } catch (IOException e) {
             Main.error(tr("Failed to read CSS file ''help-browser.css''. Exception is: {0}", e.toString()));
@@ -155 +146 @@
             return ss;
         }
-        ss.addRule(css.toString());
+        ss.addRule(css);
         return ss;
     }