Simplify changes per review

diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java b/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java
index 1e33d2f24c9b58a29a3f67d3517928eb419b9902..7254206b2bd59164a3b81805aba36a1f35d2884c 100644 (file)
--- a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java
+++ b/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java
@@ -16,7 +16,6 @@ import java.io.File;
 import java.io.FileFilter;\r
 import java.io.IOException;\r
 import java.util.ArrayList;\r
-import java.util.Arrays;\r
 import java.util.Collections;\r
 import java.util.HashMap;\r
 import java.util.Iterator;\r
@@ -273,18 +272,17 @@ public class DefaultPluginManager implements PluginManager {
         filterList.add(new NotFileFilter(createHiddenPluginFilter()));\r
         FileFilter pluginsFilter = new AndFileFilter(filterList);\r
         File[] directories = pluginsDirectory.listFiles(pluginsFilter);\r
-        List<File> dirArray = new ArrayList<File>();\r
-        if (directories != null) {\r
-               dirArray.addAll(Arrays.asList(directories));\r
+        if (directories == null) {\r
+               directories = new File[0];\r
         }\r
-        log.debug("Found possible {} plugins: {}", dirArray.size(), dirArray);\r
-        if (dirArray.size() == 0) {\r
+        log.debug("Found possible {} plugins: {}", directories.length, directories);\r
+        if (directories.length == 0) {\r
                log.info("No plugins");\r
                return;\r
         }\r
 \r
         // load any plugin from plugins directory\r
-               for (File directory : dirArray) {\r
+               for (File directory : directories) {\r
                        try {\r
                                loadPlugin(directory);\r
                        } catch (PluginException e) {\r
@@ -348,12 +346,12 @@ public class DefaultPluginManager implements PluginManager {
                PluginState state = stopPlugin(pluginId);\r
 \r
                if (PluginState.STOPPED != state) {\r
-                       log.error(String.format("Failed to stop plugin %s on delete", pluginId));\r
+                       log.error("Failed to stop plugin {} on delete", pluginId);\r
                        return false;\r
                }\r
 \r
                if (!unloadPlugin(pluginId)) {\r
-                       log.error(String.format("Failed to unload plugin %s on delete", pluginId));\r
+                       log.error("Failed to unload plugin {} on delete", pluginId);\r
                        return false;\r
                }\r
 \r