Ignore:
Timestamp:
2009-09-06T23:07:33+02:00 (15 years ago)
Author:
Gubaer
Message:

new: rewrite of CombineWay action
new: conflict resolution dialog for CombineWay, including conflicts for different relation memberships
cleanup: cleanup in OsmReader, reduces memory footprint and reduces parsing time
cleanup: made most of the public fields in OsmPrimitive @deprecated, added accessors and changed the code
cleanup: replaced usages of @deprecated constructors for ExtendedDialog
fixed #3208: Combine ways brokes relation order

WARNING: this changeset touches a lot of code all over the code base. "latest" might become slightly unstable in the next days. Also experience incompatibility issues with plugins in the next few days.

Location:
trunk/src/org/openstreetmap/josm/plugins
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r2017 r2070  
    122122        if(pd.mainversion > AboutAction.getVersionNumber())
    123123        {
    124             int answer = new ExtendedDialog(Main.parent,
     124            ExtendedDialog dialog = new ExtendedDialog(
     125                    Main.parent,
    125126                    tr("Skip download"),
    126                     tr("JOSM version {0} required for plugin {1}.", pd.mainversion, pd.name),
    127                     new String[] {tr("Download Plugin"), tr("Skip Download")},
    128                     new String[] {"download.png", "cancel.png"}).getValue();
     127                    new String[] {tr("Download Plugin"), tr("Skip Download")}
     128            );
     129            dialog.setContent(tr("JOSM version {0} required for plugin {1}.", pd.mainversion, pd.name));
     130            dialog.setButtonIcons(new String[] {"download.png", "cancel.png"});
     131            dialog.showDialog();
     132            int answer = dialog.getValue();
    129133            if (answer != 1)
    130134                return false;

  • trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

    r2017 r2070  
    171171                } catch (Throwable e) {
    172172                    e.printStackTrace();
    173 
    174                     int result = new ExtendedDialog(Main.parent,
     173                    ExtendedDialog dialog = new ExtendedDialog(
     174                            Main.parent,
    175175                            tr("Disable plugin"),
    176                             tr("Could not load plugin {0}. Delete from preferences?", info.name),
    177                             new String[] {tr("Disable plugin"), tr("Keep plugin")},
    178                             new String[] {"dialogs/delete.png", "cancel.png"}).getValue();
     176                            new String[] {tr("Disable plugin"), tr("Keep plugin")}
     177                    );
     178                    dialog.setContent(tr("Could not load plugin {0}. Delete from preferences?", info.name));
     179                    dialog.setButtonIcons( new String[] {"dialogs/delete.png", "cancel.png"});
     180                    dialog.showDialog();
     181                    int result = dialog.getValue();
    179182
    180183                    if(result == 1)
    … …  
    278281
    279282        if (plugin != null) {
    280             int answer = new ExtendedDialog(Main.parent,
     283            ExtendedDialog dialog = new ExtendedDialog(
     284                    Main.parent,
    281285                    tr("Disable plugin"),
     286                    new String[] {tr("Disable plugin"), tr("Cancel")}
     287            );
     288            dialog.setButtonIcons(new String[] {"dialogs/delete.png", "cancel.png"});
     289            dialog.setContent(
     290                    tr("<html>") +
    282291                    tr("An unexpected exception occurred that may have come from the ''{0}'' plugin.", plugin.info.name)
    283                     + "\n"
     292                    + "<br>"
    284293                    + (plugin.info.author != null
    285294                            ? tr("According to the information within the plugin, the author is {0}.", plugin.info.author)
    286295                                    : "")
    287                                     + "\n"
     296                                    + "<br>"
    288297                                    + tr("Try updating to the newest version of this plugin before reporting a bug.")
    289                                     + "\n"
    290                                     + tr("Should the plugin be disabled?"),
    291                                     new String[] {tr("Disable plugin"), tr("Cancel")},
    292                                     new String[] {"dialogs/delete.png", "cancel.png"}).getValue();
     298                                    + "<br>"
     299                                    + tr("Should the plugin be disabled?")
     300                                    + "</html>"
     301            );
     302            dialog.showDialog();
     303            int answer = dialog.getValue();
     304
    293305            if (answer == 1) {
    294306                List<String> plugins = new ArrayList<String>(Main.pref.getCollection("plugins", Collections.<String>emptyList()));
Note: See TracChangeset for help on using the changeset viewer.