Index: trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (revision 2056)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginDownloader.java (revision 2070)
@@ -122,9 +122,13 @@
if(pd.mainversion > AboutAction.getVersionNumber())
{
- int answer = new ExtendedDialog(Main.parent,
+ ExtendedDialog dialog = 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();
+ new String[] {tr("Download Plugin"), tr("Skip Download")}
+ );
+ dialog.setContent(tr("JOSM version {0} required for plugin {1}.", pd.mainversion, pd.name));
+ dialog.setButtonIcons(new String[] {"download.png", "cancel.png"});
+ dialog.showDialog();
+ int answer = dialog.getValue();
if (answer != 1)
return false;
Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 2056)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 2070)
@@ -171,10 +171,13 @@
} catch (Throwable e) {
e.printStackTrace();
-
- int result = new ExtendedDialog(Main.parent,
+ ExtendedDialog dialog = new ExtendedDialog(
+ Main.parent,
tr("Disable plugin"),
- tr("Could not load plugin {0}. Delete from preferences?", info.name),
- new String[] {tr("Disable plugin"), tr("Keep plugin")},
- new String[] {"dialogs/delete.png", "cancel.png"}).getValue();
+ new String[] {tr("Disable plugin"), tr("Keep plugin")}
+ );
+ dialog.setContent(tr("Could not load plugin {0}. Delete from preferences?", info.name));
+ dialog.setButtonIcons( new String[] {"dialogs/delete.png", "cancel.png"});
+ dialog.showDialog();
+ int result = dialog.getValue();
if(result == 1)
@@ -278,17 +281,26 @@
if (plugin != null) {
- int answer = new ExtendedDialog(Main.parent,
+ ExtendedDialog dialog = new ExtendedDialog(
+ Main.parent,
tr("Disable plugin"),
+ new String[] {tr("Disable plugin"), tr("Cancel")}
+ );
+ dialog.setButtonIcons(new String[] {"dialogs/delete.png", "cancel.png"});
+ dialog.setContent(
+ tr("") +
tr("An unexpected exception occurred that may have come from the ''{0}'' plugin.", plugin.info.name)
- + "\n"
+ + "
"
+ (plugin.info.author != null
? tr("According to the information within the plugin, the author is {0}.", plugin.info.author)
: "")
- + "\n"
+ + "
"
+ tr("Try updating to the newest version of this plugin before reporting a bug.")
- + "\n"
- + tr("Should the plugin be disabled?"),
- new String[] {tr("Disable plugin"), tr("Cancel")},
- new String[] {"dialogs/delete.png", "cancel.png"}).getValue();
+ + "
"
+ + tr("Should the plugin be disabled?")
+ + ""
+ );
+ dialog.showDialog();
+ int answer = dialog.getValue();
+
if (answer == 1) {
List plugins = new ArrayList(Main.pref.getCollection("plugins", Collections.emptyList()));