krysalis-jcharts/src/java/org/krysalis/jcharts/designer/tabs/allChart AllChartTabs.java,1.1,1.2 ChartPropertiesTab.java,1.3,1.4

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

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

Modified Files:
	AllChartTabs.java ChartPropertiesTab.java 
Log Message:


Index: AllChartTabs.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/tabs/allChart/AllChartTabs.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AllChartTabs.java	9 Aug 2003 17:07:22 -0000	1.1
--- AllChartTabs.java	3 Jun 2004 00:57:58 -0000	1.2
***************
*** 41,50 ****
  
  
! /*************************************************************************************
!  *
   * @author Nathaniel Auvil
   * @version $Id$
!  ************************************************************************************/
! public class AllChartTabs extends JTabbedPane {
  
  	private TopLevelTabs topLevelTabs;
--- 41,51 ----
  
  
! /*****************************************************************************************
!  * 
   * @author Nathaniel Auvil
   * @version $Id$
!  ****************************************************************************************/
! public class AllChartTabs extends JTabbedPane
! {
  
  	private TopLevelTabs topLevelTabs;
***************
*** 52,71 ****
  
  
! 	/*******************************************************************************
! 	 *
  	 * @param topLevelTabs
! 	 ******************************************************************************/
! 	public AllChartTabs( TopLevelTabs topLevelTabs ) {
! 		this.topLevelTabs= topLevelTabs;
!       this.topLevelTabs.addTab( "All Charts", this );
  
!       this.allChartTabPanel= new ChartPropertiesTab( this );
  	}
  
  
- 
  	public ChartPropertiesTab getAllChartTabPanel()
  	{
  		return allChartTabPanel;
  	}
! }
--- 53,72 ----
  
  
! 	/***************************************************************************************
! 	 * 
  	 * @param topLevelTabs
! 	 **************************************************************************************/
! 	public AllChartTabs( TopLevelTabs topLevelTabs )
! 	{
! 		this.topLevelTabs = topLevelTabs;
! 		this.topLevelTabs.addTab( "All Charts", this );
  
! 		this.allChartTabPanel = new ChartPropertiesTab( this );
  	}
  
  
  	public ChartPropertiesTab getAllChartTabPanel()
  	{
  		return allChartTabPanel;
  	}
! }
\ No newline at end of file

Index: ChartPropertiesTab.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/tabs/allChart/ChartPropertiesTab.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ChartPropertiesTab.java	25 May 2004 01:03:04 -0000	1.3
--- ChartPropertiesTab.java	3 Jun 2004 00:57:58 -0000	1.4
***************
*** 33,45 ****
   ************************************************************************************************/
  
- 
  package org.krysalis.jcharts.designer.tabs.allChart;
  
  
  import javax.swing.JPanel;
  
  import org.krysalis.jcharts.designer.common.font.FontChooser;
  import org.krysalis.jcharts.designer.common.stroke.StrokeChooser;
  import org.krysalis.jcharts.designer.exceptions.DesignerException;
  import org.krysalis.jcharts.designer.tabs.allChart.items.EdgePadding;
  import org.krysalis.jcharts.properties.ChartProperties;
--- 33,52 ----
   ************************************************************************************************/
  
  package org.krysalis.jcharts.designer.tabs.allChart;
  
  
+ import java.awt.Color;
+ 
+ import javax.swing.BorderFactory;
+ import javax.swing.BoxLayout;
+ import javax.swing.JCheckBox;
  import javax.swing.JPanel;
+ import javax.swing.JScrollPane;
  
  import org.krysalis.jcharts.designer.common.font.FontChooser;
+ import org.krysalis.jcharts.designer.common.paint.PaintChooser;
  import org.krysalis.jcharts.designer.common.stroke.StrokeChooser;
  import org.krysalis.jcharts.designer.exceptions.DesignerException;
+ import org.krysalis.jcharts.designer.tabs.allChart.items.AntiAliasing;
  import org.krysalis.jcharts.designer.tabs.allChart.items.EdgePadding;
  import org.krysalis.jcharts.properties.ChartProperties;
***************
*** 51,55 ****
   * @version $Id$
   ************************************************************************************/
! public class ChartPropertiesTab extends JPanel
  {
  	private AllChartTabs allChartTabs;
--- 58,62 ----
   * @version $Id$
   ************************************************************************************/
! public class ChartPropertiesTab //extends JPanel
  {
  	private AllChartTabs allChartTabs;
***************
*** 58,62 ****
--- 65,72 ----
  	private StrokeChooser borderStroke;
  	private EdgePadding edgePadding;
+ 	private PaintChooser backgroundPaint;
+ 	private AntiAliasing antiAliasing;
  
+ 	private JScrollPane jScrollPane;
  
  	/************************************************************************************
***************
*** 66,82 ****
  	public ChartPropertiesTab( AllChartTabs allChartTabs )
  	{
- 		super();
  		this.allChartTabs = allChartTabs;
! 
! 		allChartTabs.addTab( "Chart Properties", this );
! 
  		this.titleFont= new FontChooser( "Title Font" );
! 		this.add( this.titleFont );
  
  		this.borderStroke= new StrokeChooser( "Border Stroke" );
! 		this.add( this.borderStroke );
  		
  		this.edgePadding= new EdgePadding( "Edge Padding" );
! 		this.add( this.edgePadding );
  	}
  
--- 76,106 ----
  	public ChartPropertiesTab( AllChartTabs allChartTabs )
  	{
  		this.allChartTabs = allChartTabs;
! 		
! 		JPanel jPanel= new JPanel();
! 		BoxLayout boxLayout= new BoxLayout( jPanel, BoxLayout.Y_AXIS );
! 		jPanel.setLayout( boxLayout );
! 		jScrollPane= new JScrollPane( jPanel );		
! 		
  		this.titleFont= new FontChooser( "Title Font" );
! 		jPanel.add( this.titleFont );
  
  		this.borderStroke= new StrokeChooser( "Border Stroke" );
! 		jPanel.add( this.borderStroke );
  		
  		this.edgePadding= new EdgePadding( "Edge Padding" );
! 		jPanel.add( this.edgePadding );
! 		
! 		JPanel background= new JPanel();
! 		background.setBorder( BorderFactory.createTitledBorder( "Background Paint" ) );
! 		this.backgroundPaint= new PaintChooser( false, Color.white, Color.black );
! 		background.add( this.backgroundPaint );
! 		jPanel.add( background );
! 		
! 		this.antiAliasing= new AntiAliasing();
! 		jPanel.add( this.antiAliasing );
! 		
! 		
! 		allChartTabs.addTab( "Chart Properties", jScrollPane );
  	}
  
***************
*** 92,97 ****
--- 116,124 ----
  		chartProperties.setBorderStroke( this.borderStroke.getChartStroke() );
  		chartProperties.setEdgePadding( this.edgePadding.getEdgePadding() );
+ 		chartProperties.setBackgroundPaint( this.backgroundPaint.getPaint() );
+ 		chartProperties.setUseAntiAliasing( this.antiAliasing.useAntiAliasing() );
  		
  		//TODO add more stuff
+ 		//validate?
  	}
  }