|
From: <man...@us...> - 2011-01-02 22:35:13
|
Revision: 6127
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6127&view=rev
Author: manningr
Date: 2011-01-02 22:35:07 +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/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/SQLScriptPlugin.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptAction.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptOfCurrentSQLAction.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateSelectScriptAction.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableOfCurrentSQLAction.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableScriptAction.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTemplateDataScriptAction.java
trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/DropTableScriptAction.java
trunk/sql12/plugins/sqlscript/src/test/java/net/sourceforge/squirrel_sql/plugins/sqlscript/SQLScriptPluginTest.java
Modified: trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/SQLScriptPlugin.java
===================================================================
--- trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/SQLScriptPlugin.java 2011-01-02 22:34:35 UTC (rev 6126)
+++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/SQLScriptPlugin.java 2011-01-02 22:35:07 UTC (rev 6127)
@@ -25,14 +25,16 @@
import net.sourceforge.squirrel_sql.client.gui.session.ObjectTreeInternalFrame;
import net.sourceforge.squirrel_sql.client.gui.session.SQLInternalFrame;
import net.sourceforge.squirrel_sql.client.plugin.DefaultSessionPlugin;
+import net.sourceforge.squirrel_sql.client.plugin.IPluginResourcesFactory;
import net.sourceforge.squirrel_sql.client.plugin.PluginException;
-import net.sourceforge.squirrel_sql.client.plugin.PluginResources;
+import net.sourceforge.squirrel_sql.client.plugin.PluginResourcesFactory;
import net.sourceforge.squirrel_sql.client.plugin.PluginSessionCallback;
import net.sourceforge.squirrel_sql.client.preferences.IGlobalPreferencesPanel;
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
import net.sourceforge.squirrel_sql.plugins.sqlscript.prefs.SQLScriptPreferencesManager;
import net.sourceforge.squirrel_sql.plugins.sqlscript.prefs.SQLScriptPreferencesTab;
import net.sourceforge.squirrel_sql.plugins.sqlscript.table_script.CreateDataScriptAction;
@@ -55,9 +57,18 @@
String SCRIPTS = "scripts";
}
- private PluginResources _resources;
+ private IResources _resources;
+ private IPluginResourcesFactory _resourcesFactory = new PluginResourcesFactory();
/**
+ * @param resourcesFactory the resourcesFactory to set
+ */
+ public void setResourcesFactory(IPluginResourcesFactory resourcesFactory)
+ {
+ _resourcesFactory = resourcesFactory;
+ }
+
+ /**
* Return the internal name of this plugin.
*
* @return the internal name of this plugin.
@@ -158,7 +169,7 @@
super.initialize();
IApplication app = getApplication();
- _resources = new SQLPluginResources(BUNDLE_BASE_NAME, this);
+ _resources = _resourcesFactory.createResource(BUNDLE_BASE_NAME, this);
ActionCollection coll = app.getActionCollection();
coll.add(new CreateTableScriptAction(app, _resources, this));
Modified: trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptAction.java
===================================================================
--- trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptAction.java 2011-01-02 22:34:35 UTC (rev 6126)
+++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptAction.java 2011-01-02 22:35:07 UTC (rev 6127)
@@ -19,15 +19,13 @@
*/
import java.awt.event.ActionEvent;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
-import net.sourceforge.squirrel_sql.plugins.sqlscript.SQLScriptPlugin;
-
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
-import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
-import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
+import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.IObjectTreeAction;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
+import net.sourceforge.squirrel_sql.plugins.sqlscript.SQLScriptPlugin;
public class CreateDataScriptAction extends SquirrelAction implements IObjectTreeAction {
@@ -37,8 +35,8 @@
/** Current plugin. */
private final SQLScriptPlugin _plugin;
- public CreateDataScriptAction(IApplication app, Resources rsrc, SQLScriptPlugin plugin) {
- super(app, rsrc);
+ public CreateDataScriptAction(IApplication app, IResources resources, SQLScriptPlugin plugin) {
+ super(app, resources);
_plugin = plugin;
}
Modified: trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptOfCurrentSQLAction.java
===================================================================
--- trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptOfCurrentSQLAction.java 2011-01-02 22:34:35 UTC (rev 6126)
+++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateDataScriptOfCurrentSQLAction.java 2011-01-02 22:35:07 UTC (rev 6127)
@@ -24,7 +24,7 @@
import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
import net.sourceforge.squirrel_sql.plugins.sqlscript.SQLScriptPlugin;
public class CreateDataScriptOfCurrentSQLAction extends SquirrelAction implements ISQLPanelAction{
@@ -37,9 +37,9 @@
/** Current plugin. */
private final SQLScriptPlugin _plugin;
- public CreateDataScriptOfCurrentSQLAction(IApplication app, Resources rsrc,
+ public CreateDataScriptOfCurrentSQLAction(IApplication app, IResources resources,
SQLScriptPlugin plugin) {
- super(app, rsrc);
+ super(app, resources);
_plugin = plugin;
}
Modified: trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateSelectScriptAction.java
===================================================================
--- trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateSelectScriptAction.java 2011-01-02 22:34:35 UTC (rev 6126)
+++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateSelectScriptAction.java 2011-01-02 22:35:07 UTC (rev 6127)
@@ -1,15 +1,15 @@
package net.sourceforge.squirrel_sql.plugins.sqlscript.table_script;
+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.client.session.IObjectTreeAPI;
+import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.IObjectTreeAction;
-import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
-import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
import net.sourceforge.squirrel_sql.plugins.sqlscript.SQLScriptPlugin;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
-import java.awt.event.ActionEvent;
-
public class CreateSelectScriptAction extends SquirrelAction implements IObjectTreeAction
{
@@ -23,9 +23,9 @@
*/
private final SQLScriptPlugin _plugin;
- public CreateSelectScriptAction(IApplication app, Resources rsrc, SQLScriptPlugin plugin)
+ public CreateSelectScriptAction(IApplication app, IResources resources, SQLScriptPlugin plugin)
{
- super(app, rsrc);
+ super(app, resources);
_plugin = plugin;
}
Modified: trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableOfCurrentSQLAction.java
===================================================================
--- trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableOfCurrentSQLAction.java 2011-01-02 22:34:35 UTC (rev 6126)
+++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableOfCurrentSQLAction.java 2011-01-02 22:35:07 UTC (rev 6127)
@@ -21,15 +21,13 @@
import java.awt.event.ActionEvent;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
-import net.sourceforge.squirrel_sql.plugins.sqlscript.SQLScriptPlugin;
-
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
-import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.ISQLPanelAPI;
-import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
+import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.ISQLPanelAction;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
+import net.sourceforge.squirrel_sql.plugins.sqlscript.SQLScriptPlugin;
public class CreateTableOfCurrentSQLAction extends SquirrelAction implements ISQLPanelAction
{
@@ -44,10 +42,10 @@
*/
private final SQLScriptPlugin _plugin;
- public CreateTableOfCurrentSQLAction(IApplication app, Resources rsrc,
+ public CreateTableOfCurrentSQLAction(IApplication app, IResources resources,
SQLScriptPlugin plugin)
{
- super(app, rsrc);
+ super(app, resources);
_plugin = plugin;
}
Modified: trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableScriptAction.java
===================================================================
--- trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableScriptAction.java 2011-01-02 22:34:35 UTC (rev 6126)
+++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTableScriptAction.java 2011-01-02 22:35:07 UTC (rev 6127)
@@ -19,15 +19,13 @@
*/
import java.awt.event.ActionEvent;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
-import net.sourceforge.squirrel_sql.plugins.sqlscript.SQLScriptPlugin;
-
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
-import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
-import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
+import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.IObjectTreeAction;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
+import net.sourceforge.squirrel_sql.plugins.sqlscript.SQLScriptPlugin;
public class CreateTableScriptAction
extends SquirrelAction
@@ -39,9 +37,9 @@
/** Current plugin. */
private final SQLScriptPlugin _plugin;
- public CreateTableScriptAction(IApplication app, Resources rsrc,
+ public CreateTableScriptAction(IApplication app, IResources resources,
SQLScriptPlugin plugin) {
- super(app, rsrc);
+ super(app, resources);
_plugin = plugin;
}
Modified: trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTemplateDataScriptAction.java
===================================================================
--- trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTemplateDataScriptAction.java 2011-01-02 22:34:35 UTC (rev 6126)
+++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/CreateTemplateDataScriptAction.java 2011-01-02 22:35:07 UTC (rev 6127)
@@ -19,15 +19,13 @@
*/
import java.awt.event.ActionEvent;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
-import net.sourceforge.squirrel_sql.plugins.sqlscript.SQLScriptPlugin;
-
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
-import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
-import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
+import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.IObjectTreeAction;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
+import net.sourceforge.squirrel_sql.plugins.sqlscript.SQLScriptPlugin;
public class CreateTemplateDataScriptAction extends SquirrelAction implements IObjectTreeAction {
@@ -37,8 +35,8 @@
/** Current plugin. */
private final SQLScriptPlugin _plugin;
- public CreateTemplateDataScriptAction(IApplication app, Resources rsrc, SQLScriptPlugin plugin) {
- super(app, rsrc);
+ public CreateTemplateDataScriptAction(IApplication app, IResources resources, SQLScriptPlugin plugin) {
+ super(app, resources);
_plugin = plugin;
}
Modified: trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/DropTableScriptAction.java
===================================================================
--- trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/DropTableScriptAction.java 2011-01-02 22:34:35 UTC (rev 6126)
+++ trunk/sql12/plugins/sqlscript/src/main/java/net/sourceforge/squirrel_sql/plugins/sqlscript/table_script/DropTableScriptAction.java 2011-01-02 22:35:07 UTC (rev 6127)
@@ -24,7 +24,7 @@
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.IObjectTreeAction;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
import net.sourceforge.squirrel_sql.plugins.sqlscript.SQLScriptPlugin;
public class DropTableScriptAction extends SquirrelAction
@@ -36,9 +36,9 @@
/** Current plugin. */
private final SQLScriptPlugin _plugin;
- public DropTableScriptAction(IApplication app, Resources rsrc,
+ public DropTableScriptAction(IApplication app, IResources resources,
SQLScriptPlugin plugin) {
- super(app, rsrc);
+ super(app, resources);
_plugin = plugin;
}
Modified: trunk/sql12/plugins/sqlscript/src/test/java/net/sourceforge/squirrel_sql/plugins/sqlscript/SQLScriptPluginTest.java
===================================================================
--- trunk/sql12/plugins/sqlscript/src/test/java/net/sourceforge/squirrel_sql/plugins/sqlscript/SQLScriptPluginTest.java 2011-01-02 22:34:35 UTC (rev 6126)
+++ trunk/sql12/plugins/sqlscript/src/test/java/net/sourceforge/squirrel_sql/plugins/sqlscript/SQLScriptPluginTest.java 2011-01-02 22:35:07 UTC (rev 6127)
@@ -18,25 +18,20 @@
*/
package net.sourceforge.squirrel_sql.plugins.sqlscript;
-import net.sourceforge.squirrel_sql.client.plugin.AbstractPluginTest;
+import net.sourceforge.squirrel_sql.client.plugin.AbstractSessionPluginTest;
import net.sourceforge.squirrel_sql.client.plugin.DatabaseProductVersionData;
+import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
-import org.junit.After;
-import org.junit.Before;
+public class SQLScriptPluginTest extends AbstractSessionPluginTest implements DatabaseProductVersionData
+{
-public class SQLScriptPluginTest extends AbstractPluginTest implements DatabaseProductVersionData
-{
- @Before
- public void setUp() throws Exception
+ @Override
+ protected IPlugin getPluginToTest() throws Exception
{
- classUnderTest = new SQLScriptPlugin();
- }
+ SQLScriptPlugin result = new SQLScriptPlugin();
+ 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.
|
