[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/sqlfilter SQLFilterSheet.java, 1.16, 1.17

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

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/sqlfilter
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13623/app/src/net/sourceforge/squirrel_sql/client/session/sqlfilter

Modified Files:
	SQLFilterSheet.java 
Log Message:
1761706 (Miscellaneous Java 5 Generics) from patch submitted by Bron Eubanks

Index: SQLFilterSheet.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/sqlfilter/SQLFilterSheet.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** SQLFilterSheet.java	9 Jun 2007 12:52:00 -0000	1.16
--- SQLFilterSheet.java	31 Jul 2007 01:01:24 -0000	1.17
***************
*** 69,74 ****
  public class SQLFilterSheet extends BaseSessionInternalFrame
  {
  
! 	/** Logger for this class. */
  	private static final ILogger s_log =
  		LoggerController.createLogger(SQLFilterSheet.class);
--- 69,75 ----
  public class SQLFilterSheet extends BaseSessionInternalFrame
  {
+     private static final long serialVersionUID = 1L;
  
!     /** Logger for this class. */
  	private static final ILogger s_log =
  		LoggerController.createLogger(SQLFilterSheet.class);
***************
*** 88,92 ****
  
  	/** A list of panels that make up this sheet. */
! 	private List _panels = new ArrayList();
  
  	/** A variable that contains a value that indicates which tab currently has focus. */
--- 89,93 ----
  
  	/** A list of panels that make up this sheet. */
! 	private List<ISQLFilterPanel> _panels = new ArrayList<ISQLFilterPanel>();
  
  	/** A variable that contains a value that indicates which tab currently has focus. */
***************
*** 157,163 ****
  					final boolean isDebug = s_log.isDebugEnabled();
  					long start = 0;
! 					for (Iterator it = _panels.iterator(); it.hasNext();)
  					{
! 						ISQLFilterPanel pnl = (ISQLFilterPanel)it.next();
  						if (isDebug)
  						{
--- 158,164 ----
  					final boolean isDebug = s_log.isDebugEnabled();
  					long start = 0;
! 					for (Iterator<ISQLFilterPanel> it = _panels.iterator(); it.hasNext();)
  					{
! 						ISQLFilterPanel pnl = it.next();
  						if (isDebug)
  						{
***************
*** 242,248 ****
  		final boolean isDebug = s_log.isDebugEnabled();
  		long start = 0;
! 		for (Iterator it = _panels.iterator(); it.hasNext();)
  		{
! 			ISQLFilterPanel pnl = (ISQLFilterPanel)it.next();
  			if (isDebug)
  			{
--- 243,249 ----
  		final boolean isDebug = s_log.isDebugEnabled();
  		long start = 0;
! 		for (Iterator<ISQLFilterPanel> it = _panels.iterator(); it.hasNext();)
  		{
! 			ISQLFilterPanel pnl = it.next();
  			if (isDebug)
  			{
***************
*** 280,285 ****
  	private void createGUI()
  	{
! 		SortedSet columnNames = new TreeSet();
! 		Map textColumns = new TreeMap();
  
  		setDefaultCloseOperation(DISPOSE_ON_CLOSE);
--- 281,286 ----
  	private void createGUI()
  	{
! 		SortedSet<String> columnNames = new TreeSet<String>();
! 		Map<String, Boolean> textColumns = new TreeMap<String, Boolean>();
  
  		setDefaultCloseOperation(DISPOSE_ON_CLOSE);
***************
*** 325,331 ****
  
  		JTabbedPane tabPane = UIFactory.getInstance().createTabbedPane();
! 		for (Iterator it = _panels.iterator(); it.hasNext();)
  		{
! 			ISQLFilterPanel pnl = (ISQLFilterPanel)it.next();
  			String pnlTitle = pnl.getTitle();
  			String hint = pnl.getHint();
--- 326,332 ----
  
  		JTabbedPane tabPane = UIFactory.getInstance().createTabbedPane();
! 		for (Iterator<ISQLFilterPanel> it = _panels.iterator(); it.hasNext();)
  		{
! 			ISQLFilterPanel pnl = it.next();
  			String pnlTitle = pnl.getTitle();
  			String hint = pnl.getHint();