krysalis-jcharts/src/java/org/krysalis/jcharts/designer/tabs/nonAxisChart NonAxisChartTabs.java,1.3,1.4 NonAxisChartDataTab.java,1.2,1.3

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

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

Modified Files:
	NonAxisChartTabs.java NonAxisChartDataTab.java 
Log Message:


Index: NonAxisChartTabs.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/tabs/nonAxisChart/NonAxisChartTabs.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NonAxisChartTabs.java	23 Jun 2004 02:15:56 -0000	1.3
--- NonAxisChartTabs.java	18 Jul 2004 21:19:11 -0000	1.4
***************
*** 39,42 ****
--- 39,43 ----
  
  import org.krysalis.jcharts.designer.tabs.TopLevelTabs;
+ import org.krysalis.jcharts.designer.tabs.nonAxisChart.data.DataTab;
  import org.krysalis.jcharts.designer.tabs.nonAxisChart.pie3d.PieChart3dTab;
  
***************
*** 51,55 ****
  	private TopLevelTabs topLevelTabs;
  
! 	private NonAxisChartDataTab nonAxisChartDataTab;
  	private PieChartTab pieChartTab;
  	private PieChart3dTab pieChart3dTab;
--- 52,56 ----
  	private TopLevelTabs topLevelTabs;
  
! 	private DataTab dataTab;
  	private PieChartTab pieChartTab;
  	private PieChart3dTab pieChart3dTab;
***************
*** 65,72 ****
  		this.topLevelTabs.addTab( "Non Axis Charts", this );
  
! 		this.nonAxisChartDataTab = new NonAxisChartDataTab( this );
  		this.pieChartTab = new PieChartTab( this );
  
! 		this.pieChart3dTab = new PieChart3dTab( this );
  		this.addTab( "Pie Chart 3D", this.pieChart3dTab );
  	}
--- 66,76 ----
  		this.topLevelTabs.addTab( "Non Axis Charts", this );
  
! 		this.dataTab = new DataTab();
! 		super.addTab( "Data", this.dataTab );
! 		
! 		//TODO
  		this.pieChartTab = new PieChartTab( this );
  
! 		this.pieChart3dTab = new PieChart3dTab();
  		this.addTab( "Pie Chart 3D", this.pieChart3dTab );
  	}

Index: NonAxisChartDataTab.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/tabs/nonAxisChart/NonAxisChartDataTab.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NonAxisChartDataTab.java	3 Jun 2004 00:59:02 -0000	1.2
--- NonAxisChartDataTab.java	18 Jul 2004 21:19:11 -0000	1.3
***************
*** 36,41 ****
  package org.krysalis.jcharts.designer.tabs.nonAxisChart;
  
  
! import javax.swing.*;
  
  
--- 36,42 ----
  package org.krysalis.jcharts.designer.tabs.nonAxisChart;
  
+ import javax.swing.JPanel;
  
! import org.krysalis.jcharts.designer.tabs.nonAxisChart.data.DataTab;
  
  
***************
*** 44,61 ****
   * @author Nathaniel Auvil
   * @version $Id$
   ***********************************************************************/
! public class NonAxisChartDataTab extends JPanel {
  
! 	private NonAxisChartTabs nonAxisChartTab;
  
  
  	/*******************************************************************************
  	 *
- 	 * @param nonAxisChartTab
  	 *******************************************************************************/
! 	public NonAxisChartDataTab( NonAxisChartTabs nonAxisChartTab ) {
! 		this.nonAxisChartTab= nonAxisChartTab;
! 
! 		nonAxisChartTab.addTab( "Data Set", this );
  
  		//this.add( new FontChooser( "Title Font" ) );
--- 45,62 ----
   * @author Nathaniel Auvil
   * @version $Id$
+  * @deprecated this Class should be deleted
   ***********************************************************************/
! public class NonAxisChartDataTab extends JPanel 
! {
  
! 	private DataTab dataTab;
  
  
  	/*******************************************************************************
  	 *
  	 *******************************************************************************/
! 	public NonAxisChartDataTab() 
! 	{
! 		this.dataTab= new DataTab();
  
  		//this.add( new FontChooser( "Title Font" ) );