krysalis-jcharts/src/java/org/krysalis/jcharts/designer/tabs/allChart/legendProperties PlacementCombo.java,NONE,1.1 LegendPropertiesTab.java,1.1,1.2 Padding.java,1.1,1.2

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

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

Modified Files:
	LegendPropertiesTab.java Padding.java 
Added Files:
	PlacementCombo.java 
Log Message:


Index: LegendPropertiesTab.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/tabs/allChart/legendProperties/LegendPropertiesTab.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LegendPropertiesTab.java	9 Jun 2004 01:46:53 -0000	1.1
--- LegendPropertiesTab.java	10 Jun 2004 12:03:51 -0000	1.2
***************
*** 46,50 ****
  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.LegendProperties;
  import org.krysalis.jcharts.properties.util.ChartStroke;
--- 46,49 ----
***************
*** 69,74 ****
  	//private int iconLineStrokeLength = 20;
  
! 	//---where Legend should be drawn in relation to the chart.
! 	//private int placement = BOTTOM;
  	
  	
--- 68,72 ----
  	//private int iconLineStrokeLength = 20;
  
! 	private PlacementCombo placementCombo;
  	
  	
***************
*** 101,104 ****
--- 99,110 ----
  		jPanel.add( this.iconBorderStroke );
  		
+ 		
+ 		JPanel placement= new JPanel();
+ 		placement.setBorder( BorderFactory.createTitledBorder( "Placement" ) );
+ 		this.placementCombo= new PlacementCombo();
+ 		placement.add( this.placementCombo );
+ 		jPanel.add( placement );
+ 		
+ 		
  		super.setViewportView( jPanel );
  	}
***************
*** 126,129 ****
--- 132,137 ----
  		legendProperties.setIconBorderStroke( chartStroke.getStroke() );
  		legendProperties.setIconBorderPaint( chartStroke.getPaint() );
+ 		
+ 		legendProperties.setPlacement( this.placementCombo.getSelectedIndex() );
  	}
  }

--- NEW FILE: PlacementCombo.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.tabs.allChart.legendProperties;


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


/*****************************************************************************************
 * 
 * @author Nathaniel Auvil
 * @version $Id: PlacementCombo.java,v 1.1 2004/06/10 12:03:51 nathaniel_auvil Exp $
 ****************************************************************************************/
class PlacementCombo extends LabelledCombo
{
	private static String[] ALL_PLACEMENTS;
	static
	{
		ALL_PLACEMENTS = new String[] { "Bottom", "Right", "Left", "Top" };
	}


	/***************************************************************************************
	 *  
	 **************************************************************************************/
	public PlacementCombo()
	{
		super( "Placement", ALL_PLACEMENTS );
	}

}
Index: Padding.java
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/designer/tabs/allChart/legendProperties/Padding.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Padding.java	9 Jun 2004 01:46:53 -0000	1.1
--- Padding.java	10 Jun 2004 12:03:51 -0000	1.2
***************
*** 71,75 ****
  		
  		this.column = new LabelledTextfield( "Column", 3 );
! 		this.column.setText( Float.toString( 5 ) );
  		this.add( this.column );
  		
--- 71,75 ----
  		
  		this.column = new LabelledTextfield( "Column", 3 );
! 		this.column.setText( Float.toString( 10 ) );
  		this.add( this.column );