From: Nathaniel G. A. <nat...@us...> - 2004-08-16 23:13:09
|
Update of /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/properties In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24583/src/java/org/krysalis/jcharts/properties Modified Files: PieChart2DProperties.java ScatterPlotProperties.java LegendProperties.java StockChartProperties.java PointChartProperties.java LineChartProperties.java Log Message: make Stroke constants transient so could Object could be Serialized Index: StockChartProperties.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/properties/StockChartProperties.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StockChartProperties.java 8 Aug 2003 08:51:27 -0000 1.2 --- StockChartProperties.java 16 Aug 2004 23:10:45 -0000 1.3 *************** *** 50,54 **** public final class StockChartProperties extends AxisChartTypeProperties { ! public static final Stroke DEFAULT_STROKE= new BasicStroke( 1.5f ); private Stroke hiLowStroke; --- 50,54 ---- public final class StockChartProperties extends AxisChartTypeProperties { ! public static transient final Stroke DEFAULT_STROKE= new BasicStroke( 1.5f ); private Stroke hiLowStroke; Index: LegendProperties.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/properties/LegendProperties.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LegendProperties.java 5 Jul 2003 13:23:50 -0000 1.3 --- LegendProperties.java 16 Aug 2004 23:10:45 -0000 1.4 *************** *** 53,57 **** public static final Font DEFAULT_FONT = new Font( "Serif", Font.PLAIN, 12 ); public static final Paint DEFAULT_FONT_PAINT = Color.black; ! public static final Stroke DEFAULT_ICON_BORDER_STROKE = new BasicStroke( 1.0f ); public static final Paint DEFAULT_ICON_BORDER_PAINT = Color.black; --- 53,57 ---- public static final Font DEFAULT_FONT = new Font( "Serif", Font.PLAIN, 12 ); public static final Paint DEFAULT_FONT_PAINT = Color.black; ! public static transient final Stroke DEFAULT_ICON_BORDER_STROKE = new BasicStroke( 1.0f ); public static final Paint DEFAULT_ICON_BORDER_PAINT = Color.black; Index: ScatterPlotProperties.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/properties/ScatterPlotProperties.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScatterPlotProperties.java 17 May 2003 17:00:39 -0000 1.1 --- ScatterPlotProperties.java 16 Aug 2004 23:10:45 -0000 1.2 *************** *** 49,53 **** final public class ScatterPlotProperties extends AxisChartTypeProperties { ! public static final Stroke DEFAULT_LINE_STROKE=new BasicStroke( 1.5f ); private Stroke[] lineStrokes; --- 49,53 ---- final public class ScatterPlotProperties extends AxisChartTypeProperties { ! public static transient final Stroke DEFAULT_LINE_STROKE=new BasicStroke( 1.5f ); private Stroke[] lineStrokes; Index: PointChartProperties.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/properties/PointChartProperties.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PointChartProperties.java 17 May 2003 17:00:36 -0000 1.1 --- PointChartProperties.java 16 Aug 2004 23:10:45 -0000 1.2 *************** *** 51,55 **** final public class PointChartProperties extends AxisChartTypeProperties { ! public final static Stroke DEFAULT_POINT_BORDER_STROKE = new BasicStroke( 1.0f ); public final static Shape SHAPE_SQUARE = new Rectangle2D.Double( 0, 0, 10, 10 ); --- 51,55 ---- final public class PointChartProperties extends AxisChartTypeProperties { ! public final transient static Stroke DEFAULT_POINT_BORDER_STROKE = new BasicStroke( 1.0f ); public final static Shape SHAPE_SQUARE = new Rectangle2D.Double( 0, 0, 10, 10 ); Index: PieChart2DProperties.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/properties/PieChart2DProperties.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PieChart2DProperties.java 31 May 2004 16:31:07 -0000 1.4 --- PieChart2DProperties.java 16 Aug 2004 23:10:45 -0000 1.5 *************** *** 51,62 **** public class PieChart2DProperties extends ChartTypeProperties implements HTMLTestable { - /* - public static final Paint DEFAULT_BORDER_PAINT = Color.black; - public static final Stroke DEFAULT_BORDER_STROKE = new BasicStroke( 1.5f, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_ROUND ); - - private Paint borderPaint = DEFAULT_BORDER_PAINT; - private Stroke borderStroke = DEFAULT_BORDER_STROKE; - */ - private ChartStroke borderChartStroke= ChartStroke.DEFAULT_PIE_OUTLINE; --- 51,54 ---- Index: LineChartProperties.java =================================================================== RCS file: /cvsroot/jcharts/krysalis-jcharts/src/java/org/krysalis/jcharts/properties/LineChartProperties.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** LineChartProperties.java 1 Jul 2004 01:49:34 -0000 1.3 --- LineChartProperties.java 16 Aug 2004 23:10:45 -0000 1.4 *************** *** 55,62 **** private static final float DASH_DOT[] = {5.0f, 1.0f}; ! public static final Stroke DEFAULT_LINE_STROKE=new BasicStroke( 1.5f ); ! public static final Stroke DOT_LINE_STROKE = new BasicStroke(1f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, DOT[0], DOT , 0.0f); ! public static final Stroke DASHED_LINE_STROKE = new BasicStroke(1f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, DASH[0], DASH , 0.0f); ! public static final Stroke DASH_DOT_LINE_STROKE = new BasicStroke(1f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 1.0f, DASH_DOT , 0.0f); private Stroke[] lineStrokes; --- 55,62 ---- private static final float DASH_DOT[] = {5.0f, 1.0f}; ! public static transient final Stroke DEFAULT_LINE_STROKE=new BasicStroke( 1.5f ); ! public static transient final Stroke DOT_LINE_STROKE = new BasicStroke(1f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, DOT[0], DOT , 0.0f); ! public static transient final Stroke DASHED_LINE_STROKE = new BasicStroke(1f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, DASH[0], DASH , 0.0f); ! public static transient final Stroke DASH_DOT_LINE_STROKE = new BasicStroke(1f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 1.0f, DASH_DOT , 0.0f); private Stroke[] lineStrokes; |