Menu
▾
▴
[Jfreechart-commit] SF.net SVN: jfreechart: [1252] trunk/source/org/jfree/chart/axis
|
From: <mu...@us...> - 2008-06-26 12:10:21
|
Revision: 1252
http://jfreechart.svn.sourceforge.net/jfreechart/?rev=1252&view=rev
Author: mungady
Date: 2008-06-26 05:10:20 -0700 (Thu, 26 Jun 2008)
Log Message:
-----------
Whitespace.
Modified Paths:
--------------
trunk/source/org/jfree/chart/axis/DateAxis.java
trunk/source/org/jfree/chart/axis/DateTick.java
trunk/source/org/jfree/chart/axis/DateTickMarkPosition.java
trunk/source/org/jfree/chart/axis/ExtendedCategoryAxis.java
trunk/source/org/jfree/chart/axis/LogarithmicAxis.java
Modified: trunk/source/org/jfree/chart/axis/DateAxis.java
===================================================================
--- trunk/source/org/jfree/chart/axis/DateAxis.java 2008-06-26 12:07:13 UTC (rev 1251)
+++ trunk/source/org/jfree/chart/axis/DateAxis.java 2008-06-26 12:10:20 UTC (rev 1252)
@@ -2,32 +2,32 @@
* JFreeChart : a free chart library for the Java(tm) platform
* ===========================================================
*
- * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors.
*
* Project Info: http://www.jfree.org/jfreechart/index.html
*
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
*
- * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
* in the United States and other countries.]
*
* -------------
* DateAxis.java
* -------------
- * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors.
*
* Original Author: David Gilbert;
* Contributor(s): Jonathan Nash;
@@ -41,22 +41,22 @@
* --------------------------
* 23-Jun-2001 : Modified to work with null data source (DG);
* 18-Sep-2001 : Updated header (DG);
- * 27-Nov-2001 : Changed constructors from public to protected, updated Javadoc
+ * 27-Nov-2001 : Changed constructors from public to protected, updated Javadoc
* comments (DG);
- * 16-Jan-2002 : Added an optional crosshair, based on the implementation by
+ * 16-Jan-2002 : Added an optional crosshair, based on the implementation by
* Jonathan Nash (DG);
* 26-Feb-2002 : Updated import statements (DG);
* 22-Apr-2002 : Added a setRange() method (DG);
* 25-Jun-2002 : Removed redundant local variable (DG);
* 25-Jul-2002 : Changed order of parameters in ValueAxis constructor (DG);
- * 21-Aug-2002 : The setTickUnit() method now turns off auto-tick unit
+ * 21-Aug-2002 : The setTickUnit() method now turns off auto-tick unit
* selection (fix for bug id 528885) (DG);
- * 05-Sep-2002 : Updated the constructors to reflect changes in the Axis
+ * 05-Sep-2002 : Updated the constructors to reflect changes in the Axis
* class (DG);
* 18-Sep-2002 : Fixed errors reported by Checkstyle (DG);
- * 25-Sep-2002 : Added new setRange() methods, and deprecated
+ * 25-Sep-2002 : Added new setRange() methods, and deprecated
* setAxisRange() (DG);
- * 04-Oct-2002 : Changed auto tick selection to parallel number axis
+ * 04-Oct-2002 : Changed auto tick selection to parallel number axis
* classes (DG);
* 24-Oct-2002 : Added a date format override (DG);
* 08-Nov-2002 : Moved to new package com.jrefinery.chart.axis (DG);
@@ -65,10 +65,10 @@
* 15-Jan-2003 : Removed anchor date (DG);
* 20-Jan-2003 : Removed unnecessary constructors (DG);
* 26-Mar-2003 : Implemented Serializable (DG);
- * 02-May-2003 : Added additional units to createStandardDateTickUnits()
+ * 02-May-2003 : Added additional units to createStandardDateTickUnits()
* method, as suggested by mhilpert in bug report 723187 (DG);
* 13-May-2003 : Merged HorizontalDateAxis and VerticalDateAxis (DG);
- * 24-May-2003 : Added support for underlying timeline for
+ * 24-May-2003 : Added support for underlying timeline for
* SegmentedTimeline (BK);
* 16-Jul-2003 : Applied patch from Pawel Pabis to fix overlapping dates (DG);
* 22-Jul-2003 : Applied patch from Pawel Pabis for monthly ticks (DG);
@@ -80,35 +80,35 @@
* 17-Sep-2003 : Fixed a layout bug when multiple domain axes are used (DG);
* 29-Oct-2003 : Added workaround for font alignment in PDF output (DG);
* 07-Nov-2003 : Modified to use new tick classes (DG);
- * 12-Nov-2003 : Modified tick labelling to use roll unit from DateTickUnit
- * when a calculated tick value is hidden (which can occur in
+ * 12-Nov-2003 : Modified tick labelling to use roll unit from DateTickUnit
+ * when a calculated tick value is hidden (which can occur in
* segmented date axes) (DG);
- * 24-Nov-2003 : Fixed some problems with the auto tick unit selection, and
+ * 24-Nov-2003 : Fixed some problems with the auto tick unit selection, and
* fixed bug 846277 (labels missing for inverted axis) (DG);
- * 30-Dec-2003 : Fixed bug in refreshTicksHorizontal() when start of time unit
+ * 30-Dec-2003 : Fixed bug in refreshTicksHorizontal() when start of time unit
* (ex. 1st of month) was hidden, causing infinite loop (BK);
- * 13-Jan-2004 : Fixed bug in previousStandardDate() method (fix by Richard
+ * 13-Jan-2004 : Fixed bug in previousStandardDate() method (fix by Richard
* Wardle) (DG);
- * 21-Jan-2004 : Renamed translateJava2DToValue --> java2DToValue, and
- * translateValueToJava2D --> valueToJava2D (DG);
- * 12-Mar-2004 : Fixed bug where date format override is ignored for vertical
+ * 21-Jan-2004 : Renamed translateJava2DToValue --> java2DToValue, and
+ * translateValueToJava2D --> valueToJava2D (DG);
+ * 12-Mar-2004 : Fixed bug where date format override is ignored for vertical
* axis (DG);
* 16-Mar-2004 : Added plotState to draw() method (DG);
* 07-Apr-2004 : Changed string width calculation (DG);
- * 21-Apr-2004 : Fixed bug in estimateMaximumTickLabelWidth() method (bug id
+ * 21-Apr-2004 : Fixed bug in estimateMaximumTickLabelWidth() method (bug id
* 939148) (DG);
- * 11-Jan-2005 : Removed deprecated methods in preparation for 1.0.0
+ * 11-Jan-2005 : Removed deprecated methods in preparation for 1.0.0
* release (DG);
- * 13-Jan-2005 : Fixed bug (see
+ * 13-Jan-2005 : Fixed bug (see
* http://www.jfree.org/forum/viewtopic.php?t=11330) (DG);
- * 21-Apr-2005 : Replaced Insets with RectangleInsets, removed redundant
+ * 21-Apr-2005 : Replaced Insets with RectangleInsets, removed redundant
* argument from selectAutoTickUnit() (DG);
* ------------- JFREECHART 1.0.x ---------------------------------------------
* 10-Feb-2006 : Added some API doc comments in respect of bug 821046 (DG);
* 19-Apr-2006 : Fixed bug 1472942 in equals() method (DG);
* 25-Sep-2006 : Fixed bug 1564977 missing tick labels (DG);
* 15-Jan-2007 : Added get/setTimeZone() suggested by 'skunk' (DG);
- * 18-Jan-2007 : Fixed bug 1638678, time zone for calendar in
+ * 18-Jan-2007 : Fixed bug 1638678, time zone for calendar in
* previousStandardDate() (DG);
* 04-Apr-2007 : Use time zone in date calculations (CB);
* 19-Apr-2007 : Fix exceptions in setMinimum/MaximumDate() (DG);
@@ -118,7 +118,7 @@
* 02-Jul-2007 : Added entity support for axis labels (DG);
* 12-Jul-2007 : Updated for API changes in super class (DG);
* 21-Nov-2007 : Fixed warnings from FindBugs (DG);
- *
+ *
*/
package org.jfree.chart.axis;
@@ -152,28 +152,28 @@
import org.jfree.data.time.Year;
/**
- * The base class for axes that display dates. You will find it easier to
- * understand how this axis works if you bear in mind that it really
- * displays/measures integer (or long) data, where the integers are
- * milliseconds since midnight, 1-Jan-1970. When displaying tick labels, the
- * millisecond values are converted back to dates using a
+ * The base class for axes that display dates. You will find it easier to
+ * understand how this axis works if you bear in mind that it really
+ * displays/measures integer (or long) data, where the integers are
+ * milliseconds since midnight, 1-Jan-1970. When displaying tick labels, the
+ * millisecond values are converted back to dates using a
* <code>DateFormat</code> instance.
* <P>
- * You can also create a {@link org.jfree.chart.axis.Timeline} and supply in
- * the constructor to create an axis that only contains certain domain values.
- * For example, this allows you to create a date axis that only contains
+ * You can also create a {@link org.jfree.chart.axis.Timeline} and supply in
+ * the constructor to create an axis that only contains certain domain values.
+ * For example, this allows you to create a date axis that only contains
* working days.
*/
public class DateAxis extends ValueAxis implements Cloneable, Serializable {
/** For serialization. */
private static final long serialVersionUID = -1013460999649007604L;
-
+
/** The default axis range. */
public static final DateRange DEFAULT_DATE_RANGE = new DateRange();
/** The default minimum auto range size. */
- public static final double
+ public static final double
DEFAULT_AUTO_RANGE_MINIMUM_SIZE_IN_MILLISECONDS = 2.0;
/** The default date tick unit. */
@@ -189,14 +189,14 @@
/** The override date format. */
private DateFormat dateFormatOverride;
- /**
- * Tick marks can be displayed at the start or the middle of the time
- * period.
+ /**
+ * Tick marks can be displayed at the start or the middle of the time
+ * period.
*/
private DateTickMarkPosition tickMarkPosition = DateTickMarkPosition.START;
/**
- * A timeline that includes all milliseconds (as defined by
+ * A timeline that includes all milliseconds (as defined by
* <code>java.util.Date</code>) in the real time line.
*/
private static class DefaultTimeline implements Timeline, Serializable {
@@ -224,7 +224,7 @@
}
/**
- * Converts a timeline value into a millisecond (as encoded by
+ * Converts a timeline value into a millisecond (as encoded by
* <code>java.util.Date</code>).
*
* @param value the value.
@@ -236,7 +236,7 @@
}
/**
- * Returns <code>true</code> if the timeline includes the specified
+ * Returns <code>true</code> if the timeline includes the specified
* domain value.
*
* @param millisecond the millisecond.
@@ -248,7 +248,7 @@
}
/**
- * Returns <code>true</code> if the timeline includes the specified
+ * Returns <code>true</code> if the timeline includes the specified
* domain value.
*
* @param date the date.
@@ -260,7 +260,7 @@
}
/**
- * Returns <code>true</code> if the timeline includes the specified
+ * Returns <code>true</code> if the timeline includes the specified
* domain value range.
*
* @param from the start value.
@@ -273,7 +273,7 @@
}
/**
- * Returns <code>true</code> if the timeline includes the specified
+ * Returns <code>true</code> if the timeline includes the specified
* domain value range.
*
* @param from the start date.
@@ -311,7 +311,7 @@
/** The time zone for the axis. */
private TimeZone timeZone;
-
+
/** Our underlying timeline. */
private Timeline timeline;
@@ -332,8 +332,8 @@
}
/**
- * Creates a date axis. A timeline is specified for the axis. This allows
- * special transformations to occur between a domain of values and the
+ * Creates a date axis. A timeline is specified for the axis. This allows
+ * special transformations to occur between a domain of values and the
* values included in the axis.
*
* @see org.jfree.chart.axis.SegmentedTimeline
@@ -354,22 +354,22 @@
/**
* Returns the time zone for the axis.
- *
+ *
* @return The time zone.
- *
+ *
* @since 1.0.4
* @see #setTimeZone(TimeZone)
*/
public TimeZone getTimeZone() {
return this.timeZone;
}
-
+
/**
* Sets the time zone for the axis and sends an {@link AxisChangeEvent} to
* all registered listeners.
- *
+ *
* @param zone the time zone (<code>null</code> not permitted).
- *
+ *
* @since 1.0.4
* @see #getTimeZone()
*/
@@ -379,8 +379,8 @@
setStandardTickUnits(createStandardDateTickUnits(zone));
notifyListeners(new AxisChangeEvent(this));
}
- }
-
+ }
+
/**
* Returns the underlying timeline used by this axis.
*
@@ -408,13 +408,13 @@
/**
* Returns the tick unit for the axis.
* <p>
- * Note: if the <code>autoTickUnitSelection</code> flag is
- * <code>true</code> the tick unit may be changed while the axis is being
+ * Note: if the <code>autoTickUnitSelection</code> flag is
+ * <code>true</code> the tick unit may be changed while the axis is being
* drawn, so in that case the return value from this method may be
* irrelevant if the method is called before the axis has been drawn.
*
* @return The tick unit (possibly <code>null</code>).
- *
+ *
* @see #setTickUnit(DateTickUnit)
* @see ValueAxis#isAutoTickUnitSelection()
*/
@@ -423,12 +423,12 @@
}
/**
- * Sets the tick unit for the axis. The auto-tick-unit-selection flag is
- * set to <code>false</code>, and registered listeners are notified that
+ * Sets the tick unit for the axis. The auto-tick-unit-selection flag is
+ * set to <code>false</code>, and registered listeners are notified that
* the axis has been changed.
*
* @param unit the tick unit.
- *
+ *
* @see #getTickUnit()
* @see #setTickUnit(DateTickUnit, boolean, boolean)
*/
@@ -442,10 +442,10 @@
* @param unit the new tick unit.
* @param notify notify registered listeners?
* @param turnOffAutoSelection turn off auto selection?
- *
+ *
* @see #getTickUnit()
*/
- public void setTickUnit(DateTickUnit unit, boolean notify,
+ public void setTickUnit(DateTickUnit unit, boolean notify,
boolean turnOffAutoSelection) {
this.tickUnit = unit;
@@ -469,7 +469,7 @@
}
/**
- * Sets the date format override. If this is non-null, then it will be
+ * Sets the date format override. If this is non-null, then it will be
* used to format the dates on the axis.
*
* @param formatter the date formatter (<code>null</code> permitted).
@@ -480,8 +480,8 @@
}
/**
- * Sets the upper and lower bounds for the axis and sends an
- * {@link AxisChangeEvent} to all registered listeners. As a side-effect,
+ * Sets the upper and lower bounds for the axis and sends an
+ * {@link AxisChangeEvent} to all registered listeners. As a side-effect,
* the auto-range flag is set to false.
*
* @param range the new range (<code>null</code> not permitted).
@@ -491,22 +491,22 @@
}
/**
- * Sets the range for the axis, if requested, sends an
- * {@link AxisChangeEvent} to all registered listeners. As a side-effect,
+ * Sets the range for the axis, if requested, sends an
+ * {@link AxisChangeEvent} to all registered listeners. As a side-effect,
* the auto-range flag is set to <code>false</code> (optional).
*
* @param range the range (<code>null</code> not permitted).
- * @param turnOffAutoRange a flag that controls whether or not the auto
+ * @param turnOffAutoRange a flag that controls whether or not the auto
* range is turned off.
- * @param notify a flag that controls whether or not listeners are
+ * @param notify a flag that controls whether or not listeners are
* notified.
*/
- public void setRange(Range range, boolean turnOffAutoRange,
+ public void setRange(Range range, boolean turnOffAutoRange,
boolean notify) {
if (range == null) {
throw new IllegalArgumentException("Null 'range' argument.");
}
- // usually the range will be a DateRange, but if it isn't do a
+ // usually the range will be a DateRange, but if it isn't do a
// conversion...
if (!(range instanceof DateRange)) {
range = new DateRange(range);
@@ -515,7 +515,7 @@
}
/**
- * Sets the axis range and sends an {@link AxisChangeEvent} to all
+ * Sets the axis range and sends an {@link AxisChangeEvent} to all
* registered listeners.
*
* @param lower the lower bound for the axis.
@@ -529,7 +529,7 @@
}
/**
- * Sets the axis range and sends an {@link AxisChangeEvent} to all
+ * Sets the axis range and sends an {@link AxisChangeEvent} to all
* registered listeners.
*
* @param lower the lower bound for the axis.
@@ -546,7 +546,7 @@
* Returns the earliest date visible on the axis.
*
* @return The date.
- *
+ *
* @see #setMinimumDate(Date)
* @see #getMaximumDate()
*/
@@ -564,14 +564,14 @@
}
/**
- * Sets the minimum date visible on the axis and sends an
- * {@link AxisChangeEvent} to all registered listeners. If
- * <code>date</code> is on or after the current maximum date for
+ * Sets the minimum date visible on the axis and sends an
+ * {@link AxisChangeEvent} to all registered listeners. If
+ * <code>date</code> is on or after the current maximum date for
* the axis, the maximum date will be shifted to preserve the current
* length of the axis.
*
* @param date the date (<code>null</code> not permitted).
- *
+ *
* @see #getMinimumDate()
* @see #setMaximumDate(Date)
*/
@@ -596,7 +596,7 @@
* Returns the latest date visible on the axis.
*
* @return The date.
- *
+ *
* @see #setMaximumDate(Date)
* @see #getMinimumDate()
*/
@@ -614,14 +614,14 @@
}
/**
- * Sets the maximum date visible on the axis and sends an
- * {@link AxisChangeEvent} to all registered listeners. If
- * <code>maximumDate</code> is on or before the current minimum date for
+ * Sets the maximum date visible on the axis and sends an
+ * {@link AxisChangeEvent} to all registered listeners. If
+ * <code>maximumDate</code> is on or before the current minimum date for
* the axis, the minimum date will be shifted to preserve the current
* length of the axis.
*
* @param maximumDate the date (<code>null</code> not permitted).
- *
+ *
* @see #getMinimumDate()
* @see #setMinimumDate(Date)
*/
@@ -652,7 +652,7 @@
}
/**
- * Sets the tick mark position (start, middle or end of the time period)
+ * Sets the tick mark position (start, middle or end of the time period)
* and sends an {@link AxisChangeEvent} to all registered listeners.
*
* @param position the position (<code>null</code> not permitted).
@@ -676,7 +676,7 @@
}
/**
- * Returns <code>true</code> if the axis hides this value, and
+ * Returns <code>true</code> if the axis hides this value, and
* <code>false</code> otherwise.
*
* @param millis the data value.
@@ -692,15 +692,15 @@
* of the chart.
*
* @param value the date to be plotted.
- * @param area the rectangle (in Java2D space) where the data is to be
+ * @param area the rectangle (in Java2D space) where the data is to be
* plotted.
* @param edge the axis location.
*
* @return The coordinate corresponding to the supplied data value.
*/
- public double valueToJava2D(double value, Rectangle2D area,
+ public double valueToJava2D(double value, Rectangle2D area,
RectangleEdge edge) {
-
+
value = this.timeline.toTimelineValue((long) value);
DateRange range = (DateRange) getRange();
@@ -711,11 +711,11 @@
double minX = area.getX();
double maxX = area.getMaxX();
if (isInverted()) {
- result = maxX + ((value - axisMin) / (axisMax - axisMin))
+ result = maxX + ((value - axisMin) / (axisMax - axisMin))
* (minX - maxX);
}
else {
- result = minX + ((value - axisMin) / (axisMax - axisMin))
+ result = minX + ((value - axisMin) / (axisMax - axisMin))
* (maxX - minX);
}
}
@@ -723,11 +723,11 @@
double minY = area.getMinY();
double maxY = area.getMaxY();
if (isInverted()) {
- result = minY + (((value - axisMin) / (axisMax - axisMin))
+ result = minY + (((value - axisMin) / (axisMax - axisMin))
* (maxY - minY));
}
else {
- result = maxY - (((value - axisMin) / (axisMax - axisMin))
+ result = maxY - (((value - axisMin) / (axisMax - axisMin))
* (maxY - minY));
}
}
@@ -746,27 +746,27 @@
*
* @return The coordinate corresponding to the supplied date.
*/
- public double dateToJava2D(Date date, Rectangle2D area,
- RectangleEdge edge) {
+ public double dateToJava2D(Date date, Rectangle2D area,
+ RectangleEdge edge) {
double value = date.getTime();
return valueToJava2D(value, area, edge);
}
/**
- * Translates a Java2D coordinate into the corresponding data value. To
- * perform this translation, you need to know the area used for plotting
+ * Translates a Java2D coordinate into the corresponding data value. To
+ * perform this translation, you need to know the area used for plotting
* data, and which edge the axis is located on.
*
* @param java2DValue the coordinate in Java2D space.
- * @param area the rectangle (in Java2D space) where the data is to be
+ * @param area the rectangle (in Java2D space) where the data is to be
* plotted.
* @param edge the axis location.
*
* @return A data value.
*/
- public double java2DToValue(double java2DValue, Rectangle2D area,
+ public double java2DToValue(double java2DValue, Rectangle2D area,
RectangleEdge edge) {
-
+
DateRange range = (DateRange) getRange();
double axisMin = this.timeline.toTimelineValue(range.getLowerDate());
double axisMax = this.timeline.toTimelineValue(range.getUpperDate());
@@ -784,15 +784,15 @@
double result;
if (isInverted()) {
- result = axisMax - ((java2DValue - min) / (max - min)
+ result = axisMax - ((java2DValue - min) / (max - min)
* (axisMax - axisMin));
}
else {
- result = axisMin + ((java2DValue - min) / (max - min)
+ result = axisMin + ((java2DValue - min) / (max - min)
* (axisMax - axisMin));
}
- return this.timeline.toMillisecond((long) result);
+ return this.timeline.toMillisecond((long) result);
}
/**
@@ -816,7 +816,7 @@
public Date calculateHighestVisibleTickValue(DateTickUnit unit) {
return previousStandardDate(getMaximumDate(), unit);
}
-
+
/**
* Returns the previous "standard" date, for a given date and tick unit.
*
@@ -951,7 +951,7 @@
}
calendar.clear(Calendar.MILLISECOND);
calendar.set(years, months, value, hours, 0, 0);
- // long result = calendar.getTimeInMillis();
+ // long result = calendar.getTimeInMillis();
// won't work with JDK 1.3
Date d2 = calendar.getTime();
if (d2.getTime() >= date.getTime()) {
@@ -1012,11 +1012,11 @@
*
* @return A date.
*/
- private Date calculateDateForPosition(RegularTimePeriod period,
+ private Date calculateDateForPosition(RegularTimePeriod period,
DateTickMarkPosition position) {
-
+
if (position == null) {
- throw new IllegalArgumentException("Null 'position' argument.");
+ throw new IllegalArgumentException("Null 'position' argument.");
}
Date result = null;
if (position == DateTickMarkPosition.START) {
@@ -1033,7 +1033,7 @@
}
/**
- * Returns the first "standard" date (based on the specified field and
+ * Returns the first "standard" date (based on the specified field and
* units).
*
* @param date the reference date.
@@ -1050,10 +1050,10 @@
}
/**
- * Returns a collection of standard date tick units that uses the default
- * time zone. This collection will be used by default, but you are free
- * to create your own collection if you want to (see the
- * {@link ValueAxis#setStandardTickUnits(TickUnitSource)} method inherited
+ * Returns a collection of standard date tick units that uses the default
+ * time zone. This collection will be used by default, but you are free
+ * to create your own collection if you want to (see the
+ * {@link ValueAxis#setStandardTickUnits(TickUnitSource)} method inherited
* from the {@link ValueAxis} class).
*
* @return A collection of standard date tick units.
@@ -1063,14 +1063,14 @@
}
/**
- * Returns a collection of standard date tick units. This collection will
- * be used by default, but you are free to create your own collection if
- * you want to (see the
- * {@link ValueAxis#setStandardTickUnits(TickUnitSource)} method inherited
+ * Returns a collection of standard date tick units. This collection will
+ * be used by default, but you are free to create your own collection if
+ * you want to (see the
+ * {@link ValueAxis#setStandardTickUnits(TickUnitSource)} method inherited
* from the {@link ValueAxis} class).
*
* @param zone the time zone (<code>null</code> not permitted).
- *
+ *
* @return A collection of standard date tick units.
*/
public static TickUnitSource createStandardDateTickUnits(TimeZone zone) {
@@ -1088,7 +1088,7 @@
DateFormat f5 = new SimpleDateFormat("d-MMM");
DateFormat f6 = new SimpleDateFormat("MMM-yyyy");
DateFormat f7 = new SimpleDateFormat("yyyy");
-
+
f1.setTimeZone(zone);
f2.setTimeZone(zone);
f3.setTimeZone(zone);
@@ -1096,98 +1096,98 @@
f5.setTimeZone(zone);
f6.setTimeZone(zone);
f7.setTimeZone(zone);
-
+
// milliseconds
units.add(new DateTickUnit(DateTickUnit.MILLISECOND, 1, f1));
- units.add(new DateTickUnit(DateTickUnit.MILLISECOND, 5,
+ units.add(new DateTickUnit(DateTickUnit.MILLISECOND, 5,
DateTickUnit.MILLISECOND, 1, f1));
- units.add(new DateTickUnit(DateTickUnit.MILLISECOND, 10,
+ units.add(new DateTickUnit(DateTickUnit.MILLISECOND, 10,
DateTickUnit.MILLISECOND, 1, f1));
- units.add(new DateTickUnit(DateTickUnit.MILLISECOND, 25,
+ units.add(new DateTickUnit(DateTickUnit.MILLISECOND, 25,
DateTickUnit.MILLISECOND, 5, f1));
- units.add(new DateTickUnit(DateTickUnit.MILLISECOND, 50,
+ units.add(new DateTickUnit(DateTickUnit.MILLISECOND, 50,
DateTickUnit.MILLISECOND, 10, f1));
- units.add(new DateTickUnit(DateTickUnit.MILLISECOND, 100,
+ units.add(new DateTickUnit(DateTickUnit.MILLISECOND, 100,
DateTickUnit.MILLISECOND, 10, f1));
- units.add(new DateTickUnit(DateTickUnit.MILLISECOND, 250,
+ units.add(new DateTickUnit(DateTickUnit.MILLISECOND, 250,
DateTickUnit.MILLISECOND, 10, f1));
- units.add(new DateTickUnit(DateTickUnit.MILLISECOND, 500,
+ units.add(new DateTickUnit(DateTickUnit.MILLISECOND, 500,
DateTickUnit.MILLISECOND, 50, f1));
// seconds
- units.add(new DateTickUnit(DateTickUnit.SECOND, 1,
+ units.add(new DateTickUnit(DateTickUnit.SECOND, 1,
DateTickUnit.MILLISECOND, 50, f2));
- units.add(new DateTickUnit(DateTickUnit.SECOND, 5,
+ units.add(new DateTickUnit(DateTickUnit.SECOND, 5,
DateTickUnit.SECOND, 1, f2));
- units.add(new DateTickUnit(DateTickUnit.SECOND, 10,
+ units.add(new DateTickUnit(DateTickUnit.SECOND, 10,
DateTickUnit.SECOND, 1, f2));
- units.add(new DateTickUnit(DateTickUnit.SECOND, 30,
+ units.add(new DateTickUnit(DateTickUnit.SECOND, 30,
DateTickUnit.SECOND, 5, f2));
// minutes
- units.add(new DateTickUnit(DateTickUnit.MINUTE, 1,
+ units.add(new DateTickUnit(DateTickUnit.MINUTE, 1,
DateTickUnit.SECOND, 5, f3));
- units.add(new DateTickUnit(DateTickUnit.MINUTE, 2,
+ units.add(new DateTickUnit(DateTickUnit.MINUTE, 2,
DateTickUnit.SECOND, 10, f3));
- units.add(new DateTickUnit(DateTickUnit.MINUTE, 5,
+ units.add(new DateTickUnit(DateTickUnit.MINUTE, 5,
DateTickUnit.MINUTE, 1, f3));
- units.add(new DateTickUnit(DateTickUnit.MINUTE, 10,
+ units.add(new DateTickUnit(DateTickUnit.MINUTE, 10,
DateTickUnit.MINUTE, 1, f3));
- units.add(new DateTickUnit(DateTickUnit.MINUTE, 15,
+ units.add(new DateTickUnit(DateTickUnit.MINUTE, 15,
DateTickUnit.MINUTE, 5, f3));
- units.add(new DateTickUnit(DateTickUnit.MINUTE, 20,
+ units.add(new DateTickUnit(DateTickUnit.MINUTE, 20,
DateTickUnit.MINUTE, 5, f3));
- units.add(new DateTickUnit(DateTickUnit.MINUTE, 30,
+ units.add(new DateTickUnit(DateTickUnit.MINUTE, 30,
DateTickUnit.MINUTE, 5, f3));
// hours
- units.add(new DateTickUnit(DateTickUnit.HOUR, 1,
+ units.add(new DateTickUnit(DateTickUnit.HOUR, 1,
DateTickUnit.MINUTE, 5, f3));
- units.add(new DateTickUnit(DateTickUnit.HOUR, 2,
+ units.add(new DateTickUnit(DateTickUnit.HOUR, 2,
DateTickUnit.MINUTE, 10, f3));
- units.add(new DateTickUnit(DateTickUnit.HOUR, 4,
+ units.add(new DateTickUnit(DateTickUnit.HOUR, 4,
DateTickUnit.MINUTE, 30, f3));
- units.add(new DateTickUnit(DateTickUnit.HOUR, 6,
+ units.add(new DateTickUnit(DateTickUnit.HOUR, 6,
DateTickUnit.HOUR, 1, f3));
- units.add(new DateTickUnit(DateTickUnit.HOUR, 12,
+ units.add(new DateTickUnit(DateTickUnit.HOUR, 12,
DateTickUnit.HOUR, 1, f4));
// days
- units.add(new DateTickUnit(DateTickUnit.DAY, 1,
+ units.add(new DateTickUnit(DateTickUnit.DAY, 1,
DateTickUnit.HOUR, 1, f5));
- units.add(new DateTickUnit(DateTickUnit.DAY, 2,
+ units.add(new DateTickUnit(DateTickUnit.DAY, 2,
DateTickUnit.HOUR, 1, f5));
- units.add(new DateTickUnit(DateTickUnit.DAY, 7,
+ units.add(new DateTickUnit(DateTickUnit.DAY, 7,
DateTickUnit.DAY, 1, f5));
- units.add(new DateTickUnit(DateTickUnit.DAY, 15,
+ units.add(new DateTickUnit(DateTickUnit.DAY, 15,
DateTickUnit.DAY, 1, f5));
// months
- units.add(new DateTickUnit(DateTickUnit.MONTH, 1,
+ units.add(new DateTickUnit(DateTickUnit.MONTH, 1,
DateTickUnit.DAY, 1, f6));
- units.add(new DateTickUnit(DateTickUnit.MONTH, 2,
+ units.add(new DateTickUnit(DateTickUnit.MONTH, 2,
DateTickUnit.DAY, 1, f6));
- units.add(new DateTickUnit(DateTickUnit.MONTH, 3,
+ units.add(new DateTickUnit(DateTickUnit.MONTH, 3,
DateTickUnit.MONTH, 1, f6));
- units.add(new DateTickUnit(DateTickUnit.MONTH, 4,
+ units.add(new DateTickUnit(DateTickUnit.MONTH, 4,
DateTickUnit.MONTH, 1, f6));
- units.add(new DateTickUnit(DateTickUnit.MONTH, 6,
+ units.add(new DateTickUnit(DateTickUnit.MONTH, 6,
DateTickUnit.MONTH, 1, f6));
// years
- units.add(new DateTickUnit(DateTickUnit.YEAR, 1,
+ units.add(new DateTickUnit(DateTickUnit.YEAR, 1,
DateTickUnit.MONTH, 1, f7));
- units.add(new DateTickUnit(DateTickUnit.YEAR, 2,
+ units.add(new DateTickUnit(DateTickUnit.YEAR, 2,
DateTickUnit.MONTH, 3, f7));
- units.add(new DateTickUnit(DateTickUnit.YEAR, 5,
+ units.add(new DateTickUnit(DateTickUnit.YEAR, 5,
DateTickUnit.YEAR, 1, f7));
- units.add(new DateTickUnit(DateTickUnit.YEAR, 10,
+ units.add(new DateTickUnit(DateTickUnit.YEAR, 10,
DateTickUnit.YEAR, 1, f7));
- units.add(new DateTickUnit(DateTickUnit.YEAR, 25,
+ units.add(new DateTickUnit(DateTickUnit.YEAR, 25,
DateTickUnit.YEAR, 5, f7));
- units.add(new DateTickUnit(DateTickUnit.YEAR, 50,
+ units.add(new DateTickUnit(DateTickUnit.YEAR, 50,
DateTickUnit.YEAR, 10, f7));
- units.add(new DateTickUnit(DateTickUnit.YEAR, 100,
+ units.add(new DateTickUnit(DateTickUnit.YEAR, 100,
DateTickUnit.YEAR, 20, f7));
return units;
@@ -1210,13 +1210,13 @@
Range r = vap.getDataRange(this);
if (r == null) {
- if (this.timeline instanceof SegmentedTimeline) {
+ if (this.timeline instanceof SegmentedTimeline) {
//Timeline hasn't method getStartTime()
r = new DateRange((
(SegmentedTimeline) this.timeline).getStartTime(),
- ((SegmentedTimeline) this.timeline).getStartTime()
+ ((SegmentedTimeline) this.timeline).getStartTime()
+ 1);
- }
+ }
else {
r = new DateRange();
}
@@ -1259,7 +1259,7 @@
* @param dataArea the area defined by the axes.
* @param edge the axis location.
*/
- protected void selectAutoTickUnit(Graphics2D g2,
+ protected void selectAutoTickUnit(Graphics2D g2,
Rectangle2D dataArea,
RectangleEdge edge) {
@@ -1274,15 +1274,15 @@
/**
* Selects an appropriate tick size for the axis. The strategy is to
- * display as many ticks as possible (selected from a collection of
+ * display as many ticks as possible (selected from a collection of
* 'standard' tick units) without the labels overlapping.
*
* @param g2 the graphics device.
* @param dataArea the area defined by the axes.
* @param edge the axis location.
*/
- protected void selectHorizontalAutoTickUnit(Graphics2D g2,
- Rectangle2D dataArea,
+ protected void selectHorizontalAutoTickUnit(Graphics2D g2,
+ Rectangle2D dataArea,
RectangleEdge edge) {
long shift = 0;
@@ -1290,7 +1290,7 @@
shift = ((SegmentedTimeline) this.timeline).getStartTime();
}
double zero = valueToJava2D(shift + 0.0, dataArea, edge);
- double tickLabelWidth
+ double tickLabelWidth
= estimateMaximumTickLabelWidth(g2, getTickUnit());
// start with the current tick unit...
@@ -1310,10 +1310,10 @@
}
setTickUnit(unit2, false, false);
}
-
+
/**
* Selects an appropriate tick size for the axis. The strategy is to
- * display as many ticks as possible (selected from a collection of
+ * display as many ticks as possible (selected from a collection of
* 'standard' tick units) without the labels overlapping.
*
* @param g2 the graphics device.
@@ -1330,16 +1330,16 @@
// start with a unit that is at least 1/10th of the axis length
double estimate1 = getRange().getLength() / 10.0;
- DateTickUnit candidate1
+ DateTickUnit candidate1
= (DateTickUnit) tickUnits.getCeilingTickUnit(estimate1);
double labelHeight1 = estimateMaximumTickLabelHeight(g2, candidate1);
double y1 = valueToJava2D(candidate1.getSize(), dataArea, edge);
double candidate1UnitHeight = Math.abs(y1 - zero);
// now extrapolate based on label height and unit height...
- double estimate2
+ double estimate2
= (labelHeight1 / candidate1UnitHeight) * candidate1.getSize();
- DateTickUnit candidate2
+ DateTickUnit candidate2
= (DateTickUnit) tickUnits.getCeilingTickUnit(estimate2);
double labelHeight2 = estimateMaximumTickLabelHeight(g2, candidate2);
double y2 = valueToJava2D(candidate2.getSize(), dataArea, edge);
@@ -1358,11 +1358,11 @@
}
/**
- * Estimates the maximum width of the tick labels, assuming the specified
+ * Estimates the maximum width of the tick labels, assuming the specified
* tick unit is used.
* <P>
* Rather than computing the string bounds of every tick on the axis, we
- * just look at two values: the lower bound and the upper bound for the
+ * just look at two values: the lower bound and the upper bound for the
* axis. These two values will usually be representative.
*
* @param g2 the graphics device.
@@ -1370,7 +1370,7 @@
*
* @return The estimated maximum width of the tick labels.
*/
- private double estimateMaximumTickLabelWidth(Graphics2D g2,
+ private double estimateMaximumTickLabelWidth(Graphics2D g2,
DateTickUnit unit) {
RectangleInsets tickLabelInsets = getTickLabelInsets();
@@ -1380,7 +1380,7 @@
FontRenderContext frc = g2.getFontRenderContext();
LineMetrics lm = tickLabelFont.getLineMetrics("ABCxyz", frc);
if (isVerticalTickLabels()) {
- // all tick labels have the same width (equal to the height of
+ // all tick labels have the same width (equal to the height of
// the font)...
result += lm.getHeight();
}
@@ -1411,11 +1411,11 @@
}
/**
- * Estimates the maximum width of the tick labels, assuming the specified
+ * Estimates the maximum width of the tick labels, assuming the specified
* tick unit is used.
* <P>
- * Rather than computing the string bounds of every tick on the axis, we
- * just look at two values: the lower bound and the upper bound for the
+ * Rather than computing the string bounds of every tick on the axis, we
+ * just look at two values: the lower bound and the upper bound for the
* axis. These two values will usually be representative.
*
* @param g2 the graphics device.
@@ -1423,7 +1423,7 @@
*
* @return The estimated maximum width of the tick labels.
*/
- private double estimateMaximumTickLabelHeight(Graphics2D g2,
+ private double estimateMaximumTickLabelHeight(Graphics2D g2,
DateTickUnit unit) {
RectangleInsets tickLabelInsets = getTickLabelInsets();
@@ -1433,7 +1433,7 @@
FontRenderContext frc = g2.getFontRenderContext();
LineMetrics lm = tickLabelFont.getLineMetrics("ABCxyz", frc);
if (!isVerticalTickLabels()) {
- // all tick labels have the same width (equal to the height of
+ // all tick labels have the same width (equal to the height of
// the font)...
result += lm.getHeight();
}
@@ -1464,7 +1464,7 @@
}
/**
- * Calculates the positions of the tick labels for the axis, storing the
+ * Calculates the positions of the tick labels for the axis, storing the
* results in the tick label list (ready for drawing).
*
* @param g2 the graphics device.
@@ -1552,7 +1552,7 @@
}
}
- Tick tick = new DateTick(tickDate, tickLabel, anchor,
+ Tick tick = new DateTick(tickDate, tickLabel, anchor,
rotationAnchor, angle);
result.add(tick);
tickDate = unit.addToDate(tickDate, this.timeZone);
@@ -1576,7 +1576,7 @@
this.timeZone), this.tickMarkPosition);
break;
case(DateTickUnit.YEAR) :
- tickDate = calculateDateForPosition(new Year(tickDate,
+ tickDate = calculateDateForPosition(new Year(tickDate,
this.timeZone), this.tickMarkPosition);
break;
@@ -1650,7 +1650,7 @@
}
}
- Tick tick = new DateTick(tickDate, tickLabel, anchor,
+ Tick tick = new DateTick(tickDate, tickLabel, anchor,
rotationAnchor, angle);
result.add(tick);
tickDate = unit.addToDate(tickDate, this.timeZone);
@@ -1663,25 +1663,25 @@
}
/**
- * Draws the axis on a Java 2D graphics device (such as the screen or a
+ * Draws the axis on a Java 2D graphics device (such as the screen or a
* printer).
*
* @param g2 the graphics device (<code>null</code> not permitted).
* @param cursor the cursor location.
- * @param plotArea the area within which the axes and data should be
+ * @param plotArea the area within which the axes and data should be
* drawn (<code>null</code> not permitted).
- * @param dataArea the area within which the data should be drawn
+ * @param dataArea the area within which the data should be drawn
* (<code>null</code> not permitted).
* @param edge the location of the axis (<code>null</code> not permitted).
- * @param plotState collects information about the plot
+ * @param plotState collects information about the plot
* (<code>null</code> permitted).
*
* @return The axis state (never <code>null</code>).
*/
- public AxisState draw(Graphics2D g2,
+ public AxisState draw(Graphics2D g2,
double cursor,
- Rectangle2D plotArea,
- Rectangle2D dataArea,
+ Rectangle2D plotArea,
+ Rectangle2D dataArea,
RectangleEdge edge,
PlotRenderingInfo plotState) {
@@ -1696,10 +1696,10 @@
}
// draw the tick marks and labels...
- AxisState state = drawTickMarksAndLabels(g2, cursor, plotArea,
+ AxisState state = drawTickMarksAndLabels(g2, cursor, plotArea,
dataArea, edge, plotState);
- // draw the axis label (note that 'state' is passed in *and*
+ // draw the axis label (note that 'state' is passed in *and*
// returned)...
state = drawLabel(getLabel(), g2, plotArea, dataArea, edge, state,
plotState);
@@ -1719,25 +1719,25 @@
(long) getRange().getLowerBound()
);
double length = (this.timeline.toTimelineValue(
- (long) getRange().getUpperBound())
+ (long) getRange().getUpperBound())
- this.timeline.toTimelineValue(
(long) getRange().getLowerBound()));
Range adjusted = null;
if (isInverted()) {
- adjusted = new DateRange(this.timeline.toMillisecond((long) (start
+ adjusted = new DateRange(this.timeline.toMillisecond((long) (start
+ (length * (1 - upperPercent)))),
- this.timeline.toMillisecond((long) (start + (length
+ this.timeline.toMillisecond((long) (start + (length
* (1 - lowerPercent)))));
}
else {
adjusted = new DateRange(this.timeline.toMillisecond(
- (long) (start + length * lowerPercent)),
- this.timeline.toMillisecond((long) (start + length
+ (long) (start + length * lowerPercent)),
+ this.timeline.toMillisecond((long) (start + length
* upperPercent)));
}
setRange(adjusted);
- }
-
+ }
+
/**
* Tests this axis for equality with an arbitrary object.
*
@@ -1756,11 +1756,11 @@
if (!ObjectUtilities.equal(this.tickUnit, that.tickUnit)) {
return false;
}
- if (!ObjectUtilities.equal(this.dateFormatOverride,
+ if (!ObjectUtilities.equal(this.dateFormatOverride,
that.dateFormatOverride)) {
return false;
}
- if (!ObjectUtilities.equal(this.tickMarkPosition,
+ if (!ObjectUtilities.equal(this.tickMarkPosition,
that.tickMarkPosition)) {
return false;
}
@@ -1775,7 +1775,7 @@
/**
* Returns a hash code for this object.
- *
+ *
* @return A hash code.
*/
public int hashCode() {
@@ -1792,7 +1792,7 @@
*
* @return A clone.
*
- * @throws CloneNotSupportedException if some component of the axis does
+ * @throws CloneNotSupportedException if some component of the axis does
* not support cloning.
*/
public Object clone() throws CloneNotSupportedException {
@@ -1801,7 +1801,7 @@
// 'dateTickUnit' is immutable : no need to clone
if (this.dateFormatOverride != null) {
- clone.dateFormatOverride
+ clone.dateFormatOverride
= (DateFormat) this.dateFormatOverride.clone();
}
// 'tickMarkPosition' is immutable : no need to clone
@@ -1809,5 +1809,5 @@
return clone;
}
-
+
}
Modified: trunk/source/org/jfree/chart/axis/DateTick.java
===================================================================
--- trunk/source/org/jfree/chart/axis/DateTick.java 2008-06-26 12:07:13 UTC (rev 1251)
+++ trunk/source/org/jfree/chart/axis/DateTick.java 2008-06-26 12:10:20 UTC (rev 1252)
@@ -2,32 +2,32 @@
* JFreeChart : a free chart library for the Java(tm) platform
* ===========================================================
*
- * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors.
*
* Project Info: http://www.jfree.org/jfreechart/index.html
*
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
*
- * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
* in the United States and other countries.]
*
* -------------
* DateTick.java
* -------------
- * (C) Copyright 2003-2007, by Object Refinery Limited.
+ * (C) Copyright 2003-2008, by Object Refinery Limited.
*
* Original Author: David Gilbert (for Object Refinery Limited);
* Contributor(s): -;
@@ -54,29 +54,29 @@
/** The date. */
private Date date;
-
+
/**
* Creates a new date tick.
- *
+ *
* @param date the date.
* @param label the label.
- * @param textAnchor the part of the label that is aligned to the anchor
+ * @param textAnchor the part of the label that is aligned to the anchor
* point.
* @param rotationAnchor defines the rotation point relative to the text.
* @param angle the rotation angle (in radians).
*/
public DateTick(Date date, String label,
- TextAnchor textAnchor, TextAnchor rotationAnchor,
+ TextAnchor textAnchor, TextAnchor rotationAnchor,
double angle) {
-
+
super(date.getTime(), label, textAnchor, rotationAnchor, angle);
this.date = date;
-
+
}
-
+
/**
* Returns the date.
- *
+ *
* @return The date.
*/
public Date getDate() {
@@ -85,32 +85,32 @@
/**
* Tests this tick for equality with an arbitrary object.
- *
+ *
* @param obj the object to test (<code>null</code> permitted).
- *
+ *
* @return A boolean.
*/
public boolean equals(Object obj) {
if (obj == this) {
- return true;
+ return true;
}
if (obj instanceof DateTick && super.equals(obj)) {
DateTick dt = (DateTick) obj;
if (!ObjectUtilities.equal(this.date, dt.date)) {
- return false;
+ return false;
}
return true;
}
return false;
}
-
+
/**
* Returns a hash code for this object.
- *
+ *
* @return A hash code.
*/
public int hashCode() {
return this.date.hashCode();
}
-
+
}
Modified: trunk/source/org/jfree/chart/axis/DateTickMarkPosition.java
===================================================================
--- trunk/source/org/jfree/chart/axis/DateTickMarkPosition.java 2008-06-26 12:07:13 UTC (rev 1251)
+++ trunk/source/org/jfree/chart/axis/DateTickMarkPosition.java 2008-06-26 12:10:20 UTC (rev 1252)
@@ -2,32 +2,32 @@
* JFreeChart : a free chart library for the Java(tm) platform
* ===========================================================
*
- * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors.
*
* Project Info: http://www.jfree.org/jfreechart/index.html
*
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
*
- * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
* in the United States and other countries.]
*
* -------------------------
* DateTickMarkPosition.java
* -------------------------
- * (C) Copyright 2003-2007, by Object Refinery Limited.
+ * (C) Copyright 2003-2008, by Object Refinery Limited.
*
* Original Author: David Gilbert (for Object Refinery Limited);
* Contributor(s): -;
@@ -51,7 +51,7 @@
/** For serialization. */
private static final long serialVersionUID = 2540750672764537240L;
-
+
/** Start of period. */
public static final DateTickMarkPosition START
= new DateTickMarkPosition("DateTickMarkPosition.START");
@@ -86,7 +86,7 @@
}
/**
- * Returns <code>true</code> if this object is equal to the specified
+ * Returns <code>true</code> if this object is equal to the specified
* object, and <code>false</code> otherwise.
*
* @param obj the other object.
@@ -108,12 +108,12 @@
return true;
}
-
+
/**
* Ensures that serialization returns the unique instances.
- *
+ *
* @return The object.
- *
+ *
* @throws ObjectStreamException if there is a problem.
*/
private Object readResolve() throws ObjectStreamException {
@@ -122,10 +122,10 @@
}
else if (this.equals(DateTickMarkPosition.MIDDLE)) {
return DateTickMarkPosition.MIDDLE;
- }
+ }
else if (this.equals(DateTickMarkPosition.END)) {
return DateTickMarkPosition.END;
- }
+ }
return null;
}
Modified: trunk/source/org/jfree/chart/axis/ExtendedCategoryAxis.java
===================================================================
--- trunk/source/org/jfree/chart/axis/ExtendedCategoryAxis.java 2008-06-26 12:07:13 UTC (rev 1251)
+++ trunk/source/org/jfree/chart/axis/ExtendedCategoryAxis.java 2008-06-26 12:10:20 UTC (rev 1252)
@@ -2,32 +2,32 @@
* JFreeChart : a free chart library for the Java(tm) platform
* ===========================================================
*
- * (C) Copyright 2000-2007, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2000-2008, by Object Refinery Limited and Contributors.
*
* Project Info: http://www.jfree.org/jfreechart/index.html
*
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
*
- * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
+ * [Java is a trademark or registered trademark of Sun Microsystems, Inc.
* in the United States and other countries.]
*
* -------------------------
* ExtendedCategoryAxis.java
* -------------------------
- * (C) Copyright 2003-2007, by Object Refinery Limited and Contributors.
+ * (C) Copyright 2003-2008, by Object Refinery Limited and Contributors.
*
* Original Author: David Gilbert (for Object Refinery Limited);
* Contributor(s): -;
@@ -40,7 +40,7 @@
* ------------- JFREECHART 1.0.x ---------------------------------------------
* 21-Mar-2007 : Implemented equals(), clone() and fixed serialization (DG);
* 20-Jun-2007 : Removed JCommon dependencies (DG);
- *
+ *
*/
package org.jfree.chart.axis;
@@ -64,23 +64,23 @@
import org.jfree.chart.util.SerialUtilities;
/**
- * An extended version of the {@link CategoryAxis} class that supports
+ * An extended version of the {@link CategoryAxis} class that supports
* sublabels on the axis.
*/
public class ExtendedCategoryAxis extends CategoryAxis {
/** Storage for the sublabels. */
private Map sublabels;
-
+
/** The sublabel font. */
private Font sublabelFont;
-
+
/** The sublabel paint. */
private transient Paint sublabelPaint;
-
+
/**
* Creates a new axis.
- *
+ *
* @param label the axis label.
*/
public ExtendedCategoryAxis(String label) {
@@ -89,24 +89,24 @@
this.sublabelFont = new Font("SansSerif", Font.PLAIN, 10);
this.sublabelPaint = Color.black;
}
-
+
/**
* Returns the font for the sublabels.
- *
+ *
* @return The font (never <code>null</code>).
- *
+ *
* @see #setSubLabelFont(Font)
*/
public Font getSubLabelFont() {
return this.sublabelFont;
}
-
+
/**
* Sets the font for the sublabels and sends...
[truncated message content] |