From 2d971079be8f0a95f63be390601c5cc74f70e951 Mon Sep 17 00:00:00 2001 From: Decebal Suiu Date: Wed, 20 Feb 2013 11:22:24 +0200 Subject: [PATCH] factory method pattern for PluginDescriptorFinder and ExtensionFinder --- .../fortsoft/pf4j/DefaultPluginManager.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java b/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java index 067264f..5befbc2 100644 --- a/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java +++ b/pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java @@ -85,7 +85,7 @@ public class DefaultPluginManager implements PluginManager { /** * A compound class loader of resolved plugins. */ - private CompoundClassLoader compoundClassLoader; + protected CompoundClassLoader compoundClassLoader; /** * Th plugins directory is supplied by System.getProperty("pf4j.pluginsDir", "plugins"). @@ -110,20 +110,21 @@ public class DefaultPluginManager implements PluginManager { resolvedPlugins = new ArrayList(); disabledPlugins = new ArrayList(); startedPlugins = new ArrayList(); - pluginDescriptorFinder = new DefaultPluginDescriptorFinder(); compoundClassLoader = new CompoundClassLoader(); - extensionFinder = new DefaultExtensionFinder(compoundClassLoader); + + pluginDescriptorFinder = createPluginDescriptorFinder(); + extensionFinder = createExtensionFinder(); System.setProperty("pf4j.pluginsDir", pluginsDirectory.getAbsolutePath()); } - public PluginDescriptorFinder getPluginDescriptorFinder() { - return pluginDescriptorFinder; - } + protected PluginDescriptorFinder createPluginDescriptorFinder() { + return new DefaultPluginDescriptorFinder(); + } - public void setPluginDescriptorFinder(PluginDescriptorFinder pluginDescriptorFinder) { - this.pluginDescriptorFinder = pluginDescriptorFinder; - } + protected ExtensionFinder createExtensionFinder() { + return new DefaultExtensionFinder(compoundClassLoader); + } @Override public List getPlugins() { @@ -349,5 +350,5 @@ public class DefaultPluginManager implements PluginManager { log.info("Plugin '" + pluginWrapper.getDescriptor().getPluginId() + "' resolved"); } } - + }