Changeset 15737 in josm for trunk/src/org


Ignore:
Timestamp:
2020-01-20T01:16:42+01:00 (5 years ago)
Author:
Don-vip
Message:

fix #18576 - fix PluginHandlerTest#testBuildListOfPluginsToLoad unit test

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r15686 r15737  
    8989     * Deprecated plugins that are removed on start
    9090     */
    91     static final Collection<DeprecatedPlugin> DEPRECATED_PLUGINS;
     91    static final List<DeprecatedPlugin> DEPRECATED_PLUGINS;
    9292    static {
    9393        String inCore = tr("integrated into main program");
    … …  
    160160            new DeprecatedPlugin("rapid", tr(replacedByPlugin, "MapWithAI"))
    161161        );
     162        Collections.sort(DEPRECATED_PLUGINS);
    162163    }
    163164
    … …  
    368369        // notify user about removed deprecated plugins
    369370        //
     371        JOptionPane.showMessageDialog(
     372                parent,
     373                getRemovedPluginsMessage(removedPlugins),
     374                tr("Warning"),
     375                JOptionPane.WARNING_MESSAGE
     376        );
     377    }
     378
     379    static String getRemovedPluginsMessage(Collection<DeprecatedPlugin> removedPlugins) {
    370380        StringBuilder sb = new StringBuilder(32);
    371381        sb.append("<html>")
    … …  
    383393        }
    384394        sb.append("</ul></html>");
    385         JOptionPane.showMessageDialog(
    386                 parent,
    387                 sb.toString(),
    388                 tr("Warning"),
    389                 JOptionPane.WARNING_MESSAGE
    390         );
     395        return sb.toString();
    391396    }
    392397
    … …  
    406411                continue;
    407412            }
    408             String msg = tr("<html>Loading of the plugin \"{0}\" was requested."
    409                     + "<br>This plugin is no longer developed and very likely will produce errors."
    410                     +"<br>It should be disabled.<br>Delete from preferences?</html>",
    411                     Utils.escapeReservedCharactersHTML(unmaintained));
    412             if (confirmDisablePlugin(parent, msg, unmaintained)) {
     413            if (confirmDisablePlugin(parent, getUnmaintainedPluginMessage(unmaintained), unmaintained)) {
    413414                PreferencesUtils.removeFromList(Config.getPref(), "plugins", unmaintained);
    414415                plugins.remove(unmaintained);
    415416            }
    416417        }
     418    }
     419
     420    static String getUnmaintainedPluginMessage(String unmaintained) {
     421        return tr("<html>Loading of the plugin \"{0}\" was requested."
     422                + "<br>This plugin is no longer developed and very likely will produce errors."
     423                +"<br>It should be disabled.<br>Delete from preferences?</html>",
     424                Utils.escapeReservedCharactersHTML(unmaintained));
    417425    }
    418426
Note: See TracChangeset for help on using the changeset viewer.