From: David G. <mu...@us...> - 2007-02-27 09:43:21
|
Update of /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10085/source/org/jfree/chart/plot Modified Files: Tag: STABLE_1-0-0 XYPlot.java Log Message: 2007-02-27 David Gilbert <dav...@ob...> * source/org/jfree/chart/plot/XYPlot.java (setDomainAxisLocation(AxisLocation)): Delegate, (setDomainAxisLocation(AxisLocation, boolean)): Likewise, (setDomainAxisLocation(int, AxisLocation)): Likewise, (setDomainAxisLocation(int, AxisLocation, boolean)): New method, (setRangeAxisLocation(AxisLocation)): Delegate, (setRangeAxisLocation(AxisLocation, boolean)): Likewise, (setRangeAxisLocation(int, AxisLocation)): Likewise, (setRangeAxisLocation(int, AxisLocation, boolean)): New method. Index: XYPlot.java =================================================================== RCS file: /cvsroot/jfreechart/jfreechart/source/org/jfree/chart/plot/XYPlot.java,v retrieving revision 1.44.2.19 retrieving revision 1.44.2.20 diff -C2 -d -r1.44.2.19 -r1.44.2.20 *** XYPlot.java 7 Feb 2007 16:31:49 -0000 1.44.2.19 --- XYPlot.java 27 Feb 2007 09:43:16 -0000 1.44.2.20 *************** *** 177,180 **** --- 177,182 ---- * 15-Jan-2007 : Fixed bug in drawRangeMarkers() (DG); * 07-Feb-2007 : Fixed bug 1654215, renderer with no dataset (DG); + * 26-Feb-2007 : Added missing setDomainAxisLocation() and + * setRangeAxisLocation() methods (DG); * */ *************** *** 277,282 **** /** The resourceBundle for the localization. */ ! protected static ResourceBundle localizationResources ! = ResourceBundle.getBundle("org.jfree.chart.plot.LocalizationBundle"); /** The plot orientation. */ --- 279,285 ---- /** The resourceBundle for the localization. */ ! protected static ResourceBundle localizationResources ! = ResourceBundle.getBundle( ! "org.jfree.chart.plot.LocalizationBundle"); /** The plot orientation. */ *************** *** 736,741 **** /** ! * Sets the location of the domain axis and sends a {@link PlotChangeEvent} ! * to all registered listeners. * * @param location the location (<code>null</code> not permitted). --- 739,744 ---- /** ! * Sets the location of the primary domain axis and sends a ! * {@link PlotChangeEvent} to all registered listeners. * * @param location the location (<code>null</code> not permitted). *************** *** 744,749 **** */ public void setDomainAxisLocation(AxisLocation location) { ! // defer argument checking... ! setDomainAxisLocation(location, true); } --- 747,752 ---- */ public void setDomainAxisLocation(AxisLocation location) { ! // delegate... ! setDomainAxisLocation(0, location, true); } *************** *** 758,768 **** */ public void setDomainAxisLocation(AxisLocation location, boolean notify) { ! if (location == null) { ! throw new IllegalArgumentException("Null 'location' argument."); ! } ! this.domainAxisLocations.set(0, location); ! if (notify) { ! notifyListeners(new PlotChangeEvent(this)); ! } } --- 761,766 ---- */ public void setDomainAxisLocation(AxisLocation location, boolean notify) { ! // delegate... ! setDomainAxisLocation(0, location, notify); } *************** *** 848,861 **** * * @param index the axis index. ! * @param location the location (<code>null</code> permitted). * * @see #getDomainAxisLocation(int) */ public void setDomainAxisLocation(int index, AxisLocation location) { ! this.domainAxisLocations.set(index, location); ! notifyListeners(new PlotChangeEvent(this)); } /** * Returns the edge for a domain axis. * --- 846,887 ---- * * @param index the axis index. ! * @param location the location (<code>null</code> not permitted for index ! * 0). * * @see #getDomainAxisLocation(int) */ public void setDomainAxisLocation(int index, AxisLocation location) { ! // delegate... ! setDomainAxisLocation(index, location, true); } /** + * Sets the axis location for a domain axis and, if requested, sends a + * {@link PlotChangeEvent} to all registered listeners. + * + * @param index the axis index. + * @param location the location (<code>null</code> not permitted for + * index 0). + * @param notify notify listeners? + * + * @since 1.0.5 + * + * @see #getDomainAxisLocation(int) + * @see #setRangeAxisLocation(int, AxisLocation, boolean) + */ + public void setDomainAxisLocation(int index, AxisLocation location, + boolean notify) { + + if (index == 0 && location == null) { + throw new IllegalArgumentException( + "Null 'location' for index 0 not permitted."); + } + this.domainAxisLocations.set(index, location); + if (notify) { + notifyListeners(new PlotChangeEvent(this)); + } + } + + /** * Returns the edge for a domain axis. * *************** *** 940,945 **** */ public void setRangeAxisLocation(AxisLocation location) { ! // defer argument checking... ! setRangeAxisLocation(location, true); } --- 966,971 ---- */ public void setRangeAxisLocation(AxisLocation location) { ! // delegate... ! setRangeAxisLocation(0, location, true); } *************** *** 954,964 **** */ public void setRangeAxisLocation(AxisLocation location, boolean notify) { ! if (location == null) { ! throw new IllegalArgumentException("Null 'location' argument."); ! } ! this.rangeAxisLocations.set(0, location); ! if (notify) { ! notifyListeners(new PlotChangeEvent(this)); ! } } --- 980,985 ---- */ public void setRangeAxisLocation(AxisLocation location, boolean notify) { ! // delegate... ! setRangeAxisLocation(0, location, notify); } *************** *** 1130,1135 **** */ public void setRangeAxisLocation(int index, AxisLocation location) { ! this.rangeAxisLocations.set(index, location); ! notifyListeners(new PlotChangeEvent(this)); } --- 1151,1183 ---- */ public void setRangeAxisLocation(int index, AxisLocation location) { ! // delegate... ! setRangeAxisLocation(index, location, true); ! } ! ! /** ! * Sets the axis location for a domain axis and, if requested, sends a ! * {@link PlotChangeEvent} to all registered listeners. ! * ! * @param index the axis index. ! * @param location the location (<code>null</code> not permitted for ! * index 0). ! * @param notify notify listeners? ! * ! * @since 1.0.5 ! * ! * @see #getRangeAxisLocation(int) ! * @see #setDomainAxisLocation(int, AxisLocation, boolean) ! */ ! public void setRangeAxisLocation(int index, AxisLocation location, ! boolean notify) { ! ! if (index == 0 && location == null) { ! throw new IllegalArgumentException( ! "Null 'location' for index 0 not permitted."); ! } ! this.domainAxisLocations.set(index, location); ! if (notify) { ! notifyListeners(new PlotChangeEvent(this)); ! } } |