[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session SQLInternalFrame.java,1.7,1.8 SessionPanel.java,1.7,1.8

[Gerd W. <ger...@us...>]

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13369/app/src/net/sourceforge/squirrel_sql/client/gui/session

Modified Files:
	SQLInternalFrame.java SessionPanel.java 
Log Message:
Some little fixes and clean up.

Index: SessionPanel.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SessionPanel.java	8 May 2005 20:47:44 -0000	1.7
--- SessionPanel.java	10 May 2005 20:22:01 -0000	1.8
***************
*** 82,86 ****
  	private MyToolBar _toolBar;
  
! 	private Vector _externallyAddedToolbarActions = new Vector();
  
  	private StatusBar _statusBar = new StatusBar();
--- 82,86 ----
  	private MyToolBar _toolBar;
  
! 	private Vector _externallyAddedToolbarActionsAndSeparators = new Vector();
  
  	private StatusBar _statusBar = new StatusBar();
***************
*** 309,313 ****
  	public synchronized void addToToolbar(Action action)
  	{
! 		_externallyAddedToolbarActions.add(action);
  		if (null != _toolBar)
  		{
--- 309,313 ----
  	public synchronized void addToToolbar(Action action)
  	{
! 		_externallyAddedToolbarActionsAndSeparators.add(action);
  		if (null != _toolBar)
  		{
***************
*** 318,322 ****
     public synchronized void addSeparatorToToolbar()
     {
!       _toolBar.addSeparator();
     }
  
--- 318,326 ----
     public synchronized void addSeparatorToToolbar()
     {
!       _externallyAddedToolbarActionsAndSeparators.add(new SeparatorMarker());
!       if (null != _toolBar)
!       {
!          _toolBar.addSeparator();
!       }
     }
  
***************
*** 372,378 ****
  						{
  							_toolBar = new MyToolBar(session);
! 							for (int i = 0; i < _externallyAddedToolbarActions.size(); i++)
  							{
! 								_toolBar.add((Action)_externallyAddedToolbarActions.get(i));
  							}
  
--- 376,389 ----
  						{
  							_toolBar = new MyToolBar(session);
! 							for (int i = 0; i < _externallyAddedToolbarActionsAndSeparators.size(); i++)
  							{
!                         if(_externallyAddedToolbarActionsAndSeparators.get(i) instanceof Action)
!                         {
! 								   _toolBar.add((Action)_externallyAddedToolbarActionsAndSeparators.get(i));
!                         }
!                         else
!                         {
!                            _toolBar.addSeparator();
!                         }
  							}
  
***************
*** 620,622 ****
--- 631,638 ----
  		}
  	}
+ 
+    private static class SeparatorMarker
+    {
+ 
+    }
  }

Index: SQLInternalFrame.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/session/SQLInternalFrame.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SQLInternalFrame.java	8 May 2005 20:47:44 -0000	1.7
--- SQLInternalFrame.java	10 May 2005 20:22:00 -0000	1.8
***************
*** 152,156 ****
     public void addSeparatorToToolbar()
     {
!       _toolBar.addSeparator();
     }
  
--- 152,159 ----
     public void addSeparatorToToolbar()
     {
!       if (null != _toolBar)
!       {
!          _toolBar.addSeparator();
!       }
     }