Changeset 6371 in josm for trunk/src

Timestamp:

2013-11-07T08:34:15+01:00 (11 years ago)

Author:

simon04

Message:

fix #9157 - read opening_hours.js in UTF-8

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

@@ -48 +48 @@
     public void initialize() throws Exception {
         super.initialize();
-        ENGINE.eval(new InputStreamReader(new MirroredInputStream("resource://data/opening_hours.js")));
+        ENGINE.eval(new InputStreamReader(new MirroredInputStream("resource://data/opening_hours.js"), "UTF-8"));
         ENGINE.eval("var oh = function (x, y) {return new opening_hours(x, y);};");
     }
@@ -62 +62 @@
             return Arrays.asList();
         } else if (obj instanceof String) {
-            return Arrays.<Object>asList(((String) obj).split("\\n"));
+            final Object[] strings = ((String) obj).split("\\n");
+            return Arrays.asList(strings);
         } else if (obj instanceof List) {
             return (List) obj;