[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session IObjectTreeAPI.java, 1.14, 1.15 ObjectTreeSearch.java, 1.2, 1.3

[Gerd W. <ger...@us...>]

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv23990/app/src/net/sourceforge/squirrel_sql/client/session

Modified Files:
	IObjectTreeAPI.java ObjectTreeSearch.java 
Log Message:
Object tree search (Feature request 2004240): Enable filtering

Index: ObjectTreeSearch.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/ObjectTreeSearch.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ObjectTreeSearch.java	7 Apr 2007 02:27:52 -0000	1.2
--- ObjectTreeSearch.java	16 Oct 2008 10:34:27 -0000	1.3
***************
*** 3,6 ****
--- 3,7 ----
  import net.sourceforge.squirrel_sql.client.gui.session.ObjectTreeInternalFrame;
  import net.sourceforge.squirrel_sql.client.gui.session.SessionInternalFrame;
+ import net.sourceforge.squirrel_sql.client.session.schemainfo.FilterMatcher;
  import net.sourceforge.squirrel_sql.fw.util.StringManager;
  import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
***************
*** 49,53 ****
  
           ArrayList<String> catSchemObj = candidates.next();
!          success = objectTree.selectInObjectTree(catSchemObj.get(0), catSchemObj.get(1), catSchemObj.get(2));
           if (success)
           {
--- 50,55 ----
  
           ArrayList<String> catSchemObj = candidates.next();
! 
!          success = objectTree.selectInObjectTree(catSchemObj.get(0), catSchemObj.get(1), new FilterMatcher(catSchemObj.get(2), null));
           if (success)
           {

Index: IObjectTreeAPI.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/IObjectTreeAPI.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** IObjectTreeAPI.java	15 Oct 2008 19:16:56 -0000	1.14
--- IObjectTreeAPI.java	16 Oct 2008 10:34:27 -0000	1.15
***************
*** 28,36 ****
  import javax.swing.event.TreeSelectionListener;
  
! import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.INodeExpander;
! import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.IObjectTreeListener;
! import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode;
! import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.FindInObjectTreeController;
  import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.IObjectTab;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
  import net.sourceforge.squirrel_sql.fw.id.IHasIdentifier;
--- 28,34 ----
  import javax.swing.event.TreeSelectionListener;
  
! import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.*;
  import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.IObjectTab;
+ import net.sourceforge.squirrel_sql.client.session.schemainfo.FilterMatcher;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
  import net.sourceforge.squirrel_sql.fw.id.IHasIdentifier;
***************
*** 257,264 ****
      * @param catalog null means any catalog
      * @param schema null means any schema
-     * @param table, view, ... but not a table or view column
      * @return true if the Object was found and selected.
      */
!    boolean selectInObjectTree(String catalog, String schema, String object);
     
     /**
--- 255,261 ----
      * @param catalog null means any catalog
      * @param schema null means any schema
      * @return true if the Object was found and selected.
      */
!    boolean selectInObjectTree(String catalog, String schema, FilterMatcher objectMatcher);
     
     /**