Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

Timestamp:

2014-04-26T17:39:23+02:00 (12 years ago)

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

File:

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

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

@@ -195 +195 @@
      * All installed and loaded plugins (resp. their main classes)
      */
-    public static final Collection<PluginProxy> pluginList = new LinkedList<PluginProxy>();
+    public static final Collection<PluginProxy> pluginList = new LinkedList<>();
 
     /**
      * Add here all ClassLoader whose resource should be searched.
      */
-    private static final List<ClassLoader> sources = new LinkedList<ClassLoader>();
+    private static final List<ClassLoader> sources = new LinkedList<>();
 
     static {
@@ -227 +227 @@
      */
     private static void filterDeprecatedPlugins(Component parent, Collection<String> plugins) {
-        Set<DeprecatedPlugin> removedPlugins = new TreeSet<DeprecatedPlugin>();
+        Set<DeprecatedPlugin> removedPlugins = new TreeSet<>();
         for (DeprecatedPlugin depr : DEPRECATED_PLUGINS) {
             if (plugins.contains(depr.name)) {
@@ -461 +461 @@
 
         // Add all plugins already loaded (to include early plugins when checking late ones)
-        Collection<PluginInformation> allPlugins = new HashSet<PluginInformation>(plugins);
+        Collection<PluginInformation> allPlugins = new HashSet<>(plugins);
         for (PluginProxy proxy : pluginList) {
             allPlugins.add(proxy.getPluginInformation());
@@ -487 +487 @@
         //
         if (requires != null) {
-            Set<String> pluginNames = new HashSet<String>();
+            Set<String> pluginNames = new HashSet<>();
             for (PluginInformation pi: plugins) {
                 pluginNames.add(pi.name);
             }
-            Set<String> missingPlugins = new HashSet<String>();
+            Set<String> missingPlugins = new HashSet<>();
             List<String> requiredPlugins = local ? plugin.getLocalRequiredPlugins() : plugin.getRequiredPlugins();
             for (String requiredPlugin : requiredPlugins) {
@@ -515 +515 @@
     public static ClassLoader createClassLoader(Collection<PluginInformation> plugins) {
         // iterate all plugins and collect all libraries of all plugins:
-        List<URL> allPluginLibraries = new LinkedList<URL>();
+        List<URL> allPluginLibraries = new LinkedList<>();
         File pluginDir = Main.pref.getPluginsDirectory();
 
         // Add all plugins already loaded (to include early plugins in the classloader, allowing late plugins to rely on early ones)
-        Collection<PluginInformation> allPlugins = new HashSet<PluginInformation>(plugins);
+        Collection<PluginInformation> allPlugins = new HashSet<>(plugins);
         for (PluginProxy proxy : pluginList) {
             allPlugins.add(proxy.getPluginInformation());
@@ -592 +592 @@
             monitor.beginTask(tr("Loading plugins ..."));
             monitor.subTask(tr("Checking plugin preconditions..."));
-            List<PluginInformation> toLoad = new LinkedList<PluginInformation>();
+            List<PluginInformation> toLoad = new LinkedList<>();
             for (PluginInformation pi: plugins) {
                 if (checkLoadPreconditions(parent, plugins, pi)) {
@@ -636 +636 @@
      */
     public static void loadEarlyPlugins(Component parent, Collection<PluginInformation> plugins, ProgressMonitor monitor) {
-        List<PluginInformation> earlyPlugins = new ArrayList<PluginInformation>(plugins.size());
+        List<PluginInformation> earlyPlugins = new ArrayList<>(plugins.size());
         for (PluginInformation pi: plugins) {
             if (pi.early) {
@@ -654 +654 @@
      */
     public static void loadLatePlugins(Component parent, Collection<PluginInformation> plugins, ProgressMonitor monitor) {
-        List<PluginInformation> latePlugins = new ArrayList<PluginInformation>(plugins.size());
+        List<PluginInformation> latePlugins = new ArrayList<>(plugins.size());
         for (PluginInformation pi: plugins) {
             if (!pi.early) {
@@ -688 +688 @@
                 return null;
             }
-            HashMap<String, PluginInformation> ret = new HashMap<String, PluginInformation>();
+            HashMap<String, PluginInformation> ret = new HashMap<>();
             for (PluginInformation pi: task.getAvailablePlugins()) {
                 ret.put(pi.name, pi);
@@ -733 +733 @@
         try {
             monitor.beginTask(tr("Determine plugins to load..."));
-            Set<String> plugins = new HashSet<String>();
+            Set<String> plugins = new HashSet<>();
             plugins.addAll(Main.pref.getCollection("plugins",  new LinkedList<String>()));
             if (System.getProperty("josm.plugins") != null) {
@@ -743 +743 @@
             filterUnmaintainedPlugins(parent, plugins);
             Map<String, PluginInformation> infos = loadLocallyAvailablePluginInformation(monitor.createSubTaskMonitor(1,false));
-            List<PluginInformation> ret = new LinkedList<PluginInformation>();
+            List<PluginInformation> ret = new LinkedList<>();
             for (Iterator<String> it = plugins.iterator(); it.hasNext();) {
                 String plugin = it.next();
@@ -791 +791 @@
     private static Set<PluginInformation> findRequiredPluginsToDownload(
             Collection<PluginInformation> pluginsToUpdate, List<PluginInformation> allPlugins, Set<PluginInformation> pluginsToDownload) {
-        Set<PluginInformation> result = new HashSet<PluginInformation>();
+        Set<PluginInformation> result = new HashSet<>();
         for (PluginInformation pi : pluginsToUpdate) {
             for (String name : pi.getRequiredPlugins()) {
@@ -880 +880 @@
             // filter plugins which actually have to be updated
             //
-            Collection<PluginInformation> pluginsToUpdate = new ArrayList<PluginInformation>();
+            Collection<PluginInformation> pluginsToUpdate = new ArrayList<>();
             for (PluginInformation pi: plugins) {
                 if (pi.isUpdateRequired()) {
@@ -889 +889 @@
             if (!pluginsToUpdate.isEmpty()) {
 
-                Set<PluginInformation> pluginsToDownload = new HashSet<PluginInformation>(pluginsToUpdate);
+                Set<PluginInformation> pluginsToDownload = new HashSet<>(pluginsToUpdate);
 
                 if (allPlugins != null) {
@@ -1150 +1150 @@
 
         try {
-            FutureTask<Integer> task = new FutureTask<Integer>(new Callable<Integer>() {
+            FutureTask<Integer> task = new FutureTask<>(new Callable<Integer>() {
                 @Override
                 public Integer call() {
@@ -1218 +1218 @@
             return null;
 
-        Set<String> plugins = new HashSet<String>(
+        Set<String> plugins = new HashSet<>(
                 Main.pref.getCollection("plugins",Collections.<String> emptySet())
         );
@@ -1260 +1260 @@
     public static String getBugReportText() {
         StringBuilder text = new StringBuilder();
-        LinkedList <String> pl = new LinkedList<String>(Main.pref.getCollection("plugins", new LinkedList<String>()));
+        LinkedList <String> pl = new LinkedList<>(Main.pref.getCollection("plugins", new LinkedList<String>()));
         for (final PluginProxy pp : pluginList) {
             PluginInformation pi = pp.getPluginInformation();