Changeset 1860 in josm for trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java

Timestamp:

2009-07-27T18:36:17+02:00 (15 years ago)

Author:

Gubaer

Message:

partial fix for #3109: window order generally messed up?

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (modified) (6 diffs)

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

@@ -28 +28 @@
 import org.openstreetmap.josm.actions.AboutAction;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.xml.sax.SAXException;
@@ -49 +50 @@
 
         @Override protected void finish() {
-            if (errors.length() > 0)
-                JOptionPane.showMessageDialog(Main.parent, tr("There were problems with the following plugins:\n\n {0}",errors));
-            else
-                JOptionPane.showMessageDialog(Main.parent, trn("{0} Plugin successfully downloaded. Please restart JOSM.", "{0} Plugins successfully downloaded. Please restart JOSM.", count, count));
+            if (errors.length() > 0) {
+                OptionPaneUtil.showMessageDialog(
+                        Main.parent,
+                        tr("There were problems with the following plugins:\n\n {0}",errors),
+                        tr("Error"),
+                        JOptionPane.ERROR_MESSAGE
+                );
+            } else {
+                OptionPaneUtil.showMessageDialog(
+                        Main.parent,
+                        trn("{0} Plugin successfully downloaded. Please restart JOSM.", "{0} Plugins successfully downloaded. Please restart JOSM.", count, count),
+                        tr("Information"),
+                        JOptionPane.INFORMATION_MESSAGE
+                );
+            }
         }
 
         @Override protected void realRun() throws SAXException, IOException {
             File pluginDir = Main.pref.getPluginsDirFile();
-            if (!pluginDir.exists())
+            if (!pluginDir.exists()) {
                 pluginDir.mkdirs();
+            }
             progressMonitor.setTicksCount(toUpdate.size());
             for (PluginInformation d : toUpdate) {
@@ -64 +77 @@
                 progressMonitor.worked(1);
                 File pluginFile = new File(pluginDir, d.name + ".jar.new");
-                if(download(d, pluginFile))
+                if(download(d, pluginFile)) {
                     count++;
-                else
+                } else
                 {
                     errors += d.name + "\n";
@@ -88 +101 @@
         int count = 0;
         for (String site : getSites()) {
-        /* TODO: remove old site files (everything except .jar) */
+            /* TODO: remove old site files (everything except .jar) */
             try {
                 BufferedReader r = new BufferedReader(new InputStreamReader(new URL(site).openStream(), "utf-8"));
                 new File(Main.pref.getPreferencesDir()+"plugins").mkdir();
                 BufferedWriter out = new BufferedWriter(new OutputStreamWriter(
-                new FileOutputStream(new File(Main.pref.getPluginsDirFile(),
-                count + "-site-" + site.replaceAll("[/:\\\\ <>|]", "_") + ".txt")), "utf-8"));
-                for (String line = r.readLine(); line != null; line = r.readLine())
+                        new FileOutputStream(new File(Main.pref.getPluginsDirFile(),
+                                count + "-site-" + site.replaceAll("[/:\\\\ <>|]", "_") + ".txt")), "utf-8"));
+                for (String line = r.readLine(); line != null; line = r.readLine()) {
                     out.append(line+"\n");
+                }
                 r.close();
                 out.close();
@@ -110 +124 @@
         {
             int answer = new ExtendedDialog(Main.parent,
-                        tr("Skip download"),
-                        tr("JOSM version {0} required for plugin {1}.", pd.mainversion, pd.name),
-                        new String[] {tr("Download Plugin"), tr("Skip Download")},
-                        new String[] {"download.png", "cancel.png"}).getValue();
+                    tr("Skip download"),
+                    tr("JOSM version {0} required for plugin {1}.", pd.mainversion, pd.name),
+                    new String[] {tr("Download Plugin"), tr("Skip Download")},
+                    new String[] {"download.png", "cancel.png"}).getValue();
             if (answer != 1)
                 return false;
@@ -122 +136 @@
             OutputStream out = new FileOutputStream(file);
             byte[] buffer = new byte[8192];
-            for (int read = in.read(buffer); read != -1; read = in.read(buffer))
+            for (int read = in.read(buffer); read != -1; read = in.read(buffer)) {
                 out.write(buffer, 0, read);
+            }
             out.close();
             in.close();