|
From: <ger...@us...> - 2010-12-22 05:14:01
|
Revision: 6042
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6042&view=rev
Author: gerdwagner
Date: 2010-12-22 05:13:54 +0000 (Wed, 22 Dec 2010)
Log Message:
-----------
Object tree Icons for Oracle and MySQL
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/MysqlResources.java
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/expander/SessionExpander.java
trunk/sql12/plugins/mysql/src/main/resources/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPlugin.properties
trunk/sql12/plugins/mysql/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/expander/SessionExpanderTest.java
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePluginResources.java
trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/OracleResourcesTest.java
trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/InstanceParentExpanderTest.java
trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/PackageParentExpanderTest.java
trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SchemaExpanderTest.java
trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SessionParentExpanderTest.java
trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpanderTest.java
Added Paths:
-----------
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/ObjectTypes.java
trunk/sql12/plugins/mysql/src/main/resources/net/sourceforge/squirrel_sql/plugins/mysql/images/
trunk/sql12/plugins/mysql/src/main/resources/net/sourceforge/squirrel_sql/plugins/mysql/images/users.png
trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ObjectTypesMock.java
Removed Paths:
-------------
trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/IObjectTypes.java
Deleted: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/IObjectTypes.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/IObjectTypes.java 2010-12-21 20:19:38 UTC (rev 6041)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/IObjectTypes.java 2010-12-22 05:13:54 UTC (rev 6042)
@@ -1,29 +0,0 @@
-package net.sourceforge.squirrel_sql.plugins.mysql;
-/*
- * Copyright (C) 2003 Colin Bell
- * co...@us...
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
-/**
- * This class contains the different database object types for MySQL.
- *
- * @author <A HREF="mailto:co...@us...">Colin Bell</A>
- */
-public interface IObjectTypes
-{
- DatabaseObjectType USER_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Users");
-}
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 2010-12-21 20:19:38 UTC (rev 6041)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPlugin.java 2010-12-22 05:13:54 UTC (rev 6042)
@@ -96,7 +96,7 @@
private final static ILogger s_log = LoggerController.createLogger(MysqlPlugin.class);
/** Plugin resources. */
- private PluginResources _resources;
+ private MysqlResources _resources;
/** API for the Obejct Tree. */
private IObjectTreeAPI _treeAPI;
@@ -106,8 +106,9 @@
/** manages our query tokenizing preferences */
private PluginQueryTokenizerPreferencesManager _prefsManager = null;
+ private ObjectTypes _objectTypes;
- interface i18n
+ interface i18n
{
// i18n[MysqlPlugin.title=MySQL]
String title = s_stringMgr.getString("MysqlPlugin.title");
@@ -177,7 +178,8 @@
{
super.load(app);
_resources = new MysqlResources(getClass().getName(), this);
- }
+ _objectTypes = new ObjectTypes(_resources);
+ }
/**
* @see net.sourceforge.squirrel_sql.client.plugin.DefaultPlugin#getChangeLogFileName()
@@ -350,8 +352,8 @@
final ActionCollection coll = getApplication().getActionCollection();
// Show users in the object tee.
- _treeAPI.addExpander(DatabaseObjectType.SESSION, new SessionExpander());
- _treeAPI.addExpander(IObjectTypes.USER_PARENT, new UserParentExpander(this));
+ _treeAPI.addExpander(DatabaseObjectType.SESSION, new SessionExpander(_objectTypes));
+ _treeAPI.addExpander(_objectTypes.getUserParent(), new UserParentExpander(this));
// Tabs to add to the database node.
_treeAPI.addDetailTab(DatabaseObjectType.SESSION, new DatabaseStatusTab());
@@ -383,6 +385,8 @@
_treeAPI.addToPopup(DatabaseObjectType.TABLE, createMysqlTableMenu());
updateTreeApiForMysql5(session);
+
+ _treeAPI.refreshTree();
}
private void updateTreeApiForMysql5(ISession session)
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/MysqlResources.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/MysqlResources.java 2010-12-21 20:19:38 UTC (rev 6041)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/MysqlResources.java 2010-12-22 05:13:54 UTC (rev 6042)
@@ -24,7 +24,7 @@
*
* @author <A HREF="mailto:co...@us...">Colin Bell</A>
*/
-final class MysqlResources extends PluginResources
+public class MysqlResources extends PluginResources
{
interface IMenuResourceKeys
{
@@ -32,8 +32,14 @@
String MYSQL = "mysql";
}
- MysqlResources(String rsrcBundleBaseName, IPlugin plugin)
+ public MysqlResources(String rsrcBundleBaseName, IPlugin plugin)
{
super(rsrcBundleBaseName, plugin);
}
+
+ public interface IKeys
+ {
+ String USERS_IMAGE = "users";
+ }
+
}
Copied: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/ObjectTypes.java (from rev 6037, trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/IObjectTypes.java)
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/ObjectTypes.java (rev 0)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/ObjectTypes.java 2010-12-22 05:13:54 UTC (rev 6042)
@@ -0,0 +1,39 @@
+package net.sourceforge.squirrel_sql.plugins.mysql;
+/*
+ * Copyright (C) 2003 Colin Bell
+ * co...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
+/**
+ * This class contains the different database object types for MySQL.
+ *
+ * @author <A HREF="mailto:co...@us...">Colin Bell</A>
+ */
+public class ObjectTypes
+{
+ private DatabaseObjectType _userParent = DatabaseObjectType.createNewDatabaseObjectType("Users");
+
+ public ObjectTypes(MysqlResources resources)
+ {
+ _userParent = DatabaseObjectType.createNewDatabaseObjectType("Users", resources.getIcon(MysqlResources.IKeys.USERS_IMAGE));
+ }
+
+ public DatabaseObjectType getUserParent()
+ {
+ return _userParent;
+ }
+}
Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/expander/SessionExpander.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/expander/SessionExpander.java 2010-12-21 20:19:38 UTC (rev 6041)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/expander/SessionExpander.java 2010-12-22 05:13:54 UTC (rev 6042)
@@ -26,7 +26,8 @@
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode;
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
-import net.sourceforge.squirrel_sql.plugins.mysql.IObjectTypes;
+import net.sourceforge.squirrel_sql.plugins.mysql.ObjectTypes;
+
/**
* This class add new child nodes to the Database node.
*
@@ -34,11 +35,20 @@
*/
public class SessionExpander implements INodeExpander
{
- /** Logger for this class. */
+ private ObjectTypes _objectTypes;
+
+ /** Logger for this class.
+ * @param objectTypes*/
// private static ILogger s_log =
// LoggerController.createLogger(SessionExpander.class);
- /**
+
+ public SessionExpander(ObjectTypes objectTypes)
+ {
+ _objectTypes = objectTypes;
+ }
+
+ /**
* Create the child nodes for the passed parent node and return them. Note
* that this method should <B>not</B> actually add the child nodes to the
* parent node as this is taken care of in the caller.
@@ -57,7 +67,7 @@
// Users.
DatabaseObjectInfo dboInfo = new DatabaseObjectInfo(null, null, "USERS",
- IObjectTypes.USER_PARENT, md);
+ _objectTypes.getUserParent(), md);
ObjectTreeNode node = new ObjectTreeNode(session, dboInfo);
childNodes.add(node);
Modified: trunk/sql12/plugins/mysql/src/main/resources/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPlugin.properties
===================================================================
--- trunk/sql12/plugins/mysql/src/main/resources/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPlugin.properties 2010-12-21 20:19:38 UTC (rev 6041)
+++ trunk/sql12/plugins/mysql/src/main/resources/net/sourceforge/squirrel_sql/plugins/mysql/MysqlPlugin.properties 2010-12-22 05:13:54 UTC (rev 6042)
@@ -9,6 +9,12 @@
########
+# Images.
+########
+users.image=users.png
+
+
+########
# Configuration information for Actions.
########
Copied: trunk/sql12/plugins/mysql/src/main/resources/net/sourceforge/squirrel_sql/plugins/mysql/images/users.png (from rev 6041, trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/users.png)
===================================================================
(Binary files differ)
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 2010-12-21 20:19:38 UTC (rev 6041)
+++ trunk/sql12/plugins/mysql/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/expander/SessionExpanderTest.java 2010-12-22 05:13:54 UTC (rev 6042)
@@ -21,15 +21,51 @@
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 javax.swing.*;
+
public class SessionExpanderTest extends AbstractINodeExpanderTest
{
+
@Before
public void setUp() throws Exception
{
- classUnderTest = new SessionExpander();
+ classUnderTest = new SessionExpander(new ObjectTypesMock());
}
+ 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();
+ }
+ }
+
}
Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePluginResources.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePluginResources.java 2010-12-21 20:19:38 UTC (rev 6041)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePluginResources.java 2010-12-22 05:13:54 UTC (rev 6042)
@@ -20,9 +20,9 @@
import net.sourceforge.squirrel_sql.client.plugin.IPlugin;
import net.sourceforge.squirrel_sql.client.plugin.PluginResources;
-public final class OraclePluginResources extends PluginResources
+public class OraclePluginResources extends PluginResources
{
- OraclePluginResources(String rsrcBundleBaseName, IPlugin plugin)
+ public OraclePluginResources(String rsrcBundleBaseName, IPlugin plugin)
{
super(rsrcBundleBaseName, plugin);
}
Modified: trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/OracleResourcesTest.java
===================================================================
--- trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/OracleResourcesTest.java 2010-12-21 20:19:38 UTC (rev 6041)
+++ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/OracleResourcesTest.java 2010-12-22 05:13:54 UTC (rev 6042)
@@ -30,7 +30,7 @@
@Before
public void setUp() throws Exception
{
- classUnderTest = new OracleResources(OraclePlugin.BUNDLE_BASE_NAME, getMockPlugin(mockHelper));
+ classUnderTest = new OraclePluginResources(OraclePlugin.BUNDLE_BASE_NAME, getMockPlugin(mockHelper));
}
}
Modified: trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/InstanceParentExpanderTest.java
===================================================================
--- trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/InstanceParentExpanderTest.java 2010-12-21 20:19:38 UTC (rev 6041)
+++ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/InstanceParentExpanderTest.java 2010-12-22 05:13:54 UTC (rev 6042)
@@ -29,7 +29,7 @@
@Before
public void setUp() throws Exception
{
- classUnderTest = new InstanceParentExpander();
+ classUnderTest = new InstanceParentExpander(new ObjectTypesMock());
}
}
Added: trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ObjectTypesMock.java
===================================================================
--- trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ObjectTypesMock.java (rev 0)
+++ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ObjectTypesMock.java 2010-12-22 05:13:54 UTC (rev 6042)
@@ -0,0 +1,30 @@
+package net.sourceforge.squirrel_sql.plugins.oracle.expander;
+
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
+import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes;
+import net.sourceforge.squirrel_sql.plugins.oracle.OraclePlugin;
+import net.sourceforge.squirrel_sql.plugins.oracle.OraclePluginResources;
+
+import javax.swing.*;
+
+public class ObjectTypesMock extends ObjectTypes
+{
+ public ObjectTypesMock()
+ {
+ super(new OracleResourcesMock());
+ }
+
+ @Override
+ public DatabaseObjectType getUserParent()
+ {
+ return DatabaseObjectType.createNewDatabaseObjectType("DUM", new ImageIcon());
+ }
+
+ private static class OracleResourcesMock extends OraclePluginResources
+ {
+ private OracleResourcesMock()
+ {
+ super(OraclePlugin.class.getName(), new OraclePlugin());
+ }
+ }
+}
Modified: trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/PackageParentExpanderTest.java
===================================================================
--- trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/PackageParentExpanderTest.java 2010-12-21 20:19:38 UTC (rev 6041)
+++ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/PackageParentExpanderTest.java 2010-12-22 05:13:54 UTC (rev 6042)
@@ -29,7 +29,7 @@
@Before
public void setUp() throws Exception
{
- classUnderTest = new PackageParentExpander();
+ classUnderTest = new PackageParentExpander(new ObjectTypesMock());
}
}
Modified: trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SchemaExpanderTest.java
===================================================================
--- trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SchemaExpanderTest.java 2010-12-21 20:19:38 UTC (rev 6041)
+++ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SchemaExpanderTest.java 2010-12-22 05:13:54 UTC (rev 6042)
@@ -30,7 +30,7 @@
@Before
public void setUp() throws Exception
{
- classUnderTest = new SchemaExpander();
+ classUnderTest = new SchemaExpander(new ObjectTypesMock());
}
}
Modified: trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SessionParentExpanderTest.java
===================================================================
--- trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SessionParentExpanderTest.java 2010-12-21 20:19:38 UTC (rev 6041)
+++ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SessionParentExpanderTest.java 2010-12-22 05:13:54 UTC (rev 6042)
@@ -29,7 +29,7 @@
@Before
public void setUp() throws Exception
{
- classUnderTest = new SessionParentExpander();
+ classUnderTest = new SessionParentExpander(new ObjectTypesMock());
}
}
Modified: trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpanderTest.java
===================================================================
--- trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpanderTest.java 2010-12-21 20:19:38 UTC (rev 6041)
+++ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpanderTest.java 2010-12-22 05:13:54 UTC (rev 6042)
@@ -29,7 +29,7 @@
@Before
public void setUp() throws Exception
{
- classUnderTest = new TableExpander();
+ classUnderTest = new TableExpander(new ObjectTypesMock());
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
