Changeset 7089 in josm for trunk

Timestamp:

2014-05-09T14:36:55+02:00 (11 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

Files:

• gui/io/DownloadFileTask.java (modified) (2 diffs)
• gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (1 diff)
• io/Compression.java (modified) (3 diffs)
• io/FileImporter.java (modified) (2 diffs)
• io/MirroredInputStream.java (modified) (10 diffs)
• io/session/SessionReader.java (modified) (2 diffs)
• io/session/SessionWriter.java (modified) (1 diff)
• tools/ImageProvider.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);

trunk/src/org/openstreetmap/josm/io/Compression.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io;
-
-import org.apache.tools.bzip2.CBZip2OutputStream;
-import org.openstreetmap.josm.tools.Utils;
 
 import java.io.File;
@@ -12 +9 @@
 import java.io.OutputStream;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.zip.GZIPOutputStream;
 import java.util.zip.ZipOutputStream;
+
+import org.apache.tools.bzip2.CBZip2OutputStream;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -103 +104 @@
                 return new GZIPOutputStream(out);
             case ZIP:
-                return new ZipOutputStream(out);
+                return new ZipOutputStream(out, StandardCharsets.UTF_8);
             case NONE:
             default:

trunk/src/org/openstreetmap/josm/io/FileImporter.java

@@ -8 +8 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.zip.GZIPInputStream;
@@ -162 +163 @@
             return null;
         }
-        ZipInputStream zis = new ZipInputStream(in);
+        ZipInputStream zis = new ZipInputStream(in, StandardCharsets.UTF_8);
         // Positions the stream at the beginning of first entry
         ZipEntry ze = zis.getNextEntry();

trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java

@@ -15 +15 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -39 +40 @@
     /**
      * Constructs an input stream from a given filename, URL or internal resource.
-     * 
+     *
      * @param name can be:<ul>
      *  <li>relative or absolute file name</li>
@@ -54 +55 @@
     /**
      * Constructs an input stream from a given filename, URL or internal resource.
-     * 
+     *
      * @param name can be:<ul>
      *  <li>relative or absolute file name</li>
@@ -70 +71 @@
     /**
      * Constructs an input stream from a given filename, URL or internal resource.
-     * 
+     *
      * @param name can be:<ul>
      *  <li>relative or absolute file name</li>
@@ -86 +87 @@
     /**
      * Constructs an input stream from a given filename, URL or internal resource.
-     * 
+     *
      * @param name can be:<ul>
      *  <li>relative or absolute file name</li>
@@ -103 +104 @@
     /**
      * Constructs an input stream from a given filename, URL or internal resource.
-     * 
+     *
      * @param name can be:<ul>
      *  <li>relative or absolute file name</li>
@@ -121 +122 @@
     /**
      * Constructs an input stream from a given filename, URL or internal resource.
-     * 
+     *
      * @param name can be:<ul>
      *  <li>relative or absolute file name</li>
@@ -200 +201 @@
         Pair<String, InputStream> res = null;
         try {
-            ZipFile zipFile = new ZipFile(file);
+            ZipFile zipFile = new ZipFile(file, StandardCharsets.UTF_8);
             ZipEntry resentry = null;
             Enumeration<? extends ZipEntry> entries = zipFile.entries();
@@ -239 +240 @@
         cleanup(name, null);
     }
-    
+
     public static void cleanup(String name, String destDir) {
         URL url;
@@ -349 +350 @@
      * <p>
      * This can causes problems when downloading from certain GitHub URLs.
-     * 
+     *
      * @param downloadUrl The resource URL to download
      * @param httpAccept The accepted MIME types sent in the HTTP Accept header. Can be {@code null}

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -13 +13 @@
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -559 +560 @@
         if (zip) {
             try {
-                zipFile = new ZipFile(sessionFile);
+                zipFile = new ZipFile(sessionFile, StandardCharsets.UTF_8);
                 return getZipInputStream(zipFile);
             } catch (ZipException ze) {

trunk/src/org/openstreetmap/josm/io/session/SessionWriter.java

@@ -249 +249 @@
     public void write(OutputStream out) throws IOException {
         if (zip) {
-            zipOut = new ZipOutputStream(new BufferedOutputStream(out));
+            zipOut = new ZipOutputStream(new BufferedOutputStream(out), StandardCharsets.UTF_8);
         }
         Document doc = createJosDocument(); // as side effect, files may be added to zipOut

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -598 +598 @@
 
     private static ImageResource getIfAvailableZip(String fullName, File archive, String inArchiveDir, ImageType type) {
-        try (ZipFile zipFile = new ZipFile(archive)) {
+        try (ZipFile zipFile = new ZipFile(archive, StandardCharsets.UTF_8)) {
             if (inArchiveDir == null || ".".equals(inArchiveDir)) {
                 inArchiveDir = "";