Changeset 17573 in josm for trunk/src/org

Timestamp:

2021-03-16T23:16:53+01:00 (5 years ago)

Author:

simon04

Message:

see #20563 - Fix PluginHandler, PluginInformation

Regression of r17571.

Location:

trunk/src/org/openstreetmap/josm/plugins

Files:

• PluginHandler.java (modified) (2 diffs)
• PluginInformation.java (modified) (1 diff)

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

@@ -35 +35 @@
 import java.util.Objects;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -185 +186 @@
         public String getText() {
             StringBuilder b = new StringBuilder();
-            for (Entry<Object, Object> e : info.attr.entrySet()) {
+            Map<Object, Object> sorted = new TreeMap<>(Comparator.comparing(String::valueOf));
+            sorted.putAll(info.attr);
+            for (Entry<Object, Object> e : sorted.entrySet()) {
                 b.append(e.getKey());
                 b.append(": ");

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

@@ -150 +150 @@
      */
     public PluginInformation(InputStream manifestStream, String name, String url) throws PluginException {
+        this.name = name;
         try {
             Manifest manifest = new Manifest();