Menu
▾
▴
[Jfreechart-commit] SF.net SVN: jfreechart:[1444] trunk/source/org/jfree/chart
|
From: <mu...@us...> - 2008-09-01 20:35:25
|
Revision: 1444
http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1444&view=rev
Author: mungady
Date: 2008-09-01 20:35:23 +0000 (Mon, 01 Sep 2008)
Log Message:
-----------
Kill some tabs.
Modified Paths:
--------------
trunk/source/org/jfree/chart/ChartFactory.java
trunk/source/org/jfree/chart/ChartPanel.java
trunk/source/org/jfree/chart/ChartTheme.java
trunk/source/org/jfree/chart/ChartUtilities.java
trunk/source/org/jfree/chart/LegendItem.java
Modified: trunk/source/org/jfree/chart/ChartFactory.java
===================================================================
--- trunk/source/org/jfree/chart/ChartFactory.java 2008-09-01 20:32:55 UTC (rev 1443)
+++ trunk/source/org/jfree/chart/ChartFactory.java 2008-09-01 20:35:23 UTC (rev 1444)
@@ -223,38 +223,38 @@
public abstract class ChartFactory {
/** The chart theme. */
- private static ChartTheme currentTheme = new StandardChartTheme("JFree");
+ private static ChartTheme currentTheme = new StandardChartTheme("JFree");
- /**
- * Returns the current chart theme used by the factory.
- *
- * @return The chart theme.
- *
- * @see #setChartTheme(ChartTheme)
- * @see ChartUtilities#applyCurrentTheme(JFreeChart)
- *
- * @since 1.0.11
- */
- public static ChartTheme getChartTheme() {
- return currentTheme;
- }
+ /**
+ * Returns the current chart theme used by the factory.
+ *
+ * @return The chart theme.
+ *
+ * @see #setChartTheme(ChartTheme)
+ * @see ChartUtilities#applyCurrentTheme(JFreeChart)
+ *
+ * @since 1.0.11
+ */
+ public static ChartTheme getChartTheme() {
+ return currentTheme;
+ }
- /**
- * Sets the current chart theme. This will be applied to all new charts
- * as they are created.
- *
- * @param theme the theme (<code>null</code> not permitted).
- *
- * @see #getChartTheme()
- *
- * @since 1.0.11
- */
- public static void setChartTheme(ChartTheme theme) {
- if (theme == null) {
- throw new IllegalArgumentException("Null 'theme' argument.");
- }
- currentTheme = theme;
- }
+ /**
+ * Sets the current chart theme. This will be applied to all new charts
+ * as they are created.
+ *
+ * @param theme the theme (<code>null</code> not permitted).
+ *
+ * @see #getChartTheme()
+ *
+ * @since 1.0.11
+ */
+ public static void setChartTheme(ChartTheme theme) {
+ if (theme == null) {
+ throw new IllegalArgumentException("Null 'theme' argument.");
+ }
+ currentTheme = theme;
+ }
/**
* Creates a pie chart with default settings.
@@ -282,7 +282,7 @@
plot.setToolTipGenerator(new StandardPieToolTipGenerator(locale));
}
JFreeChart chart = new JFreeChart(title, JFreeChart.DEFAULT_TITLE_FONT,
- plot, legend);
+ plot, legend);
currentTheme.apply(chart);
return chart;
@@ -318,7 +318,7 @@
plot.setURLGenerator(new StandardPieURLGenerator());
}
JFreeChart chart = new JFreeChart(title, JFreeChart.DEFAULT_TITLE_FONT,
- plot, legend);
+ plot, legend);
currentTheme.apply(chart);
return chart;
}
@@ -594,7 +594,7 @@
plot.setToolTipGenerator(new StandardPieToolTipGenerator(locale));
}
JFreeChart chart = new JFreeChart(title, JFreeChart.DEFAULT_TITLE_FONT,
- plot, legend);
+ plot, legend);
currentTheme.apply(chart);
return chart;
}
@@ -629,7 +629,7 @@
plot.setURLGenerator(new StandardPieURLGenerator());
}
JFreeChart chart = new JFreeChart(title, JFreeChart.DEFAULT_TITLE_FONT,
- plot, legend);
+ plot, legend);
currentTheme.apply(chart);
return chart;
@@ -709,7 +709,7 @@
plot.setToolTipGenerator(new StandardPieToolTipGenerator(locale));
}
JFreeChart chart = new JFreeChart(title, JFreeChart.DEFAULT_TITLE_FONT,
- plot, legend);
+ plot, legend);
currentTheme.apply(chart);
return chart;
@@ -743,7 +743,7 @@
plot.setURLGenerator(new StandardPieURLGenerator());
}
JFreeChart chart = new JFreeChart(title, JFreeChart.DEFAULT_TITLE_FONT,
- plot, legend);
+ plot, legend);
currentTheme.apply(chart);
return chart;
@@ -2131,7 +2131,7 @@
CategoryPlot plot = new CategoryPlot(dataset, categoryAxis, valueAxis,
renderer);
JFreeChart chart = new JFreeChart(title, JFreeChart.DEFAULT_TITLE_FONT,
- plot, legend);
+ plot, legend);
currentTheme.apply(chart);
return chart;
}
@@ -2161,7 +2161,7 @@
XYBoxAndWhiskerRenderer renderer = new XYBoxAndWhiskerRenderer(10.0);
XYPlot plot = new XYPlot(dataset, timeAxis, valueAxis, renderer);
JFreeChart chart = new JFreeChart(title, JFreeChart.DEFAULT_TITLE_FONT,
- plot, legend);
+ plot, legend);
currentTheme.apply(chart);
return chart;
Modified: trunk/source/org/jfree/chart/ChartPanel.java
===================================================================
--- trunk/source/org/jfree/chart/ChartPanel.java 2008-09-01 20:32:55 UTC (rev 1443)
+++ trunk/source/org/jfree/chart/ChartPanel.java 2008-09-01 20:35:23 UTC (rev 1444)
@@ -1927,7 +1927,7 @@
Zoomable z = (Zoomable) p;
// we need to guard against this.zoomPoint being null
Point2D zp = (this.zoomPoint != null
- ? this.zoomPoint : new Point());
+ ? this.zoomPoint : new Point());
z.zoomDomainAxes(0.0, this.info.getPlotInfo(), zp);
}
}
@@ -1941,7 +1941,7 @@
Zoomable z = (Zoomable) p;
// we need to guard against this.zoomPoint being null
Point2D zp = (this.zoomPoint != null
- ? this.zoomPoint : new Point());
+ ? this.zoomPoint : new Point());
z.zoomRangeAxes(0.0, this.info.getPlotInfo(), zp);
}
}
Modified: trunk/source/org/jfree/chart/ChartTheme.java
===================================================================
--- trunk/source/org/jfree/chart/ChartTheme.java 2008-09-01 20:32:55 UTC (rev 1443)
+++ trunk/source/org/jfree/chart/ChartTheme.java 2008-09-01 20:35:23 UTC (rev 1444)
@@ -53,11 +53,11 @@
*/
public interface ChartTheme {
- /**
- * Applies this theme to the supplied chart.
- *
- * @param chart the chart (<code>null</code> not permitted).
- */
+ /**
+ * Applies this theme to the supplied chart.
+ *
+ * @param chart the chart (<code>null</code> not permitted).
+ */
public void apply(JFreeChart chart);
}
Modified: trunk/source/org/jfree/chart/ChartUtilities.java
===================================================================
--- trunk/source/org/jfree/chart/ChartUtilities.java 2008-09-01 20:32:55 UTC (rev 1443)
+++ trunk/source/org/jfree/chart/ChartUtilities.java 2008-09-01 20:35:23 UTC (rev 1444)
@@ -107,18 +107,18 @@
*/
public abstract class ChartUtilities {
- /**
- * Applies the current theme to the specified chart. This method is
- * provided for convenience, the theme itself is stored in the
- * {@link ChartFactory} class.
- *
- * @param chart the chart (<code>null</code> not permitted).
- *
- * @since 1.0.11
- */
- public static void applyCurrentTheme(JFreeChart chart) {
- ChartFactory.getChartTheme().apply(chart);
- }
+ /**
+ * Applies the current theme to the specified chart. This method is
+ * provided for convenience, the theme itself is stored in the
+ * {@link ChartFactory} class.
+ *
+ * @param chart the chart (<code>null</code> not permitted).
+ *
+ * @since 1.0.11
+ */
+ public static void applyCurrentTheme(JFreeChart chart) {
+ ChartFactory.getChartTheme().apply(chart);
+ }
/**
* Writes a chart to an output stream in PNG format.
Modified: trunk/source/org/jfree/chart/LegendItem.java
===================================================================
--- trunk/source/org/jfree/chart/LegendItem.java 2008-09-01 20:32:55 UTC (rev 1443)
+++ trunk/source/org/jfree/chart/LegendItem.java 2008-09-01 20:35:23 UTC (rev 1444)
@@ -647,7 +647,7 @@
* @since 1.0.11
*/
public Font getLabelFont() {
- return this.labelFont;
+ return this.labelFont;
}
/**
@@ -658,7 +658,7 @@
* @since 1.0.11
*/
public void setLabelFont(Font font) {
- this.labelFont = font;
+ this.labelFont = font;
}
/**
@@ -669,7 +669,7 @@
* @since 1.0.11
*/
public Paint getLabelPaint() {
- return this.labelPaint;
+ return this.labelPaint;
}
/**
@@ -680,7 +680,7 @@
* @since 1.0.11
*/
public void setLabelPaint(Paint paint) {
- this.labelPaint = paint;
+ this.labelPaint = paint;
}
/**
@@ -764,10 +764,10 @@
* @since 1.0.11
*/
public void setFillPaint(Paint paint) {
- if (paint == null) {
- throw new IllegalArgumentException("Null 'paint' argument.");
- }
- this.fillPaint = paint;
+ if (paint == null) {
+ throw new IllegalArgumentException("Null 'paint' argument.");
+ }
+ this.fillPaint = paint;
}
/**
@@ -806,10 +806,10 @@
* @since 1.0.11
*/
public void setLinePaint(Paint paint) {
- if (paint == null) {
- throw new IllegalArgumentException("Null 'paint' argument.");
- }
- this.linePaint = paint;
+ if (paint == null) {
+ throw new IllegalArgumentException("Null 'paint' argument.");
+ }
+ this.linePaint = paint;
}
/**
@@ -829,10 +829,10 @@
* @since 1.0.11
*/
public void setOutlinePaint(Paint paint) {
- if (paint == null) {
- throw new IllegalArgumentException("Null 'paint' argument.");
- }
- this.outlinePaint = paint;
+ if (paint == null) {
+ throw new IllegalArgumentException("Null 'paint' argument.");
+ }
+ this.outlinePaint = paint;
}
/**
@@ -962,10 +962,10 @@
return false;
}
if (!ObjectUtilities.equal(this.labelFont, that.labelFont)) {
- return false;
+ return false;
}
if (!PaintUtilities.equal(this.labelPaint, that.labelPaint)) {
- return false;
+ return false;
}
return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|