|
From: <man...@us...> - 2011-01-02 22:27:00
|
Revision: 6111
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6111&view=rev
Author: manningr
Date: 2011-01-02 22:26:54 +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/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/BaseFavouriteAction.java
trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/DeleteSavedQueriesFolderAction.java
trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/NewSavedQueriesFolderAction.java
trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/OrganizeSavedQueriesAction.java
trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/RenameSavedQueriesFolderAction.java
trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/SavedQueriesPlugin.java
trunk/sql12/plugins/favs/src/test/java/net/sourceforge/squirrel_sql/plugins/favs/SavedQueriesPluginTest.java
Modified: trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/BaseFavouriteAction.java
===================================================================
--- trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/BaseFavouriteAction.java 2011-01-02 22:26:29 UTC (rev 6110)
+++ trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/BaseFavouriteAction.java 2011-01-02 22:26:54 UTC (rev 6111)
@@ -21,14 +21,14 @@
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;
abstract class BaseFavouriteAction extends SquirrelAction {
private QueryTree _tree;
private TreePath _path;
- protected BaseFavouriteAction(IApplication app, Resources rsrc) {
- super(app, rsrc);
+ protected BaseFavouriteAction(IApplication app, IResources resources) {
+ super(app, resources);
}
//?? Split these 4 functions off into a subclass of BaseFavouriteAction
Modified: trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/DeleteSavedQueriesFolderAction.java
===================================================================
--- trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/DeleteSavedQueriesFolderAction.java 2011-01-02 22:26:29 UTC (rev 6110)
+++ trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/DeleteSavedQueriesFolderAction.java 2011-01-02 22:26:54 UTC (rev 6111)
@@ -18,10 +18,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
import java.awt.event.ActionEvent;
-
-import net.sourceforge.squirrel_sql.fw.util.Resources;
import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
/**
* This <CODE>Action</CODE> allows the user to delete a Folder.
@@ -32,8 +31,8 @@
/**
* Ctor.
*/
- public DeleteSavedQueriesFolderAction(IApplication app, Resources rsrc) {
- super(app, rsrc);
+ public DeleteSavedQueriesFolderAction(IApplication app, IResources resources) {
+ super(app, resources);
}
/**
Modified: trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/NewSavedQueriesFolderAction.java
===================================================================
--- trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/NewSavedQueriesFolderAction.java 2011-01-02 22:26:29 UTC (rev 6110)
+++ trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/NewSavedQueriesFolderAction.java 2011-01-02 22:26:54 UTC (rev 6111)
@@ -19,13 +19,12 @@
*/
import java.awt.event.ActionEvent;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
-
import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
class NewSavedQueriesFolderAction extends BaseFavouriteAction {
- public NewSavedQueriesFolderAction(IApplication app, Resources rsrc) {
- super(app, rsrc);
+ public NewSavedQueriesFolderAction(IApplication app, IResources resources) {
+ super(app, resources);
}
public void actionPerformed(ActionEvent evt) {
Modified: trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/OrganizeSavedQueriesAction.java
===================================================================
--- trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/OrganizeSavedQueriesAction.java 2011-01-02 22:26:29 UTC (rev 6110)
+++ trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/OrganizeSavedQueriesAction.java 2011-01-02 22:26:54 UTC (rev 6111)
@@ -18,18 +18,17 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
import java.awt.event.ActionEvent;
-
-import net.sourceforge.squirrel_sql.fw.util.Resources;
import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
public class OrganizeSavedQueriesAction extends BaseFavouriteAction {
private FoldersCache _cache;
- public OrganizeSavedQueriesAction(IApplication app, Resources rsrc,
+ public OrganizeSavedQueriesAction(IApplication app, IResources resources,
FoldersCache cache)
throws IllegalArgumentException {
- super(app, rsrc);
+ super(app, resources);
if (cache == null) {
throw new IllegalArgumentException("Null FoldersCache passed");
}
Modified: trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/RenameSavedQueriesFolderAction.java
===================================================================
--- trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/RenameSavedQueriesFolderAction.java 2011-01-02 22:26:29 UTC (rev 6110)
+++ trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/RenameSavedQueriesFolderAction.java 2011-01-02 22:26:54 UTC (rev 6111)
@@ -21,14 +21,13 @@
import javax.swing.tree.TreePath;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
-
import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
class RenameSavedQueriesFolderAction extends BaseFavouriteAction {
- public RenameSavedQueriesFolderAction(IApplication app, Resources rsrc) {
- super(app, rsrc);
+ public RenameSavedQueriesFolderAction(IApplication app, IResources resources) {
+ super(app, resources);
}
public void actionPerformed(ActionEvent evt) {
Modified: trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/SavedQueriesPlugin.java
===================================================================
--- trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/SavedQueriesPlugin.java 2011-01-02 22:26:29 UTC (rev 6110)
+++ trunk/sql12/plugins/favs/src/main/java/net/sourceforge/squirrel_sql/plugins/favs/SavedQueriesPlugin.java 2011-01-02 22:26:54 UTC (rev 6111)
@@ -24,11 +24,24 @@
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.IPlugin;
+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.fw.util.IResources;
public class SavedQueriesPlugin extends DefaultPlugin {
- private PluginResources _resources;
+ private IResources _resources;
+
+ private IPluginResourcesFactory _resourcesFactory = new PluginResourcesFactory();
+ /**
+ * @param resourcesFactory the resourcesFactory to set
+ */
+ public void setResourcesFactory(IPluginResourcesFactory resourcesFactory)
+ {
+ _resourcesFactory = resourcesFactory;
+ }
+
private FoldersCache _cache;
private interface IMenuResourceKeys {
@@ -107,7 +120,8 @@
}
_cache.load();
- _resources = new PluginResources("net.sourceforge.squirrel_sql.plugins.favs.saved_queries", this);
+ _resources =
+ _resourcesFactory.createResource("net.sourceforge.squirrel_sql.plugins.favs.saved_queries", this);
ActionCollection coll = app.getActionCollection();
Modified: trunk/sql12/plugins/favs/src/test/java/net/sourceforge/squirrel_sql/plugins/favs/SavedQueriesPluginTest.java
===================================================================
--- trunk/sql12/plugins/favs/src/test/java/net/sourceforge/squirrel_sql/plugins/favs/SavedQueriesPluginTest.java 2011-01-02 22:26:29 UTC (rev 6110)
+++ trunk/sql12/plugins/favs/src/test/java/net/sourceforge/squirrel_sql/plugins/favs/SavedQueriesPluginTest.java 2011-01-02 22:26:54 UTC (rev 6111)
@@ -20,23 +20,20 @@
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 SavedQueriesPluginTest extends AbstractPluginTest implements DatabaseProductVersionData
{
- @Before
- public void setUp() throws Exception
+ @Override
+ protected IPlugin getPluginToTest() throws Exception
{
- classUnderTest = new SavedQueriesPlugin();
- }
-
- @After
- public void tearDown() throws Exception
- {
- classUnderTest = null;
+ SavedQueriesPlugin result = new SavedQueriesPlugin();
+ result.setResourcesFactory(mockIPluginResourcesFactory);
+ return result;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
