krysalis-jcharts/src/java/org/krysalis/jcharts/designer/buttonBar ChartCombo.java,NONE,1.1 ButtonPanel.java,1.1,1.2

[Nathaniel G. A. <nat...@us...>]

Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/buttonBar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13107/src/java/org/krysalis/jcharts/designer/buttonBar

Modified Files:
	ButtonPanel.java 
Added Files:
	ChartCombo.java 
Log Message:


Index: ButtonPanel.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/buttonBar/ButtonPanel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ButtonPanel.java	9 Aug 2003 17:03:46 -0000	1.1
--- ButtonPanel.java	23 Jun 2004 02:13:42 -0000	1.2
***************
*** 37,43 ****
  
  
  import org.krysalis.jcharts.designer.tabs.LowerHalfPanel;
  
- import javax.swing.*;
  
  
--- 37,47 ----
  
  
+ import javax.swing.BorderFactory;
+ import javax.swing.Box;
+ import javax.swing.BoxLayout;
+ import javax.swing.JPanel;
+ 
  import org.krysalis.jcharts.designer.tabs.LowerHalfPanel;
  
  
  
***************
*** 50,55 ****
  {
  	private LowerHalfPanel lowerHalfPanel;
- 	private RefreshChartButton refreshChartButton;
  
  
  	/*************************************************************************
--- 54,61 ----
  {
  	private LowerHalfPanel lowerHalfPanel;
  
+ 	private RefreshChartButton refreshChartButton;
+ 	private ChartCombo chartCombo;
+ 	
  
  	/*************************************************************************
***************
*** 59,70 ****
  	public ButtonPanel( LowerHalfPanel lowerHalfPanel )
  	{
- 		super();
- 
  		this.lowerHalfPanel = lowerHalfPanel;
  
  		super.setBorder( BorderFactory.createEmptyBorder( 5, 5, 0, 5 ) );
- 
  		super.setLayout( new BoxLayout( this, BoxLayout.X_AXIS ) );
  
  		//---force button to the right
  		super.add( Box.createHorizontalGlue() );
--- 65,76 ----
  	public ButtonPanel( LowerHalfPanel lowerHalfPanel )
  	{
  		this.lowerHalfPanel = lowerHalfPanel;
  
  		super.setBorder( BorderFactory.createEmptyBorder( 5, 5, 0, 5 ) );
  		super.setLayout( new BoxLayout( this, BoxLayout.X_AXIS ) );
  
+ 		this.chartCombo= new ChartCombo();
+ 		super.add( this.chartCombo );
+ 		
  		//---force button to the right
  		super.add( Box.createHorizontalGlue() );

--- NEW FILE: ChartCombo.java ---
/***********************************************************************************************
 * Copyright 2002 (C) Nathaniel G. Auvil. All Rights Reserved.
 *
 * Redistribution and use of this software and associated documentation ("Software"), with or
 * without modification, are permitted provided that the following conditions are met:
 *
 * 1. Redistributions of source code must retain copyright statements and notices.
 * 	Redistributions must also contain a copy of this document.
 *
 * 2. Redistributions in binary form must reproduce the above copyright notice, this list of
 * 	conditions and the following disclaimer in the documentation and/or other materials
 * 	provided with the distribution.
 *
 * 3. The name "jCharts" or "Nathaniel G. Auvil" must not be used to endorse or promote
 * 	products derived from this Software without prior written permission of Nathaniel G.
 * 	Auvil.  For written permission, please contact nat...@us...
 *
 * 4. Products derived from this Software may not be called "jCharts" nor may "jCharts" appear
 * 	in their names without prior written permission of Nathaniel G. Auvil. jCharts is a
 * 	registered trademark of Nathaniel G. Auvil.
 *
 * 5. Due credit should be given to the jCharts Project (http://jcharts.sourceforge.net/).
 *
 * THIS SOFTWARE IS PROVIDED BY Nathaniel G. Auvil AND CONTRIBUTORS ``AS IS'' AND ANY
 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
 * jCharts OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
 ************************************************************************************************/


package org.krysalis.jcharts.designer.buttonBar;


import org.krysalis.jcharts.designer.common.LabelledCombo;


/*************************************************************************************
 *
 * @author Nathaniel Auvil
 * @version $Id: ChartCombo.java,v 1.1 2004/06/23 02:13:42 nathaniel_auvil Exp $
 ************************************************************************************/
public class ChartCombo extends LabelledCombo
{
	private static final String[] CHARTS= { "Pie Chart 2D", "Pie Chart 3D" };
	

	/*************************************************************************
	 *
	 ************************************************************************/
	public ChartCombo()
	{
		super( "Chart To Render", CHARTS );
	}


}