Thread: [Squirrel-sql-commits] sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Gerd W. <ger...@us...> - 2006-05-28 20:23:04
|
Update of /cvsroot/squirrel-sql/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv30160/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander Modified Files: DefaultDatabaseExpander.java Removed Files: DatabaseExpander.java Log Message: Bug fixes and clean up --- DatabaseExpander.java DELETED --- Index: DefaultDatabaseExpander.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/expander/DefaultDatabaseExpander.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DefaultDatabaseExpander.java 28 May 2006 14:06:24 -0000 1.3 --- DefaultDatabaseExpander.java 28 May 2006 20:22:58 -0000 1.4 *************** *** 38,41 **** --- 38,44 ---- import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; import net.sourceforge.squirrel_sql.plugins.oracle.OraclePlugin; + import net.sourceforge.squirrel_sql.plugins.oracle.IObjectTypes; + import net.sourceforge.squirrel_sql.plugins.oracle.tab.InstanceDetailsTab; + import net.sourceforge.squirrel_sql.plugins.oracle.tab.SessionDetailsTab; /** *************** *** 90,92 **** --- 93,136 ---- } + public List createChildren(ISession session, ObjectTreeNode parentNode) + { + try + { + final List childNodes = super.createChildren(session, parentNode); + + final SQLDatabaseMetaData md = session.getSQLConnection().getSQLMetaData(); + + // Users. + DatabaseObjectInfo dboInfo = new DatabaseObjectInfo(null, null, "USERS", + IObjectTypes.USER_PARENT, md); + ObjectTreeNode node = new ObjectTreeNode(session, dboInfo); + childNodes.add(node); + + if (InstanceDetailsTab.isAccessible(session)) + { + // Instances. + dboInfo = new DatabaseObjectInfo(null, null, "INSTANCES", + IObjectTypes.INSTANCE_PARENT, md); + node = new ObjectTreeNode(session, dboInfo); + childNodes.add(node); + } + + if (SessionDetailsTab.isAccessible(session)) + { + // Sessions. + dboInfo = new DatabaseObjectInfo(null, null, "SESSIONS", + IObjectTypes.SESSION_PARENT, md); + node = new ObjectTreeNode(session, dboInfo); + childNodes.add(node); + } + + return childNodes; + } + catch (SQLException e) + { + throw new RuntimeException(e); + } + } + + } |