[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttr
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Rob M. <man...@us...> - 2007-04-28 11:46:47
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5736/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs Modified Files: BasePreparedStatementTab.java Log Message: 131657(Fix code that uses deprecated methods). Removed duplicate class def. Fixed deprecated code. Index: BasePreparedStatementTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/BasePreparedStatementTab.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BasePreparedStatementTab.java 5 Dec 2006 11:21:40 -0000 1.1 --- BasePreparedStatementTab.java 28 Apr 2007 11:46:44 -0000 1.2 *************** *** 31,34 **** --- 31,36 ---- import net.sourceforge.squirrel_sql.fw.datasetviewer.MapDataSet; import net.sourceforge.squirrel_sql.fw.datasetviewer.ResultSetDataSet; + import net.sourceforge.squirrel_sql.fw.util.log.ILogger; + import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; import net.sourceforge.squirrel_sql.client.session.ISession; *************** *** 49,52 **** --- 51,58 ---- private DataSetScrollingPanel _comp; + /** Logger for this class. */ + private final static ILogger s_log = + LoggerController.createLogger(BasePreparedStatementTab.class); + public BasePreparedStatementTab(String title, String hint) { *************** *** 94,98 **** if (_comp == null) { ! _comp = new DataSetScrollingPanel(); } return _comp; --- 100,113 ---- if (_comp == null) { ! ISession session = getSession(); ! SessionProperties props = session.getProperties(); ! String destClassName = props.getMetaDataOutputClassName(); ! try { ! _comp = new DataSetScrollingPanel(destClassName, null); ! } catch (Exception e) { ! s_log.error("Unexpected exception from call to getComponent: "+ ! e.getMessage(), e); ! } ! } return _comp; *************** *** 114,121 **** try { - final SessionProperties props = session.getProperties(); - final String destClassName = props.getMetaDataOutputClassName(); final IDataSet ds = createDataSetFromResultSet(rs); ! _comp.load(ds, destClassName); } finally --- 129,134 ---- try { final IDataSet ds = createDataSetFromResultSet(rs); ! _comp.load(ds); } finally *************** *** 149,153 **** final int columnCount = rsds.getColumnCount(); final ColumnDisplayDefinition[] colDefs = rsds.getDataSetDefinition().getColumnDefinitions(); ! final Map data = new HashMap(); if (rsds.next(null)) { --- 162,166 ---- final int columnCount = rsds.getColumnCount(); final ColumnDisplayDefinition[] colDefs = rsds.getDataSetDefinition().getColumnDefinitions(); ! final Map<String, Object> data = new HashMap<String, Object>(); if (rsds.next(null)) { |