[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/sqlfilter SQLFilterSheet.java,1.10,1.11

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/sqlfilter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19877/sql12/app/src/net/sourceforge/squirrel_sql/client/session/sqlfilter

Modified Files:
	SQLFilterSheet.java 
Log Message:
1276957: use new methods in SQLDMD that encapsulate access to ResultSets instead of 
returning them.

Index: SQLFilterSheet.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/sqlfilter/SQLFilterSheet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SQLFilterSheet.java	22 Apr 2005 21:13:25 -0000	1.10
--- SQLFilterSheet.java	27 Nov 2005 02:27:17 -0000	1.11
***************
*** 27,31 ****
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
- import java.sql.ResultSet;
  import java.sql.SQLException;
  import java.sql.Types;
--- 27,30 ----
***************
*** 47,50 ****
--- 46,53 ----
  import javax.swing.event.ChangeListener;
  
+ import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory;
+ import net.sourceforge.squirrel_sql.client.gui.session.BaseSessionInternalFrame;
+ import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
+ import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.ContentsTab;
  import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
  import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
***************
*** 53,63 ****
  import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
  import net.sourceforge.squirrel_sql.fw.sql.SQLConnection;
  import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
  import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
- 
- import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory;
- import net.sourceforge.squirrel_sql.client.gui.session.BaseSessionInternalFrame;
- import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
- import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.ContentsTab;
  /**
   * SQLFilter dialog gui.
--- 56,63 ----
  import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
  import net.sourceforge.squirrel_sql.fw.sql.SQLConnection;
+ import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
+ import net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo;
  import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
  import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
  /**
   * SQLFilter dialog gui.
***************
*** 295,315 ****
  		{
  			SQLConnection sqlConnection = getSession().getSQLConnection();
! 			ResultSet rs =
! 				sqlConnection.getSQLMetaData().getColumns((ITableInfo)_objectInfo);
! 			while (rs.next())
! 			{
! 				columnNames.add(rs.getString("COLUMN_NAME"));
! 				int dataType = rs.getInt("DATA_TYPE");
! 
! 				if ((dataType == Types.CHAR)
! 					|| (dataType == Types.CLOB)
! 					|| (dataType == Types.LONGVARCHAR)
! 					|| (dataType == Types.VARCHAR))
! 				{
! 					textColumns.put(
! 						rs.getString("COLUMN_NAME"),
! 						new Boolean(true));
! 				}
! 			}
  		}
  		catch (SQLException ex)
--- 295,313 ----
  		{
  			SQLConnection sqlConnection = getSession().getSQLConnection();
!             SQLDatabaseMetaData md = sqlConnection.getSQLMetaData();
!             TableColumnInfo[] infos = md.getColumnInfo((ITableInfo)_objectInfo);
!             for (int i = 0; i < infos.length; i++) {
!                 String columnName = infos[i].getColumnName();
!                 int dataType = infos[i].getDataType();
!                 columnNames.add(columnName);
!                 if ((dataType == Types.CHAR)
!                         || (dataType == Types.CLOB)
!                         || (dataType == Types.LONGVARCHAR)
!                         || (dataType == Types.VARCHAR))
!                 {
!                     textColumns.put(columnName, new Boolean(true));
!                 }
!                 
!             }
  		}
  		catch (SQLException ex)