|
From: <man...@us...> - 2011-01-02 22:25:22
|
Revision: 6109
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6109&view=rev
Author: manningr
Date: 2011-01-02 22:25:16 +0000 (Sun, 02 Jan 2011)
Log Message:
-----------
Allow PluginResources implementation to be injected. Modifed test to support new plugin tests.
Modified Paths:
--------------
trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/ExportConfigPlugin.java
trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/action/ExportAliasesAction.java
trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/action/ExportConfigurationAction.java
trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/action/ExportDriversAction.java
trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/action/ExportSettingsAction.java
trunk/sql12/plugins/exportconfig/src/test/java/net/sourceforge/squirrel_sql/plugins/exportconfig/ExportConfigPluginTest.java
Modified: trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/ExportConfigPlugin.java
===================================================================
--- trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/ExportConfigPlugin.java 2011-01-02 22:24:18 UTC (rev 6108)
+++ trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/ExportConfigPlugin.java 2011-01-02 22:25:16 UTC (rev 6109)
@@ -24,19 +24,19 @@
import javax.swing.JMenu;
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.action.ActionCollection;
+import net.sourceforge.squirrel_sql.client.plugin.DefaultPlugin;
+import net.sourceforge.squirrel_sql.client.plugin.IPluginResourcesFactory;
+import net.sourceforge.squirrel_sql.client.plugin.PluginException;
+import net.sourceforge.squirrel_sql.client.plugin.PluginResourcesFactory;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
-import net.sourceforge.squirrel_sql.fw.util.StringManager;
-import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.fw.xml.XMLBeanReader;
import net.sourceforge.squirrel_sql.fw.xml.XMLBeanWriter;
-
-import net.sourceforge.squirrel_sql.client.IApplication;
-import net.sourceforge.squirrel_sql.client.action.ActionCollection;
-import net.sourceforge.squirrel_sql.client.plugin.DefaultPlugin;
-import net.sourceforge.squirrel_sql.client.plugin.PluginException;
-import net.sourceforge.squirrel_sql.client.plugin.PluginResources;
-
import net.sourceforge.squirrel_sql.plugins.exportconfig.action.ExportAliasesAction;
import net.sourceforge.squirrel_sql.plugins.exportconfig.action.ExportConfigurationAction;
import net.sourceforge.squirrel_sql.plugins.exportconfig.action.ExportDriversAction;
@@ -62,8 +62,22 @@
private File _userSettingsFolder;
/** Plugin resources. */
- private PluginResources _resources;
+ private IResources _resources;
+ private IPluginResourcesFactory _resourcesFactory = new PluginResourcesFactory();
+ /**
+ * @param resourcesFactory the resourcesFactory to set
+ */
+ public void setResourcesFactory(IPluginResourcesFactory resourcesFactory)
+ {
+ _resourcesFactory = resourcesFactory;
+ }
+
+ public interface IMenuResourceKeys
+ {
+ String EXPORT = "export";
+ }
+
/** Export menu. */
private JMenu _exportMenu;
@@ -139,7 +153,7 @@
throw new PluginException(ex);
}
- _resources = new ExportConfigResources(getClass().getName(), this);
+ _resources = _resourcesFactory.createResource(getClass().getName(), this);
}
/**
@@ -272,7 +286,7 @@
final IApplication app = getApplication();
final ActionCollection coll = app.getActionCollection();
- final JMenu exportMenu = _resources.createMenu(ExportConfigResources.IMenuResourceKeys.EXPORT);
+ final JMenu exportMenu = _resources.createMenu(IMenuResourceKeys.EXPORT);
_resources.addToMenu(coll.get(ExportConfigurationAction.class), exportMenu);
_resources.addToMenu(coll.get(ExportAliasesAction.class), exportMenu);
_resources.addToMenu(coll.get(ExportDriversAction.class), exportMenu);
Modified: trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/action/ExportAliasesAction.java
===================================================================
--- trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/action/ExportAliasesAction.java 2011-01-02 22:24:18 UTC (rev 6108)
+++ trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/action/ExportAliasesAction.java 2011-01-02 22:25:16 UTC (rev 6109)
@@ -19,14 +19,12 @@
*/
import java.awt.event.ActionEvent;
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.fw.util.BaseException;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-
-import net.sourceforge.squirrel_sql.client.IApplication;
-import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
-
import net.sourceforge.squirrel_sql.plugins.exportconfig.ExportConfigPlugin;
/**
* This <TT>Action</TT> will allow the user to export the database aliases to
@@ -49,7 +47,7 @@
* Ctor.
*
* @param app Application API.
- * @param rsrc Plugins resources.
+ * @param resources Plugins resources.
* @param plugin This plugin.
*
* @throws IllegalArgumentException
@@ -59,15 +57,15 @@
* @throws IllegalArgumentException
* Thrown if an invalid <TT>checktype</TT> passed.
*/
- public ExportAliasesAction(IApplication app, Resources rsrc,
+ public ExportAliasesAction(IApplication app, IResources resources,
ExportConfigPlugin plugin)
{
- super(app, rsrc);
+ super(app, resources);
if (app == null)
{
throw new IllegalArgumentException("IApplication == null");
}
- if (rsrc == null)
+ if (resources == null)
{
throw new IllegalArgumentException("Resources == null");
}
Modified: trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/action/ExportConfigurationAction.java
===================================================================
--- trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/action/ExportConfigurationAction.java 2011-01-02 22:24:18 UTC (rev 6108)
+++ trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/action/ExportConfigurationAction.java 2011-01-02 22:25:16 UTC (rev 6109)
@@ -21,7 +21,7 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
import net.sourceforge.squirrel_sql.plugins.exportconfig.ExportConfigPlugin;
/**
* This <TT>Action</TT> will allow the user to export configuration information
@@ -44,22 +44,22 @@
* Ctor.
*
* @param app Application API.
- * @param rsrc Plugins resources.
+ * @param resources Plugins resources.
* @param plugin This plugin.
*
* @throws IllegalArgumentException
* Thrown if a <TT>null</TT> <TT>IApplication</TT>,
* <TT>Resources</TT> or <TT>ExportConfigPlugin</TT> passed.
*/
- public ExportConfigurationAction(IApplication app, Resources rsrc,
+ public ExportConfigurationAction(IApplication app, IResources resources,
ExportConfigPlugin plugin)
{
- super(app, rsrc);
+ super(app, resources);
if (app == null)
{
throw new IllegalArgumentException("IApplication == null");
}
- if (rsrc == null)
+ if (resources == null)
{
throw new IllegalArgumentException("Resources == null");
}
Modified: trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/action/ExportDriversAction.java
===================================================================
--- trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/action/ExportDriversAction.java 2011-01-02 22:24:18 UTC (rev 6108)
+++ trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/action/ExportDriversAction.java 2011-01-02 22:25:16 UTC (rev 6109)
@@ -19,14 +19,12 @@
*/
import java.awt.event.ActionEvent;
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.fw.util.BaseException;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-
-import net.sourceforge.squirrel_sql.client.IApplication;
-import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
-
import net.sourceforge.squirrel_sql.plugins.exportconfig.ExportConfigPlugin;
/**
* This <TT>Action</TT> will allow the user to export the database drivers to
@@ -50,7 +48,7 @@
* Ctor.
*
* @param app Application API.
- * @param rsrc Plugins resources.
+ * @param resources Plugins resources.
* @param plugin This plugin.
*
* @throws IllegalArgumentException
@@ -60,15 +58,15 @@
* @throws IllegalArgumentException
* Thrown if an invalid <TT>checktype</TT> passed.
*/
- public ExportDriversAction(IApplication app, Resources rsrc,
+ public ExportDriversAction(IApplication app, IResources resources,
ExportConfigPlugin plugin)
{
- super(app, rsrc);
+ super(app, resources);
if (app == null)
{
throw new IllegalArgumentException("IApplication == null");
}
- if (rsrc == null)
+ if (resources == null)
{
throw new IllegalArgumentException("Resources == null");
}
Modified: trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/action/ExportSettingsAction.java
===================================================================
--- trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/action/ExportSettingsAction.java 2011-01-02 22:24:18 UTC (rev 6108)
+++ trunk/sql12/plugins/exportconfig/src/main/java/net/sourceforge/squirrel_sql/plugins/exportconfig/action/ExportSettingsAction.java 2011-01-02 22:25:16 UTC (rev 6109)
@@ -19,14 +19,12 @@
*/
import java.awt.event.ActionEvent;
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.fw.util.BaseException;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-
-import net.sourceforge.squirrel_sql.client.IApplication;
-import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
-
import net.sourceforge.squirrel_sql.plugins.exportconfig.ExportConfigPlugin;
/**
* This <TT>Action</TT> will allow the user to export the application settings to
@@ -49,7 +47,7 @@
* Ctor.
*
* @param app Application API.
- * @param rsrc Plugins resources.
+ * @param resources Plugins resources.
* @param plugin This plugin.
*
* @throws IllegalArgumentException
@@ -59,15 +57,15 @@
* @throws IllegalArgumentException
* Thrown if an invalid <TT>checktype</TT> passed.
*/
- public ExportSettingsAction(IApplication app, Resources rsrc,
+ public ExportSettingsAction(IApplication app, IResources resources,
ExportConfigPlugin plugin)
{
- super(app, rsrc);
+ super(app, resources);
if (app == null)
{
throw new IllegalArgumentException("IApplication == null");
}
- if (rsrc == null)
+ if (resources == null)
{
throw new IllegalArgumentException("Resources == null");
}
Modified: trunk/sql12/plugins/exportconfig/src/test/java/net/sourceforge/squirrel_sql/plugins/exportconfig/ExportConfigPluginTest.java
===================================================================
--- trunk/sql12/plugins/exportconfig/src/test/java/net/sourceforge/squirrel_sql/plugins/exportconfig/ExportConfigPluginTest.java 2011-01-02 22:24:18 UTC (rev 6108)
+++ trunk/sql12/plugins/exportconfig/src/test/java/net/sourceforge/squirrel_sql/plugins/exportconfig/ExportConfigPluginTest.java 2011-01-02 22:25:16 UTC (rev 6109)
@@ -20,23 +20,22 @@
import net.sourceforge.squirrel_sql.client.plugin.AbstractPluginTest;
import net.sourceforge.squirrel_sql.client.plugin.DatabaseProductVersionData;
+import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.mockito.runners.MockitoJUnitRunner;
+@RunWith(MockitoJUnitRunner.class)
public class ExportConfigPluginTest extends AbstractPluginTest implements DatabaseProductVersionData
-{
- @Before
- public void setUp() throws Exception
+{
+
+ @Override
+ protected IPlugin getPluginToTest() throws Exception
{
- classUnderTest = new ExportConfigPlugin();
- }
+ ExportConfigPlugin result = new ExportConfigPlugin();
+ result.setResourcesFactory(mockIPluginResourcesFactory);
+ return result;
+ }
- @After
- public void tearDown() throws Exception
- {
- classUnderTest = null;
- }
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
