Changeset 7089 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-05-09T14:36:55+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - Use of new Java 7 zip constructors allowing to specify a charset for entries names

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• io/DownloadFileTask.java (modified) (2 diffs)
• mappaint/mapcss/MapCSSStyleSource.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java

@@ -14 +14 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.Enumeration;
 import java.util.zip.ZipEntry;
@@ -169 +170 @@
      */
     public static void unzipFileRecursively(File file, String dir) throws IOException {
-        try (ZipFile zf = new ZipFile(file)) {
+        try (ZipFile zf = new ZipFile(file, StandardCharsets.UTF_8)) {
             Enumeration<? extends ZipEntry> es = zf.entries();
             while (es.hasMoreElements()) {

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -162 +162 @@
             File file = in.getFile();
             Utils.close(in);
-            zipFile = new ZipFile(file);
+            zipFile = new ZipFile(file, StandardCharsets.UTF_8);
             zipIcons = file;
             ZipEntry zipEntry = zipFile.getEntry(zipEntryPath);