[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttre
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Colin B. <co...@us...> - 2004-09-12 11:26:24
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17546/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree Modified Files: ObjectTreeModel.java Log Message: Jasons patch for replacing the default expanders in the object tree. Index: ObjectTreeModel.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeModel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ObjectTreeModel.java 1 Dec 2003 12:06:32 -0000 1.3 --- ObjectTreeModel.java 12 Sep 2004 11:25:43 -0000 1.4 *************** *** 1,8 **** package net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree; /* ! * Copyright (C) 2002 Colin Bell and Johan Compagner * co...@us... * jco...@j-... * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public --- 1,10 ---- package net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree; /* ! * Copyright (C) 2002-2004 Colin Bell and Johan Compagner * co...@us... * jco...@j-... * + * Modifications Copyright (c) 2004 Jason Height. + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public *************** *** 22,25 **** --- 24,28 ---- import java.util.Comparator; import java.util.HashMap; + import java.util.Iterator; import java.util.List; import java.util.Map; *************** *** 34,37 **** --- 37,43 ---- import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; + import net.sourceforge.squirrel_sql.client.plugin.ISessionPlugin; + import net.sourceforge.squirrel_sql.client.plugin.PluginManager; + import net.sourceforge.squirrel_sql.client.plugin.SessionPluginInfo; import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI; import net.sourceforge.squirrel_sql.client.session.ISession; *************** *** 77,83 **** addExpander(DatabaseObjectType.CATALOG, expander); addExpander(DatabaseObjectType.SCHEMA, expander); ! addExpander(IObjectTreeAPI.TABLE_TYPE_DBO, new TableTypeExpander()); ! addExpander(IObjectTreeAPI.PROC_TYPE_DBO, new ProcedureTypeExpander()); ! addExpander(IObjectTreeAPI.UDT_TYPE_DBO, new UDTTypeExpander()); } --- 83,126 ---- addExpander(DatabaseObjectType.CATALOG, expander); addExpander(DatabaseObjectType.SCHEMA, expander); ! ! boolean foundTableExp = false; ! boolean foundProcExp = false; ! boolean foundUDTExp = false; ! final PluginManager pmgr = session.getApplication().getPluginManager(); ! for (Iterator pluginItr = pmgr.getSessionPluginIterator(); pluginItr.hasNext();) ! { ! ISessionPlugin p = ((SessionPluginInfo)pluginItr.next()).getSessionPlugin(); ! INodeExpander tableExp = p.getDefaultNodeExpander(session, IObjectTreeAPI.TABLE_TYPE_DBO); ! if (tableExp != null) ! { ! foundTableExp = true; ! addExpander(IObjectTreeAPI.TABLE_TYPE_DBO, tableExp); ! } ! INodeExpander procExp = p.getDefaultNodeExpander(session, IObjectTreeAPI.PROC_TYPE_DBO); ! if (procExp != null) ! { ! foundProcExp = true; ! addExpander(IObjectTreeAPI.PROC_TYPE_DBO, procExp); ! } ! INodeExpander udtExp = p.getDefaultNodeExpander(session, IObjectTreeAPI.UDT_TYPE_DBO); ! if (udtExp != null) ! { ! foundUDTExp = true; ! addExpander(IObjectTreeAPI.UDT_TYPE_DBO, udtExp); ! } ! } ! ! if (!foundTableExp) ! { ! addExpander(IObjectTreeAPI.TABLE_TYPE_DBO, new TableTypeExpander()); ! } ! if (!foundProcExp) ! { ! addExpander(IObjectTreeAPI.PROC_TYPE_DBO, new ProcedureTypeExpander()); ! } ! if (!foundUDTExp) ! { ! addExpander(IObjectTreeAPI.UDT_TYPE_DBO, new UDTTypeExpander()); ! } } |