Thread: [Squirrel-sql-commits] sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tab Base
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Rob M. <man...@us...> - 2007-04-28 18:38:46
|
Update of /cvsroot/squirrel-sql/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tab In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7116/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tab Modified Files: BaseSQLTab.java Log Message: 131657(Fix code that uses deprecated methods). Index: BaseSQLTab.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tab/BaseSQLTab.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** BaseSQLTab.java 20 Dec 2006 09:39:39 -0000 1.6 --- BaseSQLTab.java 28 Apr 2007 18:38:42 -0000 1.7 *************** *** 34,39 **** import net.sourceforge.squirrel_sql.fw.datasetviewer.MapDataSet; import net.sourceforge.squirrel_sql.fw.datasetviewer.ResultSetDataSet; - import net.sourceforge.squirrel_sql.fw.util.StringManager; - import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory; import net.sourceforge.squirrel_sql.fw.util.log.ILogger; import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; --- 34,37 ---- *************** *** 55,62 **** private final static ILogger s_log = LoggerController.createLogger(BaseSQLTab.class); - - /** Internationalized strings for this class. */ - private static final StringManager s_stringMgr = - StringManagerFactory.getStringManager(BaseSQLTab.class); public BaseSQLTab(String title, String hint) --- 53,56 ---- *************** *** 105,109 **** if (_comp == null) { ! _comp = new DataSetScrollingPanel(); } return _comp; --- 99,111 ---- 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; *************** *** 126,132 **** try { ! final SessionProperties props = session.getProperties(); ! final String destClassName = props.getMetaDataOutputClassName(); ! _comp.load(createDataSetFromResultSet(rs), destClassName); } finally --- 128,132 ---- try { ! _comp.load(createDataSetFromResultSet(rs)); } finally *************** *** 142,164 **** catch (SQLException ex) { ! // 1385270 (Dropping multiple selected tables produces exceptions) ! // ! // This exception is thrown when a group of tables is dropped in a ! // MySQL session and the MySQL Columns or MySQL Indexes tab was the ! // last tab selected. For now, just log the error, don't show it ! // in the status until we figure out where the race condition is that ! // causes the tab to get refreshed against a table that was just ! // dropped. There may be other valid reasons for an exception here, ! // so we can't just squelch it. ! // TODO: Figure out where the race condition is that causes the tab ! // to get refreshed against a table that was just dropped. When we ! // have solved that, then put the following line back in and remove ! // the error logging here: ! // ! // throw new DataSetException(ex); ! ! // i18n[mysql.error.refreshcomponent=Unable to refresh MySQL plugin tab ! String msg = s_stringMgr.getString("mysql.error.refreshcomponent"); ! s_log.error(msg, ex); } } --- 142,146 ---- catch (SQLException ex) { ! throw new DataSetException(ex); } } *************** *** 178,182 **** final int columnCount = rsds.getColumnCount(); final ColumnDisplayDefinition[] colDefs = rsds.getDataSetDefinition().getColumnDefinitions(); ! final Map data = new HashMap(); if (rsds.next(null)) { --- 160,164 ---- final int columnCount = rsds.getColumnCount(); final ColumnDisplayDefinition[] colDefs = rsds.getDataSetDefinition().getColumnDefinitions(); ! final Map<String, Object> data = new HashMap<String, Object>(); if (rsds.next(null)) { |