[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree ObjectTree.java,1.16,1.17 ObjectTreePanel.java,1.24,1.25 ObjectTreeFilterDialog.java,1.3,NONE ObjectTreeFilterPanel.java,1.3,NONE

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

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-serv14410/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree

Modified Files:
	ObjectTree.java ObjectTreePanel.java 
Removed Files:
	ObjectTreeFilterDialog.java ObjectTreeFilterPanel.java 
Log Message:
Oliver Jehle's patch for Object Tree Filter, removed unfinshed old trial for Object Tree Filter and clean up

Index: ObjectTreePanel.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreePanel.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ObjectTreePanel.java	25 Sep 2005 06:57:06 -0000	1.24
--- ObjectTreePanel.java	25 Sep 2005 07:16:09 -0000	1.25
***************
*** 175,181 ****
  		// Register tabs to display in the details panel for UDT nodes.
  		addDetailTab(DatabaseObjectType.UDT, new DatabaseObjectInfoTab());
- 
- 
-       addToPopup(DatabaseObjectType.SESSION, _session.getApplication().getActionCollection().get(FilterObjectsAction.class));
     }
  
--- 175,178 ----

Index: ObjectTree.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTree.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ObjectTree.java	25 Sep 2005 06:57:06 -0000	1.16
--- ObjectTree.java	25 Sep 2005 07:16:09 -0000	1.17
***************
*** 20,24 ****
  import java.awt.event.MouseAdapter;
  import java.awt.event.MouseEvent;
- import java.awt.*;
  import java.sql.SQLException;
  import java.util.ArrayList;
--- 20,23 ----
***************
*** 40,45 ****
  import javax.swing.event.TreeExpansionListener;
  import javax.swing.tree.TreePath;
- import javax.swing.tree.DefaultTreeCellRenderer;
- import javax.swing.tree.TreeCellRenderer;
  
  import net.sourceforge.squirrel_sql.fw.gui.CursorChanger;
--- 39,42 ----
***************
*** 136,145 ****
  		addToPopup(actions.get(RefreshObjectTreeAction.class));
  		addToPopup(actions.get(RefreshObjectTreeItemAction.class));
- //		addToPopup(actions.get(FilterObjectTreeAction.class));
  
        addToPopup(DatabaseObjectType.TABLE, actions.get(EditWhereColsAction.class));
        addToPopup(DatabaseObjectType.TABLE, actions.get(SQLFilterAction.class));
  
! 		// Option to select default catalog only applies to sessions
  		// that support catalogs.
  		try
--- 133,143 ----
  		addToPopup(actions.get(RefreshObjectTreeAction.class));
  		addToPopup(actions.get(RefreshObjectTreeItemAction.class));
  
        addToPopup(DatabaseObjectType.TABLE, actions.get(EditWhereColsAction.class));
        addToPopup(DatabaseObjectType.TABLE, actions.get(SQLFilterAction.class));
+       addToPopup(DatabaseObjectType.SESSION, actions.get(FilterObjectsAction.class));
  
! 
!       // Option to select default catalog only applies to sessions
  		// that support catalogs.
  		try

--- ObjectTreeFilterDialog.java DELETED ---

--- ObjectTreeFilterPanel.java DELETED ---