Changeset 9870 in josm for trunk/src/org

Timestamp:

2016-02-24T02:08:53+01:00 (9 years ago)

Author:

Don-vip

Message:

PluginHandler: deprecate kendzi3d-jogl plugin, remove unused code, fix findbugs warning, add unit tests

File:

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

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

@@ -130 +130 @@
             new DeprecatedPlugin("missingRoads", tr("replaced by new {0} plugin", "ImproveOsm")),
             new DeprecatedPlugin("trafficFlowDirection", tr("replaced by new {0} plugin", "ImproveOsm")),
+            new DeprecatedPlugin("kendzi3d-jogl", tr("replaced by new {0} plugin", "jogl")),
         });
     }
@@ -145 +146 @@
         /** Short explanation about deprecation, can be {@code null} */
         public final String reason;
-        /** Code to run to perform migration, can be {@code null} */
-        private final Runnable migration;
-
-        /**
-         * Constructs a new {@code DeprecatedPlugin}.
-         * @param name The plugin name
-         */
-        public DeprecatedPlugin(String name) {
-            this(name, null, null);
-        }
 
         /**
@@ -162 +153 @@
          */
         public DeprecatedPlugin(String name, String reason) {
-            this(name, reason, null);
-        }
-
-        /**
-         * Constructs a new {@code DeprecatedPlugin}.
-         * @param name The plugin name
-         * @param reason The reason about deprecation
-         * @param migration The code to run to perform migration
-         */
-        public DeprecatedPlugin(String name, String reason, Runnable migration) {
             this.name = name;
             this.reason = reason;
-            this.migration = migration;
-        }
-
-        /**
-         * Performs migration.
-         */
-        public void migrate() {
-            if (migration != null) {
-                migration.run();
-            }
+        }
+
+        @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = prime + ((name == null) ? 0 : name.hashCode());
+            return prime * result + ((reason == null) ? 0 : reason.hashCode());
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (this == obj)
+                return true;
+            if (obj == null)
+                return false;
+            if (getClass() != obj.getClass())
+                return false;
+            DeprecatedPlugin other = (DeprecatedPlugin) obj;
+            if (name == null) {
+                if (other.name != null)
+                    return false;
+            } else if (!name.equals(other.name))
+                return false;
+            if (reason == null) {
+                if (other.reason != null)
+                    return false;
+            } else if (!reason.equals(other.reason))
+                return false;
+            return true;
         }
 
         @Override
         public int compareTo(DeprecatedPlugin o) {
-            return name.compareTo(o.name);
+            int d = name.compareTo(o.name);
+            if (d == 0)
+                d = reason.compareTo(o.reason);
+            return d;
         }
     }
@@ -217 +220 @@
      * List of unmaintained plugins. Not really up-to-date as the vast majority of plugins are not maintained after a few months, sadly...
      */
-    private static final String[] UNMAINTAINED_PLUGINS = new String[] {
+    static final String[] UNMAINTAINED_PLUGINS = new String[] {
         "gpsbabelgui",
         "Intersect_way",
@@ -282 +285 @@
                 Main.pref.removeFromCollection("plugins", depr.name);
                 removedPlugins.add(depr);
-                depr.migrate();
             }
         }
@@ -661 +663 @@
         if (pluginClassLoader == null) {
             pluginClassLoader = AccessController.doPrivileged(new PrivilegedAction<DynamicURLClassLoader>() {
+                @Override
                 public DynamicURLClassLoader run() {
                     return new DynamicURLClassLoader(new URL[0], Main.class.getClassLoader());
@@ -853 +856 @@
                 plugins.size()))
           .append("</html>");
-        HelpAwareOptionPane.showOptionDialog(
-                parent,
-                sb.toString(),
-                tr("Warning"),
-                JOptionPane.WARNING_MESSAGE,
-                HelpUtil.ht("/Plugin/Loading#MissingPluginInfos")
-        );
+        if (!GraphicsEnvironment.isHeadless()) {
+            HelpAwareOptionPane.showOptionDialog(
+                    parent,
+                    sb.toString(),
+                    tr("Warning"),
+                    JOptionPane.WARNING_MESSAGE,
+                    HelpUtil.ht("/Plugin/Loading#MissingPluginInfos")
+            );
+        }
     }
 
@@ -878 +883 @@
             monitor.beginTask(tr("Determine plugins to load..."));
             Set<String> plugins = new HashSet<>();
-            plugins.addAll(Main.pref.getCollection("plugins",  new LinkedList<String>()));
+            plugins.addAll(Main.pref.getCollection("plugins", new LinkedList<String>()));
             if (System.getProperty("josm.plugins") != null) {
                 plugins.addAll(Arrays.asList(System.getProperty("josm.plugins").split(",")));