|
From: <man...@us...> - 2011-01-02 22:31:42
|
Revision: 6120
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6120&view=rev
Author: manningr
Date: 2011-01-02 22:31:35 +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/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPlugin.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/ObjectTypes.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AlterTableAction.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AnalyzeTableAction.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CheckTableAction.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CopyTableAction.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateDatabaseAction.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateMysqlTableScriptAction.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/DropDatabaseAction.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/ExplainSelectTableAction.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/ExplainTableAction.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/OptimizeTableAction.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/RenameTableAction.java
trunk/sql12/plugins/mysql/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPluginTest.java
trunk/sql12/plugins/mysql/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/expander/SessionExpanderTest.java
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPlugin.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPlugin.java 2011-01-02 22:30:46 UTC (rev 6119)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPlugin.java 2011-01-02 22:31:35 UTC (rev 6120)
@@ -23,9 +23,11 @@
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.ActionCollection;
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.PluginQueryTokenizerPreferencesManager;
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.plugin.PluginSessionCallbackAdaptor;
import net.sourceforge.squirrel_sql.client.plugin.gui.PluginGlobalPreferencesTab;
@@ -40,6 +42,7 @@
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.preferences.IQueryTokenizerPreferenceBean;
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
+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;
@@ -96,8 +99,29 @@
private final static ILogger s_log = LoggerController.createLogger(MysqlPlugin.class);
/** Plugin resources. */
- private MysqlResources _resources;
+ private IResources _resources;
+ private IPluginResourcesFactory _resourcesFactory = new PluginResourcesFactory();
+ /**
+ * @param resourcesFactory the resourcesFactory to set
+ */
+ public void setResourcesFactory(IPluginResourcesFactory resourcesFactory)
+ {
+ _resourcesFactory = resourcesFactory;
+ }
+
+ public static interface IMenuResourceKeys
+ {
+ String CHECK_TABLE = "checktable";
+ String MYSQL = "mysql";
+ }
+
+ public static interface IKeys
+ {
+ String USERS_IMAGE = "users";
+ }
+
+
/** API for the Obejct Tree. */
private IObjectTreeAPI _treeAPI;
@@ -177,7 +201,7 @@
public synchronized void load(IApplication app) throws PluginException
{
super.load(app);
- _resources = new MysqlResources(getClass().getName(), this);
+ _resources = _resourcesFactory.createResource(getClass().getName(), this);
_objectTypes = new ObjectTypes(_resources);
}
@@ -424,7 +448,7 @@
final IApplication app = getApplication();
final ActionCollection coll = app.getActionCollection();
- final JMenu mysqlMenu = _resources.createMenu(MysqlResources.IMenuResourceKeys.MYSQL);
+ final JMenu mysqlMenu = _resources.createMenu(IMenuResourceKeys.MYSQL);
_resources.addToMenu(coll.get(CreateMysqlTableScriptAction.class), mysqlMenu);
@@ -433,7 +457,7 @@
_resources.addToMenu(coll.get(ExplainSelectTableAction.class), mysqlMenu);
_resources.addToMenu(coll.get(OptimizeTableAction.class), mysqlMenu);
- final JMenu checkTableMenu = _resources.createMenu(MysqlResources.IMenuResourceKeys.CHECK_TABLE);
+ final JMenu checkTableMenu = _resources.createMenu(IMenuResourceKeys.CHECK_TABLE);
_resources.addToMenu(coll.get(CheckTableAction.ChangedCheckTableAction.class), checkTableMenu);
_resources.addToMenu(coll.get(CheckTableAction.ExtendedCheckTableAction.class), checkTableMenu);
_resources.addToMenu(coll.get(CheckTableAction.FastCheckTableAction.class), checkTableMenu);
@@ -458,7 +482,7 @@
final IApplication app = getApplication();
final ActionCollection coll = app.getActionCollection();
- final JMenu mysqlMenu = _resources.createMenu(MysqlResources.IMenuResourceKeys.MYSQL);
+ final JMenu mysqlMenu = _resources.createMenu(IMenuResourceKeys.MYSQL);
_resources.addToMenu(coll.get(CreateDatabaseAction.class), mysqlMenu);
// _resources.addToMenu(coll.get(DropDatabaseAction.class), mysqlMenu);
@@ -471,7 +495,7 @@
_resources.addToMenu(coll.get(ExplainSelectTableAction.class), mysqlMenu);
_resources.addToMenu(coll.get(OptimizeTableAction.class), mysqlMenu);
- final JMenu checkTableMenu = _resources.createMenu(MysqlResources.IMenuResourceKeys.CHECK_TABLE);
+ final JMenu checkTableMenu = _resources.createMenu(IMenuResourceKeys.CHECK_TABLE);
_resources.addToMenu(coll.get(CheckTableAction.ChangedCheckTableAction.class), checkTableMenu);
_resources.addToMenu(coll.get(CheckTableAction.ExtendedCheckTableAction.class), checkTableMenu);
_resources.addToMenu(coll.get(CheckTableAction.FastCheckTableAction.class), checkTableMenu);
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/ObjectTypes.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/ObjectTypes.java 2011-01-02 22:30:46 UTC (rev 6119)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/ObjectTypes.java 2011-01-02 22:31:35 UTC (rev 6120)
@@ -18,6 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
/**
* This class contains the different database object types for MySQL.
*
@@ -27,9 +28,9 @@
{
private DatabaseObjectType _userParent = DatabaseObjectType.createNewDatabaseObjectType("Users");
- public ObjectTypes(MysqlResources resources)
+ public ObjectTypes(IResources resources)
{
- _userParent = DatabaseObjectType.createNewDatabaseObjectType("Users", resources.getIcon(MysqlResources.IKeys.USERS_IMAGE));
+ _userParent = DatabaseObjectType.createNewDatabaseObjectType("Users", resources.getIcon(MysqlPlugin.IKeys.USERS_IMAGE));
}
public DatabaseObjectType getUserParent()
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AlterTableAction.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AlterTableAction.java 2011-01-02 22:30:46 UTC (rev 6119)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AlterTableAction.java 2011-01-02 22:31:35 UTC (rev 6120)
@@ -25,7 +25,7 @@
import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
-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.plugins.mysql.MysqlPlugin;
@@ -48,9 +48,9 @@
/** Current plugin. */
private final MysqlPlugin _plugin;
- public AlterTableAction(IApplication app, Resources rsrc, MysqlPlugin plugin)
+ public AlterTableAction(IApplication app, IResources resources, MysqlPlugin plugin)
{
- super(app, rsrc);
+ super(app, resources);
_plugin = plugin;
}
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AnalyzeTableAction.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AnalyzeTableAction.java 2011-01-02 22:30:46 UTC (rev 6119)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/AnalyzeTableAction.java 2011-01-02 22:31:35 UTC (rev 6120)
@@ -19,14 +19,12 @@
*/
import java.awt.event.ActionEvent;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
-
-import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
-
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.action.ISessionAction;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
+import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
/**
* This <TT>Action</TT> will run a "ANALYZE TABLE" over the
* currently selected tables.
@@ -45,7 +43,7 @@
* Ctor.
*
* @param app Application API.
- * @param rsrc Plugins resources.
+ * @param resources Plugins resources.
* @param plugin This plugin.
*
* @throws IllegalArgumentException
@@ -55,15 +53,15 @@
* @throws IllegalArgumentException
* Thrown if an invalid <TT>checktype</TT> passed.
*/
- public AnalyzeTableAction(IApplication app, Resources rsrc,
+ public AnalyzeTableAction(IApplication app, IResources resources,
MysqlPlugin 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/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CheckTableAction.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CheckTableAction.java 2011-01-02 22:30:46 UTC (rev 6119)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CheckTableAction.java 2011-01-02 22:31:35 UTC (rev 6120)
@@ -19,14 +19,13 @@
*/
import java.awt.event.ActionEvent;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
-
-import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
-
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.action.ISessionAction;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
+import net.sourceforge.squirrel_sql.fw.util.Resources;
+import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
/**
* This <TT>Action</TT> will run a "CHECK TABLE" over the
* currently selected tables.
@@ -59,7 +58,7 @@
* Ctor.
*
* @param app Application API.
- * @param rsrc Plugins resources.
+ * @param resources Plugins resources.
* @param plugin This plugin.
* @param checktype The type of table check to be done.
* @see ICheckTypes.
@@ -71,15 +70,15 @@
* @throws IllegalArgumentException
* Thrown if an invalid <TT>checktype</TT> passed.
*/
- private CheckTableAction(IApplication app, Resources rsrc,
+ private CheckTableAction(IApplication app, IResources resources,
MysqlPlugin plugin, int checkType)
{
- 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");
}
@@ -124,20 +123,20 @@
public static final class ChangedCheckTableAction extends CheckTableAction
{
private static final long serialVersionUID = 1L;
- public ChangedCheckTableAction(IApplication app, Resources rsrc,
+ public ChangedCheckTableAction(IApplication app, IResources resources,
MysqlPlugin plugin)
{
- super(app, rsrc, plugin, ICheckTypes.CHANGED);
+ super(app, resources, plugin, ICheckTypes.CHANGED);
}
}
public static final class ExtendedCheckTableAction extends CheckTableAction
{
private static final long serialVersionUID = 1L;
- public ExtendedCheckTableAction(IApplication app, Resources rsrc,
+ public ExtendedCheckTableAction(IApplication app, IResources resources,
MysqlPlugin plugin)
{
- super(app, rsrc, plugin, ICheckTypes.EXTENDED);
+ super(app, resources, plugin, ICheckTypes.EXTENDED);
}
}
@@ -145,30 +144,30 @@
{
private static final long serialVersionUID = 1L;
- public FastCheckTableAction(IApplication app, Resources rsrc,
+ public FastCheckTableAction(IApplication app, IResources resources,
MysqlPlugin plugin)
{
- super(app, rsrc, plugin, ICheckTypes.FAST);
+ super(app, resources, plugin, ICheckTypes.FAST);
}
}
public static final class MediumCheckTableAction extends CheckTableAction
{
private static final long serialVersionUID = 1L;
- public MediumCheckTableAction(IApplication app, Resources rsrc,
+ public MediumCheckTableAction(IApplication app, IResources resources,
MysqlPlugin plugin)
{
- super(app, rsrc, plugin, ICheckTypes.MEDIUM);
+ super(app, resources, plugin, ICheckTypes.MEDIUM);
}
}
public static final class QuickCheckTableAction extends CheckTableAction
{
private static final long serialVersionUID = 1L;
- public QuickCheckTableAction(IApplication app, Resources rsrc,
+ public QuickCheckTableAction(IApplication app, IResources resources,
MysqlPlugin plugin)
{
- super(app, rsrc, plugin, ICheckTypes.QUICK);
+ super(app, resources, plugin, ICheckTypes.QUICK);
}
}
}
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CopyTableAction.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CopyTableAction.java 2011-01-02 22:30:46 UTC (rev 6119)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CopyTableAction.java 2011-01-02 22:31:35 UTC (rev 6120)
@@ -18,13 +18,11 @@
*/
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.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
-
+import net.sourceforge.squirrel_sql.fw.util.IResources;
import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
/**
* CopyTableAction.java
@@ -41,9 +39,9 @@
/** Current plugin. */
private final MysqlPlugin _plugin;
- public CopyTableAction(IApplication app, Resources rsrc,MysqlPlugin plugin)
+ public CopyTableAction(IApplication app, IResources resources,MysqlPlugin plugin)
{
- super(app, rsrc);
+ super(app, resources);
_plugin = plugin;
}
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateDatabaseAction.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateDatabaseAction.java 2011-01-02 22:30:46 UTC (rev 6119)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateDatabaseAction.java 2011-01-02 22:31:35 UTC (rev 6120)
@@ -18,14 +18,12 @@
*/
import java.awt.event.ActionEvent;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
-
-import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
-
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.action.ISessionAction;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
+import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
/**
* CreateDatabaseAction.java
*
@@ -42,9 +40,9 @@
/** Current plugin. */
private final MysqlPlugin _plugin;
- public CreateDatabaseAction(IApplication app, Resources rsrc, MysqlPlugin plugin)
+ public CreateDatabaseAction(IApplication app, IResources resources, MysqlPlugin plugin)
{
- super(app, rsrc);
+ super(app, resources);
_plugin = plugin;
}
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateMysqlTableScriptAction.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateMysqlTableScriptAction.java 2011-01-02 22:30:46 UTC (rev 6119)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/CreateMysqlTableScriptAction.java 2011-01-02 22:31:35 UTC (rev 6120)
@@ -19,14 +19,12 @@
*/
import java.awt.event.ActionEvent;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
-
-import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
-
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.action.ISessionAction;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
+import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
public class CreateMysqlTableScriptAction extends SquirrelAction
implements ISessionAction
@@ -37,10 +35,10 @@
/** Current plugin. */
private final MysqlPlugin _plugin;
- public CreateMysqlTableScriptAction(IApplication app, Resources rsrc,
+ public CreateMysqlTableScriptAction(IApplication app, IResources resources,
MysqlPlugin plugin)
{
- super(app, rsrc);
+ super(app, resources);
_plugin = plugin;
}
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/DropDatabaseAction.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/DropDatabaseAction.java 2011-01-02 22:30:46 UTC (rev 6119)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/DropDatabaseAction.java 2011-01-02 22:31:35 UTC (rev 6120)
@@ -18,14 +18,6 @@
*/
import java.awt.event.ActionEvent;
-import net.sourceforge.squirrel_sql.fw.gui.Dialogs;
-import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
-import net.sourceforge.squirrel_sql.fw.util.StringManager;
-import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-
-import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
-
import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.action.SquirrelAction;
import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
@@ -33,6 +25,12 @@
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.action.ISessionAction;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode;
+import net.sourceforge.squirrel_sql.fw.gui.Dialogs;
+import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+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.plugins.mysql.MysqlPlugin;
/**
* DropDatabaseAction.java
*
@@ -61,9 +59,9 @@
/** Current plugin. */
private final MysqlPlugin _plugin;
- public DropDatabaseAction(IApplication app, Resources rsrc, MysqlPlugin plugin)
+ public DropDatabaseAction(IApplication app, IResources resources, MysqlPlugin plugin)
{
- super(app, rsrc);
+ super(app, resources);
_plugin = plugin;
}
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/ExplainSelectTableAction.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/ExplainSelectTableAction.java 2011-01-02 22:30:46 UTC (rev 6119)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/ExplainSelectTableAction.java 2011-01-02 22:31:35 UTC (rev 6120)
@@ -19,14 +19,12 @@
*/
import java.awt.event.ActionEvent;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
-
-import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
-
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.action.ISessionAction;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
+import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
/**
* This <TT>Action</TT> will run a "EXPLAIN SELECT * FROM TABLE" over the
* currently selected tables.
@@ -45,22 +43,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>MysqlPlugin</TT> passed.
*/
- public ExplainSelectTableAction(IApplication app, Resources rsrc,
+ public ExplainSelectTableAction(IApplication app, IResources resources,
MysqlPlugin 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/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/ExplainTableAction.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/ExplainTableAction.java 2011-01-02 22:30:46 UTC (rev 6119)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/ExplainTableAction.java 2011-01-02 22:31:35 UTC (rev 6120)
@@ -19,14 +19,12 @@
*/
import java.awt.event.ActionEvent;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
-
-import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
-
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.action.ISessionAction;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
+import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
/**
* This <TT>Action</TT> will run a "EXPLAIN TABLE" over the
* currently selected tables.
@@ -45,22 +43,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>MysqlPlugin</TT> passed.
*/
- public ExplainTableAction(IApplication app, Resources rsrc,
+ public ExplainTableAction(IApplication app, IResources resources,
MysqlPlugin 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/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/OptimizeTableAction.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/OptimizeTableAction.java 2011-01-02 22:30:46 UTC (rev 6119)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/OptimizeTableAction.java 2011-01-02 22:31:35 UTC (rev 6120)
@@ -19,14 +19,12 @@
*/
import java.awt.event.ActionEvent;
-import net.sourceforge.squirrel_sql.fw.util.Resources;
-
-import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
-
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.action.ISessionAction;
+import net.sourceforge.squirrel_sql.fw.util.IResources;
+import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
/**
* This <TT>Action</TT> will run a "CHECK TABLE" over the
* currently selected tables.
@@ -45,7 +43,7 @@
* Ctor.
*
* @param app Application API.
- * @param rsrc Plugins resources.
+ * @param resources Plugins resources.
* @param plugin This plugin.
*
* @throws IllegalArgumentException
@@ -55,15 +53,15 @@
* @throws IllegalArgumentException
* Thrown if an invalid <TT>checktype</TT> passed.
*/
- public OptimizeTableAction(IApplication app, Resources rsrc,
+ public OptimizeTableAction(IApplication app, IResources resources,
MysqlPlugin 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/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/RenameTableAction.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/RenameTableAction.java 2011-01-02 22:30:46 UTC (rev 6119)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/action/RenameTableAction.java 2011-01-02 22:31:35 UTC (rev 6120)
@@ -21,20 +21,18 @@
import javax.swing.JOptionPane;
+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.ISessionAction;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
-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.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
-
-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.ISessionAction;
-
import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
/**
* This <TT>Action</TT> will allow the user to rename the currently selected
@@ -59,9 +57,9 @@
/** Current plugin. */
private final MysqlPlugin _plugin;
- public RenameTableAction(IApplication app, Resources rsrc,MysqlPlugin plugin)
+ public RenameTableAction(IApplication app, IResources resources,MysqlPlugin plugin)
{
- super(app, rsrc);
+ super(app, resources);
_plugin = plugin;
}
Modified: trunk/sql12/plugins/mysql/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPluginTest.java
===================================================================
--- trunk/sql12/plugins/mysql/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPluginTest.java 2011-01-02 22:30:46 UTC (rev 6119)
+++ trunk/sql12/plugins/mysql/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPluginTest.java 2011-01-02 22:31:35 UTC (rev 6120)
@@ -20,29 +20,25 @@
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.when;
+
+import javax.swing.JMenu;
+
import net.sourceforge.squirrel_sql.client.plugin.AbstractSessionPluginTest;
+import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
+import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin.IMenuResourceKeys;
-import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
-
+@RunWith(MockitoJUnitRunner.class)
public class MysqlPluginTest extends AbstractSessionPluginTest
{
- @Before
- public void setUp() throws Exception
- {
- super.setUp();
- classUnderTest = new MysqlPlugin();
- }
-
- @After
- public void tearDown() throws Exception
- {
- classUnderTest = null;
- }
-
+ @Mock
+ private JMenu mockJMenu;
+
@Test
public void testIsPluginSessionMySQL5() throws Exception
{
@@ -86,6 +82,15 @@
{
return "5";
}
+
+ @Override
+ protected IPlugin getPluginToTest() throws Exception
+ {
+ when(mockIResources.createMenu(MysqlPlugin.IMenuResourceKeys.MYSQL)).thenReturn(mockJMenu);
+ MysqlPlugin result = new MysqlPlugin();
+ result.setResourcesFactory(mockIPluginResourcesFactory);
+ return result;
+ }
}
Modified: trunk/sql12/plugins/mysql/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/expander/SessionExpanderTest.java
===================================================================
--- trunk/sql12/plugins/mysql/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/expander/SessionExpanderTest.java 2011-01-02 22:30:46 UTC (rev 6119)
+++ trunk/sql12/plugins/mysql/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/expander/SessionExpanderTest.java 2011-01-02 22:31:35 UTC (rev 6120)
@@ -19,53 +19,31 @@
package net.sourceforge.squirrel_sql.plugins.mysql.expander;
-import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.AbstractINodeExpanderTest;
+import javax.swing.ImageIcon;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.AbstractINodeExpanderTest;
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
-import net.sourceforge.squirrel_sql.plugins.mysql.MysqlPlugin;
-import net.sourceforge.squirrel_sql.plugins.mysql.MysqlResources;
import net.sourceforge.squirrel_sql.plugins.mysql.ObjectTypes;
+
import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
-import javax.swing.*;
-
+@RunWith(MockitoJUnitRunner.class)
public class SessionExpanderTest extends AbstractINodeExpanderTest
{
+ @Mock
+ private ObjectTypes mockObjectTypes;
-
@Before
public void setUp() throws Exception
{
- classUnderTest = new SessionExpander(new ObjectTypesMock());
+ DatabaseObjectType testType = DatabaseObjectType.createNewDatabaseObjectType("USERS", new ImageIcon());
+ Mockito.when(mockObjectTypes.getUserParent()).thenReturn(testType);
+ classUnderTest = new SessionExpander(mockObjectTypes);
}
- private static class ObjectTypesMock extends ObjectTypes
- {
- private ObjectTypesMock()
- {
- super(new MysqlResourcesMock());
- }
- @Override
- public DatabaseObjectType getUserParent()
- {
- return DatabaseObjectType.createNewDatabaseObjectType("USERS", new ImageIcon());
- }
-
- }
-
- private static class MysqlResourcesMock extends MysqlResources
- {
- MysqlResourcesMock()
- {
- super(MysqlPlugin.class.getName(), new MysqlPlugin());
- }
-
- @Override
- public ImageIcon getIcon(String keyName)
- {
- return new ImageIcon();
- }
- }
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
