[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6469] trunk/sql12
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: <wi...@us...> - 2011-11-05 09:40:02
|
Revision: 6469 http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6469&view=rev Author: wis775 Date: 2011-11-05 09:39:56 +0000 (Sat, 05 Nov 2011) Log Message: ----------- 3183001: ClassCastException occurs, when the first tab should be closed after running a query. Modified Paths: -------------- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java trunk/sql12/doc/src/main/resources/changes.txt Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java =================================================================== --- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java 2011-10-30 20:04:26 UTC (rev 6468) +++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLResultExecuterPanel.java 2011-11-05 09:39:56 UTC (rev 6469) @@ -501,13 +501,12 @@ private void closeTab(Component tab) { - if(tab instanceof ErrorPanel) + if(tab instanceof ResultTab) { - _tabbedExecutionsPanel.remove(tab); - } - else if(tab instanceof ResultTab) - { closeResultTab((ResultTab) tab); + }else{ + // Closing Tabs, where we not have any special things to do. e.g. ErrorPanle, CancelPanel. + _tabbedExecutionsPanel.remove(tab); } } @@ -787,7 +786,7 @@ return; } - closeResultTabAt(indexToReplace); + closeTabAt(indexToReplace); _tabbedExecutionsPanel.insertTab(tab.getTitle(), tabIcon, tab, tab.getViewableSqlString(), indexToReplace); } } @@ -798,15 +797,15 @@ while(props.getLimitSQLResultTabs() && props.getSqlResultTabLimit() < _tabbedExecutionsPanel.getTabCount()) { - closeResultTabAt(0); + closeTabAt(0); } } - private void closeResultTabAt(int index) + private void closeTabAt(int index) { Component selectedTab = _tabbedExecutionsPanel.getComponentAt(index); - closeResultTab((ResultTab) selectedTab); + closeTab(selectedTab); } Modified: trunk/sql12/doc/src/main/resources/changes.txt =================================================================== --- trunk/sql12/doc/src/main/resources/changes.txt 2011-10-30 20:04:26 UTC (rev 6468) +++ trunk/sql12/doc/src/main/resources/changes.txt 2011-11-05 09:39:56 UTC (rev 6469) @@ -129,6 +129,7 @@ Bug-fixes: +3183001: ClassCastException occurs, when the first tab should be closed after running a query. Hibernate Plugin: Fixed several bugs in the HQL results reading function concerning lazy loaded non collection attributes. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |