Thread: [Squirrel-sql-commits] sql12/plugins/informix/src/net/sourceforge/squirrel_sql/plugins/informix/exc
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Rob M. <man...@us...> - 2007-09-17 01:48:40
|
Update of /cvsroot/squirrel-sql/sql12/plugins/informix/src/net/sourceforge/squirrel_sql/plugins/informix/exception In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11739/plugins/informix/src/net/sourceforge/squirrel_sql/plugins/informix/exception Modified Files: InformixExceptionFormatter.java Log Message: Be sure to register as a session listener (and unregister when appropriate) so that any new SQLConnections can be saved for future use. Index: InformixExceptionFormatter.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/informix/src/net/sourceforge/squirrel_sql/plugins/informix/exception/InformixExceptionFormatter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** InformixExceptionFormatter.java 17 Sep 2007 00:01:08 -0000 1.1 --- InformixExceptionFormatter.java 17 Sep 2007 01:48:37 -0000 1.2 *************** *** 88,91 **** --- 88,92 ---- session.getSQLPanelAPIOfActiveSessionWindow().getSQLEntryPanel(); this._session = session; + session.getApplication().getSessionManager().addSessionListener(this); } *************** *** 96,100 **** StringBuilder msg = new StringBuilder(); msg.append(defaultFormatter.format(t)); ! if (sqlcon != null) { String offset = getSqlErrorOffset(); msg.append("\n"); --- 97,101 ---- StringBuilder msg = new StringBuilder(); msg.append(defaultFormatter.format(t)); ! if (sqlcon != null && sqlcon.getConnection() != null) { String offset = getSqlErrorOffset(); msg.append("\n"); *************** *** 109,114 **** sqlEntryPanel.setCaretPosition(newPosition); } ! } ! } return msg.toString(); --- 110,116 ---- sqlEntryPanel.setCaretPosition(newPosition); } ! } ! } else { ! msg.append(i18n.NOT_AVAILABLE_MSG); } return msg.toString(); *************** *** 176,181 **** --- 178,185 ---- */ public void allSessionsClosed() { + _session.getApplication().getSessionManager().removeSessionListener(this); _session = null; sqlcon = null; + } *************** *** 219,222 **** --- 223,227 ---- public void sessionClosed(SessionEvent evt) { if (evt.getSession() == _session) { + _session.getApplication().getSessionManager().removeSessionListener(this); _session = null; sqlcon = null; *************** *** 229,232 **** --- 234,238 ---- public void sessionClosing(SessionEvent evt) { if (evt.getSession() == _session) { + _session.getApplication().getSessionManager().removeSessionListener(this); _session = null; sqlcon = null; |