SQuirreL SQL Client

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

Modified Files:
	SQLPanel.java 
Log Message:
Size of message panel can be saved. 
Show tabbed ExecutorPanel only when there is more then one executor (mor thane one executor is not yet implemented)

Index: SQLPanel.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLPanel.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** SQLPanel.java	23 Apr 2005 17:23:36 -0000	1.26
--- SQLPanel.java	26 Apr 2005 00:53:58 -0000	1.27
***************
*** 23,30 ****
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
! import java.awt.BorderLayout;
! import java.awt.Dimension;
! import java.awt.FontMetrics;
! import java.awt.Insets;
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
--- 23,27 ----
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
! import java.awt.*;
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
***************
*** 140,144 ****
--- 137,150 ----
  
  	/** Each tab is a <TT>ExecuterTab</TT> showing an installed executer. */
+ 
+    /**
+     * Is the bottom component of the split.
+     * Holds the _simpleExecuterPanel if there is just one entry in _executors,
+     * holds the _tabbedExecuterPanel if there is more that one element in _executors, 
+     */
+    private JPanel _executerPanleHolder;
+ 
  	private JTabbedPane _tabbedExecuterPanel;
+ 	private JPanel _simpleExecuterPanel;
  
  	private boolean _hasBeenVisible = false;
***************
*** 162,166 ****
  	private final DataEntryAreaCaretListener _dataEntryCaretListener = new DataEntryAreaCaretListener();
  
! 	private final List executors = new ArrayList();
  
  	private SQLResultExecuterPanel _sqlExecPanel;
--- 168,172 ----
  	private final DataEntryAreaCaretListener _dataEntryCaretListener = new DataEntryAreaCaretListener();
  
! 	private final List _executors = new ArrayList();
  
  	private SQLResultExecuterPanel _sqlExecPanel;
***************
*** 228,234 ****
  	public void addExecutor(ISQLResultExecuter exec)
  	{
! 		executors.add(exec);
  
- 		_tabbedExecuterPanel.addTab(exec.getTitle(), null, exec.getComponent(), exec.getTitle());
  		this.fireExecuterTabAdded(exec);
  	}
--- 234,263 ----
  	public void addExecutor(ISQLResultExecuter exec)
  	{
! 		_executors.add(exec);
! 
!       if(1 == _executors.size())
!       {
!          _executerPanleHolder.remove(_tabbedExecuterPanel);
!          _executerPanleHolder.add(_simpleExecuterPanel);
!       }
!       else if(2 == _executors.size())
!       {
!          _executerPanleHolder.remove(_simpleExecuterPanel);
!          _executerPanleHolder.add(_tabbedExecuterPanel);
!          _executors.get(0);
!          ISQLResultExecuter buf = (ISQLResultExecuter) _executors.get(0);
!          _tabbedExecuterPanel.addTab(buf.getTitle(), null, buf.getComponent(), buf.getTitle());
!       }
! 
! 
!       if( 1 < _executors.size())
!       {
!          _tabbedExecuterPanel.addTab(exec.getTitle(), null, exec.getComponent(), exec.getTitle());
!       }
!       else
!       {
!          _simpleExecuterPanel.add(exec.getComponent());
!       }
  
  		this.fireExecuterTabAdded(exec);
  	}
***************
*** 236,240 ****
  	public void removeExecutor(ISQLResultExecuter exec)
  	{
! 		executors.remove(exec);
  	}
  
--- 265,269 ----
  	public void removeExecutor(ISQLResultExecuter exec)
  	{
! 		_executors.remove(exec);
  	}
  
***************
*** 461,467 ****
  	public void runCurrentExecuter()
  	{
! 		int selectedIndex = _tabbedExecuterPanel.getSelectedIndex();
! 		ISQLResultExecuter exec = (ISQLResultExecuter)executors.get(selectedIndex);
! 		exec.execute(_sqlEntry);
  	}
  
--- 490,504 ----
  	public void runCurrentExecuter()
  	{
!       if(1 == _executors.size())
!       {
!          ISQLResultExecuter exec = (ISQLResultExecuter) _executors.get(0);
!          exec.execute(_sqlEntry);
!       }
!       else
!       {
!          int selectedIndex = _tabbedExecuterPanel.getSelectedIndex();
!          ISQLResultExecuter exec = (ISQLResultExecuter)_executors.get(selectedIndex);
!          exec.execute(_sqlEntry);
!       }
  	}
  
***************
*** 1200,1204 ****
  		installSQLEntryPanel(app.getSQLEntryPanelFactory().createSQLEntryPanel(_session));
  //		_splitPane.add(_tabbedResultsPanel, JSplitPane.RIGHT);
! 		_splitPane.add(_tabbedExecuterPanel, JSplitPane.RIGHT);
  
  		add(_splitPane, BorderLayout.CENTER);
--- 1237,1246 ----
  		installSQLEntryPanel(app.getSQLEntryPanelFactory().createSQLEntryPanel(_session));
  //		_splitPane.add(_tabbedResultsPanel, JSplitPane.RIGHT);
! //		_splitPane.add(_tabbedExecuterPanel, JSplitPane.RIGHT);
! 
!       _executerPanleHolder = new JPanel(new GridLayout(1,1));
!       _simpleExecuterPanel = new JPanel(new GridLayout(1,1));
!       _executerPanleHolder.add(_simpleExecuterPanel);
!       _splitPane.add(_executerPanleHolder, JSplitPane.RIGHT);
  
  		add(_splitPane, BorderLayout.CENTER);
***************
*** 1234,1238 ****
  			if (index != -1)
  			{
! 				fireExecuterTabActivated((ISQLResultExecuter)executors.get(index));
  			}
  		}
--- 1276,1280 ----
  			if (index != -1)
  			{
! 				fireExecuterTabActivated((ISQLResultExecuter)_executors.get(index));
  			}
  		}