|
From: <man...@us...> - 2010-12-22 13:38:46
|
Revision: 6045
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6045&view=rev
Author: manningr
Date: 2010-12-22 13:38:39 +0000 (Wed, 22 Dec 2010)
Log Message:
-----------
Using easymock to add support for new tree icon feature (easier to add expectations in one place when needed later in different plugins).
Modified Paths:
--------------
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/ObjectTypes.java
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentExpander.java
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentInfo.java
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/DefaultDatabaseExpander.java
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/InstanceParentExpander.java
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/PackageParentExpander.java
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SchemaExpander.java
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SessionParentExpander.java
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpander.java
trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TriggerParentInfo.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
Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/ObjectTypes.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/ObjectTypes.java 2010-12-22 13:33:06 UTC (rev 6044)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/ObjectTypes.java 2010-12-22 13:38:39 UTC (rev 6045)
@@ -18,13 +18,14 @@
* 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.sql.IObjectTypes;
/**
* This class contains the different database object types for oracle.
*
* @author <A HREF="mailto:co...@us...">Colin Bell</A>
*/
-public class ObjectTypes
+public class ObjectTypes implements IObjectTypes
{
private DatabaseObjectType _consumerGroupParent;
private DatabaseObjectType _functionParent;
@@ -71,96 +72,153 @@
_constraint = DatabaseObjectType.createNewDatabaseObjectType("Constraint", resources.getIcon(OraclePluginResources.IKeys.CONSTRAINT_IMAGE));
}
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IObjectTypes#getConsumerGroupParent()
+ */
public DatabaseObjectType getConsumerGroupParent()
{
return _consumerGroupParent;
}
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IObjectTypes#getFunctionParent()
+ */
public DatabaseObjectType getFunctionParent()
{
return _functionParent;
}
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IObjectTypes#getIndexParent()
+ */
public DatabaseObjectType getIndexParent()
{
return _indexParent;
}
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IObjectTypes#getInstanceParent()
+ */
public DatabaseObjectType getInstanceParent()
{
return _instanceParent;
}
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IObjectTypes#getLobParent()
+ */
public DatabaseObjectType getLobParent()
{
return _lobParent;
}
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IObjectTypes#getPackageParent()
+ */
public DatabaseObjectType getPackageParent()
{
return _packageParent;
}
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IObjectTypes#getSequenceParent()
+ */
public DatabaseObjectType getSequenceParent()
{
return _sequenceParent;
}
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IObjectTypes#getSessionParent()
+ */
public DatabaseObjectType getSessionParent()
{
return _sessionParent;
}
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IObjectTypes#getTriggerParent()
+ */
public DatabaseObjectType getTriggerParent()
{
return _triggerParent;
}
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IObjectTypes#getTypeParent()
+ */
public DatabaseObjectType getTypeParent()
{
return _typeParent;
}
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IObjectTypes#getUserParent()
+ */
public DatabaseObjectType getUserParent()
{
return _userParent;
}
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IObjectTypes#getConstraintParent()
+ */
public DatabaseObjectType getConstraintParent()
{
return _constraintParent;
}
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IObjectTypes#getConsumerGroup()
+ */
public DatabaseObjectType getConsumerGroup()
{
return _consumerGroup;
}
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IObjectTypes#getInstance()
+ */
public DatabaseObjectType getInstance()
{
return _instance;
}
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IObjectTypes#getLob()
+ */
public DatabaseObjectType getLob()
{
return _lob;
}
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IObjectTypes#getPackage()
+ */
public DatabaseObjectType getPackage()
{
return _package;
}
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IObjectTypes#getSession()
+ */
public DatabaseObjectType getSession()
{
return _session;
}
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IObjectTypes#getType()
+ */
public DatabaseObjectType getType()
{
return _type;
}
+ /**
+ * @see net.sourceforge.squirrel_sql.fw.sql.IObjectTypes#getConstraint()
+ */
public DatabaseObjectType getConstraint()
{
return _constraint;
Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java 2010-12-22 13:33:06 UTC (rev 6044)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java 2010-12-22 13:38:39 UTC (rev 6045)
@@ -63,6 +63,7 @@
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
+import net.sourceforge.squirrel_sql.fw.sql.IObjectTypes;
import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
@@ -156,7 +157,7 @@
private PluginQueryTokenizerPreferencesManager _prefsManager = null;
public static final String BUNDLE_BASE_NAME = "net.sourceforge.squirrel_sql.plugins.oracle.oracle";
- private ObjectTypes _objectTypes;
+ private IObjectTypes _objectTypes;
interface i18n
{
Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentExpander.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentExpander.java 2010-12-22 13:33:06 UTC (rev 6044)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentExpander.java 2010-12-22 13:38:39 UTC (rev 6045)
@@ -28,9 +28,9 @@
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.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.IObjectTypes;
import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
-import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes;
/**
* This class handles the expanding of the Constraint node. It will
@@ -45,9 +45,9 @@
+ " where owner = ?"
+ " and table_name = ?"
+ " order by constraint_name asc";
- private ObjectTypes _objectTypes;
+ private IObjectTypes _objectTypes;
- public ConstraintParentExpander(ObjectTypes objectTypes) {
+ public ConstraintParentExpander(IObjectTypes objectTypes) {
super();
_objectTypes = objectTypes;
}
Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentInfo.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentInfo.java 2010-12-22 13:33:06 UTC (rev 6044)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentInfo.java 2010-12-22 13:38:39 UTC (rev 6045)
@@ -24,8 +24,8 @@
*/
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.IObjectTypes;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
-import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes;
public class ConstraintParentInfo extends DatabaseObjectInfo
{
@@ -34,7 +34,7 @@
private final IDatabaseObjectInfo _tableInfo;
public ConstraintParentInfo(IDatabaseObjectInfo tableInfo, String schema,
- SQLDatabaseMetaData md, ObjectTypes objectTypes)
+ SQLDatabaseMetaData md, IObjectTypes objectTypes)
{
super(null, schema, "CONSTRAINT", objectTypes.getConstraintParent(), md);
_tableInfo = tableInfo;
Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/DefaultDatabaseExpander.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/DefaultDatabaseExpander.java 2010-12-22 13:33:06 UTC (rev 6044)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/DefaultDatabaseExpander.java 2010-12-22 13:38:39 UTC (rev 6045)
@@ -25,8 +25,8 @@
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.DatabaseExpander;
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.IObjectTypes;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
-import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes;
import net.sourceforge.squirrel_sql.plugins.oracle.tab.InstanceDetailsTab;
import net.sourceforge.squirrel_sql.plugins.oracle.tab.SessionDetailsTab;
@@ -40,9 +40,9 @@
{
- private ObjectTypes _objectTypes;
+ private IObjectTypes _objectTypes;
- public DefaultDatabaseExpander(ISession session, ObjectTypes objectTypes)
+ public DefaultDatabaseExpander(ISession session, IObjectTypes objectTypes)
{
super(session);
_objectTypes = objectTypes;
Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/InstanceParentExpander.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/InstanceParentExpander.java 2010-12-22 13:33:06 UTC (rev 6044)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/InstanceParentExpander.java 2010-12-22 13:38:39 UTC (rev 6045)
@@ -26,6 +26,7 @@
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.IObjectTypes;
import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
@@ -34,7 +35,6 @@
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.INodeExpander;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode;
-import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes;
/**
* This class handles the expanding of the "Instance Parent" node. It will give a list of all the instances.
@@ -47,13 +47,13 @@
private static String SQL = "select instance_number, instance_name, host_name, version,"
+ " startup_time, status, parallel, thread#, archiver, log_switch_wait,"
+ " logins, shutdown_pending, database_status, instance_role" + " from sys.v_$instance";
- private ObjectTypes _objectTypes;
+ private IObjectTypes _objectTypes;
/**
* Default ctor.
* @param objectTypes
*/
- public InstanceParentExpander(ObjectTypes objectTypes) {
+ public InstanceParentExpander(IObjectTypes objectTypes) {
super();
_objectTypes = objectTypes;
}
Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/PackageParentExpander.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/PackageParentExpander.java 2010-12-22 13:33:06 UTC (rev 6044)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/PackageParentExpander.java 2010-12-22 13:38:39 UTC (rev 6045)
@@ -23,13 +23,13 @@
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.IObjectTypes;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.INodeExpander;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode;
-import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes;
/**
* This class handles the expanding of the "Package Type" or "Package Heading"
* node. It will give a list of all the packages available in the schema.
@@ -38,7 +38,7 @@
*/
public class PackageParentExpander implements INodeExpander
{
- private ObjectTypes _objectTypes;
+ private IObjectTypes _objectTypes;
/**
* Default ctor.
@@ -47,7 +47,7 @@
* Thrown if <TT>null</TT> <TT>OraclePlugin</TT> passed.
* @param objectTypes
*/
- PackageParentExpander(ObjectTypes objectTypes)
+ PackageParentExpander(IObjectTypes objectTypes)
{
super();
_objectTypes = objectTypes;
Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SchemaExpander.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SchemaExpander.java 2010-12-22 13:33:06 UTC (rev 6044)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SchemaExpander.java 2010-12-22 13:38:39 UTC (rev 6045)
@@ -26,8 +26,8 @@
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.IObjectTypes;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
-import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes;
/**
* This class is an expander for the schema nodes. It will add various Object Type
@@ -38,13 +38,13 @@
public class SchemaExpander implements INodeExpander
{
- private ObjectTypes _objectTypes;
+ private IObjectTypes _objectTypes;
/**
* Ctor.
* @param objectTypes
*/
- public SchemaExpander(ObjectTypes objectTypes)
+ public SchemaExpander(IObjectTypes objectTypes)
{
super();
_objectTypes = objectTypes;
Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SessionParentExpander.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SessionParentExpander.java 2010-12-22 13:33:06 UTC (rev 6044)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SessionParentExpander.java 2010-12-22 13:38:39 UTC (rev 6045)
@@ -29,10 +29,10 @@
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.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.IObjectTypes;
import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
-import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes;
/**
* This class handles the expanding of the "Session Parent" node. It will give a list of all the sessions.
@@ -44,13 +44,13 @@
/** SQL that retrieves the data. */
private static String SQL = "select sid||' ('||schemaname||')' from sys.v_$session";
- private ObjectTypes _objectTypes;
+ private IObjectTypes _objectTypes;
/**
* Default ctor.
* @param objectTypes
*/
- public SessionParentExpander(ObjectTypes objectTypes)
+ public SessionParentExpander(IObjectTypes objectTypes)
{
super();
_objectTypes = objectTypes;
Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpander.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpander.java 2010-12-22 13:33:06 UTC (rev 6044)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpander.java 2010-12-22 13:38:39 UTC (rev 6045)
@@ -24,8 +24,8 @@
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.INodeExpander;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.IObjectTypes;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
-import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes;
/**
* This class is an expander for the table nodes. It will add various Object Type
@@ -35,13 +35,13 @@
*/
public class TableExpander implements INodeExpander
{
- private ObjectTypes _objectTypes;
+ private IObjectTypes _objectTypes;
/**
* Default ctor.
* @param objectTypes
*/
- public TableExpander(ObjectTypes objectTypes)
+ public TableExpander(IObjectTypes objectTypes)
{
super();
_objectTypes = objectTypes;
Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TriggerParentInfo.java
===================================================================
--- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TriggerParentInfo.java 2010-12-22 13:33:06 UTC (rev 6044)
+++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TriggerParentInfo.java 2010-12-22 13:38:39 UTC (rev 6045)
@@ -19,9 +19,9 @@
*/
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.IObjectTypes;
import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
-import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes;
/**
* This class stores information about an Oracle Trigger parent. This just
* stores info about the table that the trigger relates to.
@@ -33,7 +33,7 @@
private final IDatabaseObjectInfo _tableInfo;
public TriggerParentInfo(IDatabaseObjectInfo tableInfo, String schema,
- SQLDatabaseMetaData md, ObjectTypes objectTypes)
+ SQLDatabaseMetaData md, IObjectTypes objectTypes)
{
super(null, schema, "TRIGGER", objectTypes.getTriggerParent(), md);
_tableInfo = tableInfo;
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-22 13:33:06 UTC (rev 6044)
+++ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/InstanceParentExpanderTest.java 2010-12-22 13:38:39 UTC (rev 6045)
@@ -29,7 +29,7 @@
@Before
public void setUp() throws Exception
{
- classUnderTest = new InstanceParentExpander(new ObjectTypesMock());
+ classUnderTest = new InstanceParentExpander(mockObjectTypes);
}
}
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-22 13:33:06 UTC (rev 6044)
+++ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/PackageParentExpanderTest.java 2010-12-22 13:38:39 UTC (rev 6045)
@@ -29,7 +29,7 @@
@Before
public void setUp() throws Exception
{
- classUnderTest = new PackageParentExpander(new ObjectTypesMock());
+ classUnderTest = new PackageParentExpander(mockObjectTypes);
}
}
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-22 13:33:06 UTC (rev 6044)
+++ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SchemaExpanderTest.java 2010-12-22 13:38:39 UTC (rev 6045)
@@ -30,7 +30,7 @@
@Before
public void setUp() throws Exception
{
- classUnderTest = new SchemaExpander(new ObjectTypesMock());
+ classUnderTest = new SchemaExpander(mockObjectTypes);
}
}
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-22 13:33:06 UTC (rev 6044)
+++ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SessionParentExpanderTest.java 2010-12-22 13:38:39 UTC (rev 6045)
@@ -29,7 +29,7 @@
@Before
public void setUp() throws Exception
{
- classUnderTest = new SessionParentExpander(new ObjectTypesMock());
+ classUnderTest = new SessionParentExpander(mockObjectTypes);
}
}
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-22 13:33:06 UTC (rev 6044)
+++ trunk/sql12/plugins/oracle/src/test/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpanderTest.java 2010-12-22 13:38:39 UTC (rev 6045)
@@ -21,6 +21,7 @@
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.AbstractINodeExpanderTest;
+
import org.junit.Before;
public class TableExpanderTest extends AbstractINodeExpanderTest
@@ -29,7 +30,7 @@
@Before
public void setUp() throws Exception
{
- classUnderTest = new TableExpander(new ObjectTypesMock());
+ classUnderTest = new TableExpander(mockObjectTypes);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
