Changeset 3084 in josm for trunk

Timestamp:

2010-03-05T11:39:42+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #4660: Local plugin list does not display umlauts
Local cache now encoded in UTF-8 too. You have to remove your cached plugin lists or download the plugin list in the plugin preferences.

File:

• trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java

@@ -7 +7 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
@@ -121 +122 @@
                 connection.setRequestProperty("User-Agent",Version.getInstance().getAgentString());
                 connection.setRequestProperty("Host", url.getHost());
+                connection.setRequestProperty("Accept-Charset", "utf-8");
             }
             in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
@@ -169 +171 @@
             File cacheFile = new File(pluginDir, createSiteCacheFileName(site));
             getProgressMonitor().subTask(tr("Writing plugin list to local cache ''{0}''", cacheFile.toString()));
-            writer = new PrintWriter(
-                    new FileWriter(cacheFile)
-            );
-            writer.print(list);
+            writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(cacheFile), "utf-8"));
+            writer.write(list);
         } catch(IOException e) {
             // just failed to write the cache file. No big deal, but log the exception anyway