Changeset 2032 in josm for trunk/src/org/openstreetmap/josm/plugins

Timestamp:

2009-09-03T09:29:22+02:00 (15 years ago)

Author:

stoecker

Message:

fix #3377 - patch by xeen - removed deprecated calls

File:

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

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

@@ -97 +97 @@
             done = true;
         } else {
-            int answer = new ExtendedDialog(Main.parent,
+            ExtendedDialog ed = new ExtendedDialog(Main.parent,
                     tr("Update"),
-                    tr("Update the following plugins:\n\n{0}", toUpdateStr.toString()),
-                    new String[] {tr("Update Plugins"), tr("Cancel")},
-                    new String[] {"dialogs/refresh.png", "cancel.png"}).getValue();
-            if (answer == 1) {
+                    new String[] {tr("Update Plugins"), tr("Cancel")});
+            ed.setButtonIcons(new String[] {"dialogs/refresh.png", "cancel.png"});
+            ed.setContent(tr("Update the following plugins:\n\n{0}", toUpdateStr.toString()));
+            ed.showDialog();
+
+            if (ed.getValue() == 1) {
                 PluginDownloader.update(toUpdate);
                 done = true;
@@ -133 +135 @@
         }
         if (!toDownload.isEmpty()) {
-            int answer = new ExtendedDialog(Main.parent,
+            ExtendedDialog ed = new ExtendedDialog(Main.parent,
                     tr("Download missing plugins"),
-                    tr("Download the following plugins?\n\n{0}", msg),
-                    new String[] {tr("Download Plugins"), tr("Cancel")},
-                    new String[] {"download.png", "cancel.png"}).getValue();
+                    new String[] {tr("Download Plugins"), tr("Cancel")});
+            ed.setButtonIcons(new String[] {"download.png", "cancel.png"});
+            ed.setContent(tr("Download the following plugins?\n\n{0}", msg));
+            ed.showDialog();
+
             Collection<PluginInformation> error =
-                (answer != 1 ? toDownload : new PluginDownloader().download(toDownload));
+                (ed.getValue() != 1 ? toDownload : new PluginDownloader().download(toDownload));
             for (PluginInformation pd : error) {
                 pluginMap.put(pd.name, false);
@@ -330 +334 @@
                                     name = x[0];
                                     url = x[1];
-                                    manifest = null;
+                                    // Is null anyway
+                                    //manifest = null;
                                 }
                             }