[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6041] trunk/sql12
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: <ger...@us...> - 2010-12-21 20:19:46
|
Revision: 6041 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6041&view=rev Author: gerdwagner Date: 2010-12-21 20:19:38 +0000 (Tue, 21 Dec 2010) Log Message: ----------- Icons in Object tree for Oracle Modified Paths: -------------- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeNode.java trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.java trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/DatabaseObjectType.java trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.properties 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/TriggerParentExpander.java trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TriggerParentInfo.java trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/oracle.properties Added Paths: ----------- trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/function.png 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/OraclePluginResources.java trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/constraint.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/constraints.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/consumergroup.png trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/consumergroups.png trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/datatype.png trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/datatypes.png trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/function.png trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/functions.png trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/indexes.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/instance.png trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/instances.png trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/lob.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/lobs.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/package.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/packages.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/sequences.png trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/session.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/sessions.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/trigger.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/triggers.gif trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/users.png Removed Paths: ------------- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/IObjectTypes.java trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OracleResources.java Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeNode.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeNode.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeNode.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -25,7 +25,6 @@ import javax.swing.tree.MutableTreeNode; import net.sourceforge.squirrel_sql.fw.id.IIdentifier; -import net.sourceforge.squirrel_sql.fw.resources.LibraryResources; import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType; import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; @@ -58,8 +57,6 @@ /** Collection of <TT>INodeExpander</TT> objects for this node. */ private final List<INodeExpander> _expanders = new ArrayList<INodeExpander>(); - private ImageIcon _icon; - /** * Ctor that assumes node cannot have children. * @@ -86,12 +83,6 @@ _sessionId = session.getIdentifier(); _dboInfo = dboInfo; - if(null != _dboInfo.getDatabaseObjectType().getImageName()) - { - LibraryResources rsrc = new LibraryResources(); - - _icon = rsrc.getIcon(_dboInfo.getDatabaseObjectType().getImageName()); - } } public void add(MutableTreeNode newChild) @@ -194,8 +185,8 @@ return dbinfo.toString(); } - public ImageIcon getIcon() + public Icon getIcon() { - return _icon; + return _dboInfo.getDatabaseObjectType().getIcon(); } } Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.java =================================================================== --- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -44,6 +44,7 @@ String DOT_SEQUENCES = "dot.sequences"; String DOT_TRIGGER = "dot.trigger"; String DOT_TRIGGERS = "dot.triggers"; + String DOT_FUNCTION = "dot.function"; Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/DatabaseObjectType.java =================================================================== --- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/DatabaseObjectType.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/sql/DatabaseObjectType.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -20,9 +20,12 @@ import net.sourceforge.squirrel_sql.fw.id.IHasIdentifier; import net.sourceforge.squirrel_sql.fw.id.IIdentifier; import net.sourceforge.squirrel_sql.fw.id.IntegerIdentifierFactory; +import net.sourceforge.squirrel_sql.fw.resources.LibraryResources; import net.sourceforge.squirrel_sql.fw.util.StringManager; import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; +import javax.swing.*; + import static net.sourceforge.squirrel_sql.fw.resources.LibraryResources.IImageNames.*; import java.io.Serializable; @@ -75,7 +78,7 @@ public final static DatabaseObjectType FOREIGN_KEY = createNewDatabaseObjectTypeI18n("DatabaseObjectType.foreignkey"); /** Function. */ - public final static DatabaseObjectType FUNCTION = createNewDatabaseObjectTypeI18n("DatabaseObjectType.function"); + public final static DatabaseObjectType FUNCTION = createNewDatabaseObjectTypeI18n("DatabaseObjectType.function", DOT_FUNCTION); /** * Database object type for a "Index Type" node in the object tree. There is @@ -172,15 +175,15 @@ /** Describes this object type. */ private final String _name; private String _keyForSerializationReplace; - private String _imageName; + private Icon _icon; /** * Default ctor. */ - private DatabaseObjectType(String name, String keyForSerializationReplace, String imageName) + private DatabaseObjectType(String name, String keyForSerializationReplace, Icon icon) { _keyForSerializationReplace = keyForSerializationReplace; - _imageName = imageName; + _icon = icon; _id = s_idFactory.createIdentifier(); _name = name != null ? name : _id.toString(); } @@ -211,9 +214,9 @@ return _keyForSerializationReplace; } - public String getImageName() + public Icon getIcon() { - return _imageName; + return _icon; } public String toString() @@ -221,19 +224,31 @@ return getName(); } - public static DatabaseObjectType createNewDatabaseObjectTypeI18n(String key, String imageName) + private static DatabaseObjectType createNewDatabaseObjectTypeI18n(String key, String imageName) { - return new DatabaseObjectType(key, s_stringMgr.getString(key), imageName); + ImageIcon icon = null; + + if (null != imageName) + { + icon = new LibraryResources().getIcon(imageName); + } + + return createNewDatabaseObjectType(s_stringMgr.getString(key), icon); } - public static DatabaseObjectType createNewDatabaseObjectTypeI18n(String key) + private static DatabaseObjectType createNewDatabaseObjectTypeI18n(String key) { return createNewDatabaseObjectTypeI18n(key, null); } public static DatabaseObjectType createNewDatabaseObjectType(String key) { - return new DatabaseObjectType(key, key, null); + return createNewDatabaseObjectType(key, null); } + public static DatabaseObjectType createNewDatabaseObjectType(String key, Icon icon) + { + return new DatabaseObjectType(key, key, icon); + } + } Modified: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.properties =================================================================== --- trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.properties 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/LibraryResources.properties 2010-12-21 20:19:38 UTC (rev 6041) @@ -50,3 +50,4 @@ dot.sequences.image=dot/sequences.png dot.trigger.image=dot/trigger.gif dot.triggers.image=dot/triggers.gif +dot.function.image=dot/function.png Added: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/function.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/function.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/IObjectTypes.java =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/IObjectTypes.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/IObjectTypes.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -1,48 +0,0 @@ -package net.sourceforge.squirrel_sql.plugins.oracle; -/* - * Copyright (C) 2002-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 oracle. - * - * @author <A HREF="mailto:co...@us...">Colin Bell</A> - */ -public interface IObjectTypes -{ - DatabaseObjectType CONSUMER_GROUP_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Consumer Groups"); - DatabaseObjectType FUNCTION_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Functions"); - DatabaseObjectType INDEX_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Indexes"); - DatabaseObjectType INSTANCE_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Instances"); - DatabaseObjectType LOB_PARENT = DatabaseObjectType.createNewDatabaseObjectType("LOBS"); - DatabaseObjectType PACKAGE_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Packages"); - DatabaseObjectType SEQUENCE_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Sequences"); - DatabaseObjectType SESSION_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Sessions"); - DatabaseObjectType TRIGGER_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Triggers"); - DatabaseObjectType TYPE_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Types"); - DatabaseObjectType USER_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Users"); - DatabaseObjectType CONSTRAINT_PARENT = DatabaseObjectType.createNewDatabaseObjectType("Constraints"); - - DatabaseObjectType CONSUMER_GROUP = DatabaseObjectType.createNewDatabaseObjectType("Consumer Group"); - DatabaseObjectType INSTANCE = DatabaseObjectType.createNewDatabaseObjectType("Instance"); - DatabaseObjectType LOB = DatabaseObjectType.createNewDatabaseObjectType("LOB"); - DatabaseObjectType PACKAGE = DatabaseObjectType.createNewDatabaseObjectType("Package"); - DatabaseObjectType SESSION = DatabaseObjectType.createNewDatabaseObjectType("Session"); - DatabaseObjectType TYPE = DatabaseObjectType.createNewDatabaseObjectType("Type"); - DatabaseObjectType CONSTRAINT = DatabaseObjectType.createNewDatabaseObjectType("Constraint"); -} Copied: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/ObjectTypes.java (from rev 6037, trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/IObjectTypes.java) =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/ObjectTypes.java (rev 0) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/ObjectTypes.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -0,0 +1,168 @@ +package net.sourceforge.squirrel_sql.plugins.oracle; +/* + * Copyright (C) 2002-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 oracle. + * + * @author <A HREF="mailto:co...@us...">Colin Bell</A> + */ +public class ObjectTypes +{ + private DatabaseObjectType _consumerGroupParent; + private DatabaseObjectType _functionParent; + private DatabaseObjectType _indexParent; + private DatabaseObjectType _instanceParent; + private DatabaseObjectType _lobParent; + private DatabaseObjectType _packageParent; + private DatabaseObjectType _sequenceParent; + private DatabaseObjectType _sessionParent; + private DatabaseObjectType _triggerParent; + private DatabaseObjectType _typeParent; + private DatabaseObjectType _userParent; + private DatabaseObjectType _constraintParent; + + private DatabaseObjectType _consumerGroup; + private DatabaseObjectType _instance; + private DatabaseObjectType _lob; + private DatabaseObjectType _package; + private DatabaseObjectType _session; + private DatabaseObjectType _type; + private DatabaseObjectType _constraint; + + public ObjectTypes(OraclePluginResources resources) + { + _consumerGroupParent = DatabaseObjectType.createNewDatabaseObjectType("Consumer Groups", resources.getIcon(OraclePluginResources.IKeys.CONSUMERGROUPS_IMAGE)); + _functionParent = DatabaseObjectType.createNewDatabaseObjectType("Functions", resources.getIcon(OraclePluginResources.IKeys.FUNCTIONS_IMAGE)); + _indexParent = DatabaseObjectType.createNewDatabaseObjectType("Indexes", resources.getIcon(OraclePluginResources.IKeys.INDEXES_IMAGE)); + _instanceParent = DatabaseObjectType.createNewDatabaseObjectType("Instances", resources.getIcon(OraclePluginResources.IKeys.INSTANCES_IMAGE)); + _lobParent = DatabaseObjectType.createNewDatabaseObjectType("LOBS", resources.getIcon(OraclePluginResources.IKeys.LOBS_IMAGE)); + _packageParent = DatabaseObjectType.createNewDatabaseObjectType("Packages", resources.getIcon(OraclePluginResources.IKeys.PACKAGES_IMAGE)); + _sequenceParent = DatabaseObjectType.createNewDatabaseObjectType("Sequences", resources.getIcon(OraclePluginResources.IKeys.SQUENCES_IMAGE)); + _sessionParent = DatabaseObjectType.createNewDatabaseObjectType("Sessions", resources.getIcon(OraclePluginResources.IKeys.SESSIONS_IMAGE)); + _triggerParent = DatabaseObjectType.createNewDatabaseObjectType("Triggers", resources.getIcon(OraclePluginResources.IKeys.TRIGGERS_IMAGE)); + _typeParent = DatabaseObjectType.createNewDatabaseObjectType("Types", resources.getIcon(OraclePluginResources.IKeys.TYPES_IMAGE)); + _userParent = DatabaseObjectType.createNewDatabaseObjectType("Users", resources.getIcon(OraclePluginResources.IKeys.USERS_IMAGE)); + _constraintParent = DatabaseObjectType.createNewDatabaseObjectType("Constraints", resources.getIcon(OraclePluginResources.IKeys.CONSTRAINTS_IMAGE)); + + _consumerGroup = DatabaseObjectType.createNewDatabaseObjectType("Consumer Group", resources.getIcon(OraclePluginResources.IKeys.CONSUMERGROUP_IMAGE)); + _instance = DatabaseObjectType.createNewDatabaseObjectType("Instance", resources.getIcon(OraclePluginResources.IKeys.INSTANCE_IMAGE)); + _lob = DatabaseObjectType.createNewDatabaseObjectType("LOB", resources.getIcon(OraclePluginResources.IKeys.LOB_IMAGE)); + _package = DatabaseObjectType.createNewDatabaseObjectType("Package", resources.getIcon(OraclePluginResources.IKeys.PACKAGE_IMAGE)); + _session = DatabaseObjectType.createNewDatabaseObjectType("Session", resources.getIcon(OraclePluginResources.IKeys.SESSION_IMAGE)); + _type = DatabaseObjectType.createNewDatabaseObjectType("Type", resources.getIcon(OraclePluginResources.IKeys.TYPE_IMAGE)); + _constraint = DatabaseObjectType.createNewDatabaseObjectType("Constraint", resources.getIcon(OraclePluginResources.IKeys.CONSTRAINT_IMAGE)); + } + + public DatabaseObjectType getConsumerGroupParent() + { + return _consumerGroupParent; + } + + public DatabaseObjectType getFunctionParent() + { + return _functionParent; + } + + public DatabaseObjectType getIndexParent() + { + return _indexParent; + } + + public DatabaseObjectType getInstanceParent() + { + return _instanceParent; + } + + public DatabaseObjectType getLobParent() + { + return _lobParent; + } + + public DatabaseObjectType getPackageParent() + { + return _packageParent; + } + + public DatabaseObjectType getSequenceParent() + { + return _sequenceParent; + } + + public DatabaseObjectType getSessionParent() + { + return _sessionParent; + } + + public DatabaseObjectType getTriggerParent() + { + return _triggerParent; + } + + public DatabaseObjectType getTypeParent() + { + return _typeParent; + } + + public DatabaseObjectType getUserParent() + { + return _userParent; + } + + public DatabaseObjectType getConstraintParent() + { + return _constraintParent; + } + + public DatabaseObjectType getConsumerGroup() + { + return _consumerGroup; + } + + public DatabaseObjectType getInstance() + { + return _instance; + } + + public DatabaseObjectType getLob() + { + return _lob; + } + + public DatabaseObjectType getPackage() + { + return _package; + } + + public DatabaseObjectType getSession() + { + return _session; + } + + public DatabaseObjectType getType() + { + return _type; + } + + 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-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePlugin.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -45,7 +45,6 @@ import net.sourceforge.squirrel_sql.client.plugin.DefaultSessionPlugin; 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.PluginSessionCallback; import net.sourceforge.squirrel_sql.client.plugin.gui.PluginGlobalPreferencesTab; import net.sourceforge.squirrel_sql.client.plugin.gui.PluginQueryTokenizerPreferencesPanel; @@ -132,7 +131,7 @@ */ private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(OraclePlugin.class); - private PluginResources _resources; + private OraclePluginResources _resources; /** * A list of Oracle sessions that are open so we'll know when none are left @@ -157,8 +156,9 @@ private PluginQueryTokenizerPreferencesManager _prefsManager = null; public static final String BUNDLE_BASE_NAME = "net.sourceforge.squirrel_sql.plugins.oracle.oracle"; + private ObjectTypes _objectTypes; - interface i18n + interface i18n { // i18n[OraclePlugin.title=Oracle] String title = s_stringMgr.getString("OraclePlugin.title"); @@ -274,9 +274,10 @@ final IApplication app = getApplication(); - _resources = new OracleResources(OraclePlugin.BUNDLE_BASE_NAME, this); + _resources = new OraclePluginResources(OraclePlugin.BUNDLE_BASE_NAME, this); + _objectTypes = new ObjectTypes(_resources); - ActionCollection coll = app.getActionCollection(); + ActionCollection coll = app.getActionCollection(); coll.add(new NewDBOutputWorksheetAction(app, _resources)); coll.add(new NewInvalidObjectsWorksheetAction(app, _resources)); coll.add(new NewSessionInfoWorksheetAction(app, _resources)); @@ -303,7 +304,8 @@ _oracleAliasPrefsByAliasIdentifier.put(buf.getAliasIdentifier(), buf); } - } else + } + else { _oracleAliasPrefsByAliasIdentifier = new Hashtable<IIdentifier, OracleAliasPrefs>(); } @@ -313,7 +315,8 @@ /* Register custom DataTypeComponent factory for Oracles XMLType */ CellComponentFactory.registerDataTypeFactory( new OracleXmlTypeDataTypeComponentFactory(), 2007, "SYS.XMLTYPE"); - } catch (Exception e) + } + catch (Exception e) { throw new RuntimeException(e); } @@ -584,7 +587,7 @@ } if (type == DatabaseObjectType.DATABASE_TYPE_DBO && isOracle) { - return new DefaultDatabaseExpander(session); + return new DefaultDatabaseExpander(session, _objectTypes); } if (type == DatabaseObjectType.TABLE_TYPE_DBO && isOracleWithFlashBack) { @@ -783,52 +786,52 @@ { ISession session = objTree.getSession(); addDetailTab(objTree, DatabaseObjectType.SESSION, new OptionsTab()); - addDetailTab(objTree, IObjectTypes.CONSUMER_GROUP, new DatabaseObjectInfoTab()); + addDetailTab(objTree, _objectTypes.getConsumerGroup(), new DatabaseObjectInfoTab()); addDetailTab(objTree, DatabaseObjectType.FUNCTION, new DatabaseObjectInfoTab()); addDetailTab(objTree, DatabaseObjectType.INDEX, new DatabaseObjectInfoTab()); addDetailTab(objTree, DatabaseObjectType.INDEX, new IndexColumnInfoTab()); addDetailTab(objTree, DatabaseObjectType.INDEX, new IndexDetailsTab()); - addDetailTab(objTree, IObjectTypes.LOB, new DatabaseObjectInfoTab()); - addDetailTab(objTree, IObjectTypes.LOB, new LobDetailsTab()); + addDetailTab(objTree, _objectTypes.getLob(), new DatabaseObjectInfoTab()); + addDetailTab(objTree, _objectTypes.getLob(), new LobDetailsTab()); addDetailTab(objTree, DatabaseObjectType.SEQUENCE, new DatabaseObjectInfoTab()); addDetailTab(objTree, DatabaseObjectType.TRIGGER, new DatabaseObjectInfoTab()); - addDetailTab(objTree, IObjectTypes.TRIGGER_PARENT, new DatabaseObjectInfoTab()); - addDetailTab(objTree, IObjectTypes.TYPE, new DatabaseObjectInfoTab()); - addDetailTab(objTree, IObjectTypes.CONSTRAINT, new DatabaseObjectInfoTab()); + addDetailTab(objTree, _objectTypes.getTriggerParent(), new DatabaseObjectInfoTab()); + addDetailTab(objTree, _objectTypes.getType(), new DatabaseObjectInfoTab()); + addDetailTab(objTree, _objectTypes.getConstraint(), new DatabaseObjectInfoTab()); // Expanders. - addExpander(objTree, DatabaseObjectType.SCHEMA, new SchemaExpander()); - addExpander(objTree, DatabaseObjectType.TABLE, new TableExpander()); - addExpander(objTree, IObjectTypes.PACKAGE, new PackageExpander()); - addExpander(objTree, IObjectTypes.USER_PARENT, new UserParentExpander(session)); - addExpander(objTree, IObjectTypes.SESSION_PARENT, new SessionParentExpander()); - addExpander(objTree, IObjectTypes.INSTANCE_PARENT, new InstanceParentExpander()); - addExpander(objTree, IObjectTypes.TRIGGER_PARENT, new TriggerParentExpander()); - addExpander(objTree, IObjectTypes.CONSTRAINT_PARENT, new ConstraintParentExpander()); + addExpander(objTree, DatabaseObjectType.SCHEMA, new SchemaExpander(_objectTypes)); + addExpander(objTree, DatabaseObjectType.TABLE, new TableExpander(_objectTypes)); + addExpander(objTree, _objectTypes.getPackage(), new PackageExpander()); + addExpander(objTree, _objectTypes.getUserParent(), new UserParentExpander(session)); + addExpander(objTree, _objectTypes.getSessionParent(), new SessionParentExpander(_objectTypes)); + addExpander(objTree, _objectTypes.getInstanceParent(), new InstanceParentExpander(_objectTypes)); + addExpander(objTree, _objectTypes.getTriggerParent(), new TriggerParentExpander()); + addExpander(objTree, _objectTypes.getConstraintParent(), new ConstraintParentExpander(_objectTypes)); addDetailTab(objTree, DatabaseObjectType.PROCEDURE, new ObjectSourceTab( "PROCEDURE", "Show stored procedure source")); addDetailTab(objTree, DatabaseObjectType.FUNCTION, new ObjectSourceTab( "FUNCTION", "Show function source")); - addDetailTab(objTree, IObjectTypes.PACKAGE, new ObjectSourceTab( + addDetailTab(objTree, _objectTypes.getPackage(), new ObjectSourceTab( "PACKAGE", "Specification", "Show package specification")); - addDetailTab(objTree, IObjectTypes.PACKAGE, new ObjectSourceTab( + addDetailTab(objTree, _objectTypes.getPackage(), new ObjectSourceTab( "PACKAGE BODY", "Body", "Show package body")); - addDetailTab(objTree, IObjectTypes.TYPE, new ObjectSourceTab( + addDetailTab(objTree, _objectTypes.getType(), new ObjectSourceTab( "TYPE", "Specification", "Show type specification")); - addDetailTab(objTree, IObjectTypes.TYPE, new ObjectSourceTab("TYPE BODY", "Body", "Show type body")); - addDetailTab(objTree, IObjectTypes.INSTANCE, new InstanceDetailsTab()); + addDetailTab(objTree, _objectTypes.getType(), new ObjectSourceTab("TYPE BODY", "Body", "Show type body")); + addDetailTab(objTree, _objectTypes.getInstance(), new InstanceDetailsTab()); addDetailTab(objTree, DatabaseObjectType.SEQUENCE, new SequenceDetailsTab()); - addDetailTab(objTree, IObjectTypes.SESSION, new SessionDetailsTab()); - addDetailTab(objTree, IObjectTypes.SESSION, new SessionStatisticsTab()); + addDetailTab(objTree, _objectTypes.getSession(), new SessionDetailsTab()); + addDetailTab(objTree, _objectTypes.getSession(), new SessionStatisticsTab()); addDetailTab(objTree, DatabaseObjectType.TRIGGER, new TriggerDetailsTab()); addDetailTab(objTree, DatabaseObjectType.TRIGGER, new TriggerSourceTab()); addDetailTab(objTree, DatabaseObjectType.TRIGGER, new TriggerColumnInfoTab()); addDetailTab(objTree, DatabaseObjectType.USER, new UserDetailsTab(session)); - addDetailTab(objTree, IObjectTypes.CONSTRAINT, new ConstraintDetailsTab()); - addDetailTab(objTree, IObjectTypes.CONSTRAINT, new ConstraintColumnInfoTab()); - addDetailTab(objTree, IObjectTypes.CONSTRAINT, new ConstraintSourceTab()); + addDetailTab(objTree, _objectTypes.getConstraint(), new ConstraintDetailsTab()); + addDetailTab(objTree, _objectTypes.getConstraint(), new ConstraintColumnInfoTab()); + addDetailTab(objTree, _objectTypes.getConstraint(), new ConstraintSourceTab()); addDetailTab(objTree, DatabaseObjectType.VIEW, new ViewSourceTab()); addDetailTab(objTree, DatabaseObjectType.TABLE, new SnapshotSourceTab()); Copied: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePluginResources.java (from rev 6037, trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OracleResources.java) =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePluginResources.java (rev 0) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePluginResources.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -0,0 +1,55 @@ +package net.sourceforge.squirrel_sql.plugins.oracle; +/* + * Copyright (C) 2004 Jason Height + * jmh...@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.client.plugin.IPlugin; +import net.sourceforge.squirrel_sql.client.plugin.PluginResources; + +public final class OraclePluginResources extends PluginResources +{ + OraclePluginResources(String rsrcBundleBaseName, IPlugin plugin) + { + super(rsrcBundleBaseName, plugin); + } + + public interface IKeys + { + String USERS_IMAGE = "users"; + String FUNCTION_IMAGE = "function"; + String FUNCTIONS_IMAGE = "functions"; + String PACKAGE_IMAGE = "package"; + String PACKAGES_IMAGE = "packages"; + String SESSION_IMAGE = "session"; + String SESSIONS_IMAGE = "sessions"; + + String INSTANCE_IMAGE = "instance"; + String INSTANCES_IMAGE = "instances"; + + String TYPE_IMAGE = "datatype"; + String TYPES_IMAGE = "datatypes"; + String CONSUMERGROUPS_IMAGE = "consumergroups"; + String INDEXES_IMAGE = "indexes"; + String LOBS_IMAGE = "lobs"; + String SQUENCES_IMAGE = "sequences"; + String TRIGGERS_IMAGE = "triggers"; + String CONSTRAINTS_IMAGE = "constraints"; + String CONSUMERGROUP_IMAGE = "consumergroup"; + String LOB_IMAGE = "lob"; + String CONSTRAINT_IMAGE = "constraint"; + } +} Property changes on: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OraclePluginResources.java ___________________________________________________________________ Added: svn:executable + * Deleted: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OracleResources.java =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OracleResources.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/OracleResources.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -1,29 +0,0 @@ -package net.sourceforge.squirrel_sql.plugins.oracle; -/* - * Copyright (C) 2004 Jason Height - * jmh...@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.client.plugin.IPlugin; -import net.sourceforge.squirrel_sql.client.plugin.PluginResources; - -public final class OracleResources extends PluginResources -{ - OracleResources(String rsrcBundleBaseName, IPlugin plugin) - { - super(rsrcBundleBaseName, plugin); - } -} 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-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentExpander.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -30,7 +30,7 @@ import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection; import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData; -import net.sourceforge.squirrel_sql.plugins.oracle.IObjectTypes; +import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes; /** * This class handles the expanding of the Constraint node. It will @@ -45,10 +45,12 @@ + " where owner = ?" + " and table_name = ?" + " order by constraint_name asc"; - - public ConstraintParentExpander() { + private ObjectTypes _objectTypes; + + public ConstraintParentExpander(ObjectTypes objectTypes) { super(); - } + _objectTypes = objectTypes; + } public List<ObjectTreeNode> createChildren(ISession session, ObjectTreeNode parentNode) throws SQLException { @@ -70,7 +72,7 @@ DatabaseObjectInfo doi = new DatabaseObjectInfo(null, schemaName, rs.getString(1), - IObjectTypes.CONSTRAINT, + _objectTypes.getConstraint(), md); childNodes.add(new ObjectTreeNode(session, doi)); } 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-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/ConstraintParentInfo.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -25,7 +25,7 @@ import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectInfo; import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData; -import net.sourceforge.squirrel_sql.plugins.oracle.IObjectTypes; +import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes; public class ConstraintParentInfo extends DatabaseObjectInfo { @@ -34,9 +34,9 @@ private final IDatabaseObjectInfo _tableInfo; public ConstraintParentInfo(IDatabaseObjectInfo tableInfo, String schema, - SQLDatabaseMetaData md) + SQLDatabaseMetaData md, ObjectTypes objectTypes) { - super(null, schema, "CONSTRAINT", IObjectTypes.CONSTRAINT_PARENT, md); + 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-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/DefaultDatabaseExpander.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -26,7 +26,7 @@ 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.SQLDatabaseMetaData; -import net.sourceforge.squirrel_sql.plugins.oracle.IObjectTypes; +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,12 @@ { - public DefaultDatabaseExpander(ISession session) + private ObjectTypes _objectTypes; + + public DefaultDatabaseExpander(ISession session, ObjectTypes objectTypes) { super(session); + _objectTypes = objectTypes; } public List<ObjectTreeNode> createChildren(ISession session, ObjectTreeNode parentNode) @@ -55,7 +58,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); @@ -63,7 +66,7 @@ { // Instances. dboInfo = new DatabaseObjectInfo(null, null, "INSTANCES", - IObjectTypes.INSTANCE_PARENT, md); + _objectTypes.getInstanceParent(), md); node = new ObjectTreeNode(session, dboInfo); childNodes.add(node); } @@ -72,7 +75,7 @@ { // Sessions. dboInfo = new DatabaseObjectInfo(null, null, "SESSIONS", - IObjectTypes.SESSION_PARENT, md); + _objectTypes.getSessionParent(), md); node = new ObjectTreeNode(session, dboInfo); childNodes.add(node); } 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-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/InstanceParentExpander.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -34,7 +34,7 @@ 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.IObjectTypes; +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,16 @@ 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; - /** + /** * Default ctor. - */ - public InstanceParentExpander() { + * @param objectTypes + */ + public InstanceParentExpander(ObjectTypes objectTypes) { super(); - } + _objectTypes = objectTypes; + } /** * Create the child nodes for the passed parent node and return them. Note that this method should @@ -82,7 +85,7 @@ while (rs.next()) { IDatabaseObjectInfo doi = new DatabaseObjectInfo( - null, null, rs.getString(1), IObjectTypes.INSTANCE, md); + null, null, rs.getString(1), _objectTypes.getInstance(), md); // final Map map = new HashMap(); // map.put("Instance Number", new Integer(rs.getInt(1))); // map.put("Name", rs.getString(2)); 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-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/PackageParentExpander.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -29,7 +29,7 @@ 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.IObjectTypes; +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,16 +38,20 @@ */ public class PackageParentExpander implements INodeExpander { - /** + private ObjectTypes _objectTypes; + + /** * Default ctor. * * @throws IllegalArgumentException * Thrown if <TT>null</TT> <TT>OraclePlugin</TT> passed. + * @param objectTypes */ - PackageParentExpander() + PackageParentExpander(ObjectTypes objectTypes) { super(); - } + _objectTypes = objectTypes; + } /** * Create the child nodes for the passed parent node and return them. Note @@ -70,14 +74,14 @@ // Add package node to contain standalone procedures. IDatabaseObjectInfo dbinfo = new DatabaseObjectInfo(null, schemaName, - "", IObjectTypes.PACKAGE, md); + "", _objectTypes.getPackage(), md); ObjectTreeNode child = new ObjectTreeNode(session, dbinfo); child.setUserObject("Standalone"); childNodes.add(child); // Add packages. - ObjectType objType = new ObjectType(IObjectTypes.PACKAGE, "PACKAGE", - IObjectTypes.PACKAGE); + ObjectType objType = new ObjectType(_objectTypes.getPackage(), "PACKAGE", + _objectTypes.getPackage()); INodeExpander exp = new ObjectTypeExpander(objType); childNodes.addAll(exp.createChildren(session, parentNode)); 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-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SchemaExpander.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -27,7 +27,8 @@ import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType; import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData; -import net.sourceforge.squirrel_sql.plugins.oracle.IObjectTypes; +import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes; + /** * This class is an expander for the schema nodes. It will add various Object Type * nodes to the schema node. @@ -37,13 +38,17 @@ public class SchemaExpander implements INodeExpander { - /** + private ObjectTypes _objectTypes; + + /** * Ctor. - */ - public SchemaExpander() + * @param objectTypes + */ + public SchemaExpander(ObjectTypes objectTypes) { super(); - } + _objectTypes = objectTypes; + } /** * Create the child nodes for the passed parent node and return them. Note @@ -66,38 +71,38 @@ IDatabaseObjectInfo dbinfo = new DatabaseObjectInfo(catalogName, schemaName, "PACKAGE", - IObjectTypes.PACKAGE_PARENT, md); + _objectTypes.getPackageParent(), md); ObjectTreeNode child = new ObjectTreeNode(session, dbinfo); - child.addExpander(new PackageParentExpander()); + child.addExpander(new PackageParentExpander(_objectTypes)); childNodes.add(child); ObjectType objType; - objType = new ObjectType(IObjectTypes.CONSUMER_GROUP_PARENT, "CONSUMER GROUP", - IObjectTypes.CONSUMER_GROUP); + objType = new ObjectType(_objectTypes.getConsumerGroupParent(), "CONSUMER GROUP", + _objectTypes.getConsumerGroup()); childNodes.add(createObjectTypeNode(session, catalogName, schemaName, md, objType)); - objType = new ObjectType(IObjectTypes.FUNCTION_PARENT, "FUNCTION", + objType = new ObjectType(_objectTypes.getFunctionParent(), "FUNCTION", DatabaseObjectType.FUNCTION); childNodes.add(createObjectTypeNode(session, catalogName, schemaName, md, objType)); - objType = new ObjectType(IObjectTypes.INDEX_PARENT, "INDEX", DatabaseObjectType.INDEX); + objType = new ObjectType(_objectTypes.getIndexParent(), "INDEX", DatabaseObjectType.INDEX); childNodes.add(createObjectTypeNode(session, catalogName, schemaName, md, objType)); - objType = new ObjectType(IObjectTypes.LOB_PARENT, "LOB", IObjectTypes.LOB); + objType = new ObjectType(_objectTypes.getLobParent(), "LOB", _objectTypes.getLob()); childNodes.add(createObjectTypeNode(session, catalogName, schemaName, md, objType)); IDatabaseObjectInfo seqInfo = new DatabaseObjectInfo(catalogName, schemaName, "SEQUENCE", - IObjectTypes.SEQUENCE_PARENT, md); + _objectTypes.getSequenceParent(), md); ObjectTreeNode node = new ObjectTreeNode(session, seqInfo); node.addExpander(new SequenceParentExpander()); childNodes.add(node); - objType = new ObjectType(IObjectTypes.TYPE_PARENT, "TYPE", IObjectTypes.TYPE); + objType = new ObjectType(_objectTypes.getTypeParent(), "TYPE", _objectTypes.getType()); childNodes.add(createObjectTypeNode(session, catalogName, schemaName, md, objType)); 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-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/SessionParentExpander.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -32,7 +32,7 @@ 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.IObjectTypes; +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,14 +44,17 @@ /** SQL that retrieves the data. */ private static String SQL = "select sid||' ('||schemaname||')' from sys.v_$session"; + private ObjectTypes _objectTypes; - /** + /** * Default ctor. - */ - public SessionParentExpander() + * @param objectTypes + */ + public SessionParentExpander(ObjectTypes objectTypes) { super(); - } + _objectTypes = objectTypes; + } /** * Create the child nodes for the passed parent node and return them. Note that this method should @@ -86,7 +89,7 @@ // must not use DatabaseObjectType.SESSION, or else these nodes get expanded with the database // DefaultdatabasExpander. IDatabaseObjectInfo doi = - new DatabaseObjectInfo(null, schemaName, rs.getString(1), IObjectTypes.SESSION, md); + new DatabaseObjectInfo(null, schemaName, rs.getString(1), _objectTypes.getSession(), md); childNodes.add(new ObjectTreeNode(session, doi)); } } 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-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TableExpander.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -25,6 +25,8 @@ 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.SQLDatabaseMetaData; +import net.sourceforge.squirrel_sql.plugins.oracle.ObjectTypes; + /** * This class is an expander for the table nodes. It will add various Object Type * nodes to the table node. @@ -33,13 +35,17 @@ */ public class TableExpander implements INodeExpander { - /** + private ObjectTypes _objectTypes; + + /** * Default ctor. - */ - public TableExpander() + * @param objectTypes + */ + public TableExpander(ObjectTypes objectTypes) { super(); - } + _objectTypes = objectTypes; + } /** * Create the child nodes for the passed parent node and return them. Note @@ -60,13 +66,13 @@ final String schemaName = parentDbinfo.getSchemaName(); IDatabaseObjectInfo dbinfo = new TriggerParentInfo(parentDbinfo, - schemaName, md); + schemaName, md, _objectTypes); ObjectTreeNode child = new ObjectTreeNode(session, dbinfo); childNodes.add(child); IDatabaseObjectInfo cstrinfo = new ConstraintParentInfo(parentDbinfo, - schemaName, md); + schemaName, md, _objectTypes); child = new ObjectTreeNode(session, cstrinfo); childNodes.add(child); Modified: trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TriggerParentExpander.java =================================================================== --- trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TriggerParentExpander.java 2010-12-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TriggerParentExpander.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -31,6 +31,7 @@ import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection; import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData; + /** * This class handles the expanding of the "Trigger Parent" * node. It will give a list of all the triggers available for the table. @@ -43,13 +44,13 @@ "select owner, trigger_name from sys.all_triggers where table_owner = ?" + " and table_name = ?"; - /** + /** * Default ctor. - */ + */ public TriggerParentExpander() { super(); - } + } /** * Create the child nodes for the passed parent node and return them. Note 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-20 21:32:43 UTC (rev 6040) +++ trunk/sql12/plugins/oracle/src/main/java/net/sourceforge/squirrel_sql/plugins/oracle/expander/TriggerParentInfo.java 2010-12-21 20:19:38 UTC (rev 6041) @@ -21,7 +21,7 @@ import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData; -import net.sourceforge.squirrel_sql.plugins.oracle.IObjectTypes; +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,9 +33,9 @@ private final IDatabaseObjectInfo _tableInfo; public TriggerParentInfo(IDatabaseObjectInfo tableInfo, String schema, - SQLDatabaseMetaData md) + SQLDatabaseMetaData md, ObjectTypes objectTypes) { - super(null, schema, "TRIGGER", IObjectTypes.TRIGGER_PARENT, md); + super(null, schema, "TRIGGER", objectTypes.getTriggerParent(), md); _tableInfo = tableInfo; } Added: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/constraint.gif =================================================================== (Binary files differ) Property changes on: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/constraint.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/constraints.gif =================================================================== (Binary files differ) Property changes on: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/constraints.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/consumergroup.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/consumergroup.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/consumergroups.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/consumergroups.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/datatype.png (from rev 6037, trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/datatype.png) =================================================================== (Binary files differ) Copied: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/datatypes.png (from rev 6037, trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/datatypes.png) =================================================================== (Binary files differ) Added: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/function.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/function.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/functions.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/functions.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Copied: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/indexes.gif (from rev 6037, trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/resources/images/dot/indexes.gif) =================================================================== (Binary files differ) Added: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/instance.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/instance.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/instances.png =================================================================== (Binary files differ) Property changes on: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/instances.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/lob.gif =================================================================== (Binary files differ) Property changes on: trunk/sql12/plugins/oracle/src/main/resources/net/sourceforge/squirrel_sql/plugins/oracle/images/lob.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added... [truncated message content] |