Changeset 15374 in josm for trunk

Timestamp:

2019-09-25T18:03:50+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17505 - sort plugins by name in about panel, and display loaded version

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) (2 diffs)

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

@@ -309 +309 @@
 
     /**
-     * Returns the list of currently installed and loaded plugins.
-     * @return the list of currently installed and loaded plugins
+     * Returns the list of currently installed and loaded plugins, sorted by name.
+     * @return the list of currently installed and loaded plugins, sorted by name
      * @since 10982
      */
     public static List<PluginInformation> getPlugins() {
-        return pluginList.stream().map(PluginProxy::getPluginInformation).collect(Collectors.toList());
+        return pluginList.stream().map(PluginProxy::getPluginInformation)
+                .sorted(Comparator.comparing(PluginInformation::getName)).collect(Collectors.toList());
     }
 
@@ -1562 +1563 @@
     public static JPanel getInfoPanel() {
         JPanel pluginTab = new JPanel(new GridBagLayout());
-        for (final PluginProxy p : pluginList) {
-            final PluginInformation info = p.getPluginInformation();
+        for (final PluginInformation info : getPlugins()) {
             String name = info.name
-            + (info.version != null && !info.version.isEmpty() ? " Version: " + info.version : "");
+            + (info.localversion != null && !info.localversion.isEmpty() ? " Version: " + info.localversion : "");
             pluginTab.add(new JLabel(name), GBC.std());
             pluginTab.add(Box.createHorizontalGlue(), GBC.std().fill(GBC.HORIZONTAL));