Changeset 1591 in josm

Timestamp:

May 15, 2009 9:38:39 AM (4 years ago)

Author:

stoecker

Message:

improved plugin information download

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• PluginDownloader.java (modified) (1 diff)
• PluginSelection.java (modified) (4 diffs)

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

@@ -83 +83 @@
         /* TODO: remove old site files (everything except .jar) */
             try {
-                BufferedReader r = new BufferedReader(new InputStreamReader(new URL(site).openStream()));
+                BufferedReader r = new BufferedReader(new InputStreamReader(new URL(site).openStream(), "utf-8"));
                 StringBuilder b = new StringBuilder();
                 for (String line = r.readLine(); line != null; line = r.readLine())

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

@@ -13 +13 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
 import java.io.IOException;
 import java.util.Arrays;
@@ -270 +271 @@
                         }
                     } else if (fname.matches("^[0-9]+-site.*\\.txt$")) {
+                        int err = 0;
                         try {
-                            BufferedReader r = new BufferedReader(new FileReader(f));
+                            BufferedReader r = new BufferedReader(new InputStreamReader(new FileInputStream(f), "utf-8"));
                             String name = null;
                             String url = null;
@@ -291 +293 @@
                                     if(name != null)
                                     {
-                                        PluginInformation info = new PluginInformation(null, name.substring(0,name.length()-4),
-                                        new ByteArrayInputStream(manifest.getBytes()));
-                                        info.downloadlink = url;
-                                        if(!availablePlugins.containsKey(info.name))
-                                            availablePlugins.put(info.name, info);
-                                        manifest = null;
+                                        try
+                                        {
+                                            PluginInformation info = new PluginInformation(null, name.substring(0,name.length()-4),
+                                            new ByteArrayInputStream(manifest.getBytes()));
+                                            info.downloadlink = url;
+                                            if(!availablePlugins.containsKey(info.name))
+                                                availablePlugins.put(info.name, info);
+                                        }
+                                        catch (Exception e)
+                                        {
+                                            e.printStackTrace();
+                                            ++err;
+                                        }
                                     }
                                     String x[] = line.split(";");
                                     name = x[0];
                                     url = x[1];
+                                    manifest = null;
                                 }
                             }
@@ -314 +324 @@
                         } catch (Exception e) {
                             e.printStackTrace();
-                            JOptionPane.showMessageDialog(Main.parent, tr("Error reading plugin information file: {0}", f.getName()));
+                            ++err;
+                        }
+                        if(err > 0)
+                        {
+                          JOptionPane.showMessageDialog(Main.parent, tr("Error reading plugin information file: {0}", f.getName()));
                         }
                     }