[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/procedure ProcedureColumnsTab.java,1.3,1.4

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

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/procedure
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17966/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/procedure

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

Index: ProcedureColumnsTab.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/procedure/ProcedureColumnsTab.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ProcedureColumnsTab.java	19 May 2004 14:26:20 -0000	1.3
--- ProcedureColumnsTab.java	27 Nov 2005 02:17:11 -0000	1.4
***************
*** 1,89 ****
! package net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.procedure;
! /*
!  * Copyright (C) 2001-2003 Colin Bell
!  * co...@us...
!  *
!  * This library is free software; you can redistribute it and/or
!  * modify it under the terms of the GNU Lesser General Public
!  * License as published by the Free Software Foundation; either
!  * version 2.1 of the License, or (at your option) any later version.
!  *
!  * This library is distributed in the hope that it will be useful,
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
!  * Lesser General Public License for more details.
!  *
!  * You should have received a copy of the GNU Lesser General Public
!  * License along with this library; if not, write to the Free Software
!  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  */
! import java.sql.ResultSet;
! import java.sql.SQLException;
! 
! import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
! import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSet;
! import net.sourceforge.squirrel_sql.fw.datasetviewer.ResultSetDataSet;
! import net.sourceforge.squirrel_sql.fw.sql.SQLConnection;
! /**
!  * This tab shows the columns in the currently selected stored procedure.
!  *
!  * @author  <A HREF="mailto:co...@us...">Colin Bell</A>
!  */
! public class ProcedureColumnsTab extends BaseProcedureTab
! {
! 	/**
! 	 * This interface defines locale specific strings. This should be
! 	 * replaced with a property file.
! 	 */
! 	private interface i18n
! 	{
! 		String TITLE = "Columns";
! 		String HINT = "Show columns for procedure";
! 	}
! 
! 	/**
! 	 * Return the title for the tab.
! 	 *
! 	 * @return	The title for the tab.
! 	 */
! 	public String getTitle()
! 	{
! 		return i18n.TITLE;
! 	}
! 
! 	/**
! 	 * Return the hint for the tab.
! 	 *
! 	 * @return	The hint for the tab.
! 	 */
! 	public String getHint()
! 	{
! 		return i18n.HINT;
! 	}
! 
! 	/**
! 	 * Create the <TT>IDataSet</TT> to be displayed in this tab.
! 	 */
! 	protected IDataSet createDataSet() throws DataSetException
! 	{
! 		final SQLConnection conn = getSession().getSQLConnection();
! 		try
! 		{
! 			final ResultSet rs = conn.getSQLMetaData().getProcedureColumns(getProcedureInfo());
! 			try
! 			{
! 				final ResultSetDataSet rsds = new ResultSetDataSet();
! 				rsds.setResultSet(rs);
! 				return rsds;
! 			}
! 			finally
! 			{
! 				rs.close();
! 			}
! 		}
! 		catch (SQLException ex)
! 		{
! 			throw new DataSetException(ex);
! 		}
! 	}
! }
--- 1,68 ----
! package net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.procedure;
! /*
!  * Copyright (C) 2001-2003 Colin Bell
!  * co...@us...
!  *
!  * This library is free software; you can redistribute it and/or
!  * modify it under the terms of the GNU Lesser General Public
!  * License as published by the Free Software Foundation; either
!  * version 2.1 of the License, or (at your option) any later version.
!  *
!  * This library is distributed in the hope that it will be useful,
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
!  * Lesser General Public License for more details.
!  *
!  * You should have received a copy of the GNU Lesser General Public
!  * License along with this library; if not, write to the Free Software
!  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  */
! import net.sourceforge.squirrel_sql.fw.datasetviewer.DataSetException;
! import net.sourceforge.squirrel_sql.fw.datasetviewer.IDataSet;
! import net.sourceforge.squirrel_sql.fw.sql.SQLConnection;
! /**
!  * This tab shows the columns in the currently selected stored procedure.
!  *
!  * @author  <A HREF="mailto:co...@us...">Colin Bell</A>
!  */
! public class ProcedureColumnsTab extends BaseProcedureTab
! {
! 	/**
! 	 * This interface defines locale specific strings. This should be
! 	 * replaced with a property file.
! 	 */
! 	private interface i18n
! 	{
! 		String TITLE = "Columns";
! 		String HINT = "Show columns for procedure";
! 	}
! 
! 	/**
! 	 * Return the title for the tab.
! 	 *
! 	 * @return	The title for the tab.
! 	 */
! 	public String getTitle()
! 	{
! 		return i18n.TITLE;
! 	}
! 
! 	/**
! 	 * Return the hint for the tab.
! 	 *
! 	 * @return	The hint for the tab.
! 	 */
! 	public String getHint()
! 	{
! 		return i18n.HINT;
! 	}
! 
! 	/**
! 	 * Create the <TT>IDataSet</TT> to be displayed in this tab.
! 	 */
! 	protected IDataSet createDataSet() throws DataSetException
! 	{
! 		final SQLConnection conn = getSession().getSQLConnection();
!         return conn.getSQLMetaData().getProcedureColumnsDataSet(getProcedureInfo());
! 	}
! }