Changeset 17573 in josm

Timestamp:

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

Author:

simon04

Message:

see #20563 - Fix PluginHandler, PluginInformation

Regression of r17571.

Location:

trunk

Files:

• src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/PluginInformation.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.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();

trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java

@@ -154 +154 @@
     void testPluginInformationAction() throws PluginException {
         TestUtils.assumeWorkingJMockit();
-        final String expectedText = "Manifest-Version: 1.0\n" +
-                "Ant-Version: Apache Ant 1.9.6\n" +
+        final String expectedText = "Ant-Version: Apache Ant 1.9.6\n" +
+                "Author: Don-vip\n" +
                 "Created-By: 1.7.0_91-b02 (Oracle Corporation)\n" +
+                "Manifest-Version: 1.0\n" +
+                "Plugin-Canloadatruntime: true\n" +
+                "Plugin-Class: org.openstreetmap.josm.plugins.fr.epci.EpciPlugin\n" +
+                "Plugin-Date: 2015-11-19T08:21:07.645033Z\n" +
+                "Plugin-Description: Handling of French EPCIs (boundary=local_authority)\n" +
+                "Plugin-Early: true\n" +
+                "Plugin-Link: http://wiki.openstreetmap.org/wiki/FR:JOSM/Fr:Plugin/EPCI-fr\n" +
                 "Plugin-Mainversion: 7001\n" +
-                "Plugin-Version: 31772\n" +
-                "Plugin-Class: org.openstreetmap.josm.plugins.fr.epci.EpciPlugin\n" +
-                "Plugin-Description: Handling of French EPCIs (boundary=local_authority)\n" +
-                "Plugin-Date: 2015-11-19T08:21:07.645033Z\n" +
-                "Author: Don-vip\n" +
-                "Plugin-Link: http://wiki.openstreetmap.org/wiki/FR:JOSM/Fr:Plugin/EPCI-fr\n" +
-                "Plugin-Early: true\n" +
-                "Plugin-Canloadatruntime: true\n";
+                "Plugin-Version: 31772\n";
         final JOptionPaneSimpleMocker jopsMocker = new JOptionPaneSimpleMocker() {
             @Override