From 0e91d34393859453e288a3e9b7041239f712af82 Mon Sep 17 00:00:00 2001 From: David Gilbert Date: Sat, 6 May 2017 10:33:45 +0200 Subject: [PATCH] Rename LineUtilities --> LineUtils. --- .../annotations/XYDataImageAnnotation.java | 8 +++--- .../chart/annotations/XYImageAnnotation.java | 4 +-- .../chart/annotations/XYLineAnnotation.java | 4 +-- .../java/org/jfree/chart/plot/RingPlot.java | 4 +-- .../renderer/xy/XYLineAndShapeRenderer.java | 4 +-- .../chart/renderer/xy/XYStepRenderer.java | 4 +-- .../{LineUtilities.java => LineUtils.java} | 6 ++-- .../jfree/chart/util/LineUtilitiesTest.java | 28 +++++++++---------- 8 files changed, 31 insertions(+), 31 deletions(-) rename src/main/java/org/jfree/chart/util/{LineUtilities.java => LineUtils.java} (94%) diff --git a/src/main/java/org/jfree/chart/annotations/XYDataImageAnnotation.java b/src/main/java/org/jfree/chart/annotations/XYDataImageAnnotation.java index d6a1f2b2b..cc708dd98 100644 --- a/src/main/java/org/jfree/chart/annotations/XYDataImageAnnotation.java +++ b/src/main/java/org/jfree/chart/annotations/XYDataImageAnnotation.java @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2016, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2017, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * -------------------------- * XYDataImageAnnotation.java * -------------------------- - * (C) Copyright 2008-2016, by Object Refinery Limited and Contributors. + * (C) Copyright 2008-2017, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): Peter Kolb (patch 2809117); @@ -360,7 +360,7 @@ public Object clone() throws CloneNotSupportedException { private void writeObject(ObjectOutputStream stream) throws IOException { stream.defaultWriteObject(); // FIXME - //SerialUtilities.writeImage(this.image, stream); + //SerialUtils.writeImage(this.image, stream); } /** @@ -375,7 +375,7 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException { stream.defaultReadObject(); // FIXME - //this.image = SerialUtilities.readImage(stream); + //this.image = SerialUtils.readImage(stream); } } diff --git a/src/main/java/org/jfree/chart/annotations/XYImageAnnotation.java b/src/main/java/org/jfree/chart/annotations/XYImageAnnotation.java index 92348aca8..712c9f86b 100644 --- a/src/main/java/org/jfree/chart/annotations/XYImageAnnotation.java +++ b/src/main/java/org/jfree/chart/annotations/XYImageAnnotation.java @@ -302,7 +302,7 @@ public Object clone() throws CloneNotSupportedException { */ private void writeObject(ObjectOutputStream stream) throws IOException { stream.defaultWriteObject(); - //SerialUtilities.writeImage(this.image, stream); + //SerialUtils.writeImage(this.image, stream); } /** @@ -316,7 +316,7 @@ private void writeObject(ObjectOutputStream stream) throws IOException { private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException { stream.defaultReadObject(); - //this.image = SerialUtilities.readImage(stream); + //this.image = SerialUtils.readImage(stream); } diff --git a/src/main/java/org/jfree/chart/annotations/XYLineAnnotation.java b/src/main/java/org/jfree/chart/annotations/XYLineAnnotation.java index 264629c37..48d9efcfb 100644 --- a/src/main/java/org/jfree/chart/annotations/XYLineAnnotation.java +++ b/src/main/java/org/jfree/chart/annotations/XYLineAnnotation.java @@ -69,7 +69,7 @@ import org.jfree.chart.plot.PlotRenderingInfo; import org.jfree.chart.plot.XYPlot; import org.jfree.chart.ui.RectangleEdge; -import org.jfree.chart.util.LineUtilities; +import org.jfree.chart.util.LineUtils; import org.jfree.chart.util.ObjectUtils; import org.jfree.chart.util.PaintUtils; import org.jfree.chart.util.ParamChecks; @@ -198,7 +198,7 @@ else if (orientation == PlotOrientation.HORIZONTAL) { Line2D line = new Line2D.Float(j2DX1, j2DY1, j2DX2, j2DY2); // line is clipped to avoid JRE bug 6574155, for more info // see JFreeChart bug 2221495 - boolean visible = LineUtilities.clipLine(line, dataArea); + boolean visible = LineUtils.clipLine(line, dataArea); if (visible) { g2.draw(line); } diff --git a/src/main/java/org/jfree/chart/plot/RingPlot.java b/src/main/java/org/jfree/chart/plot/RingPlot.java index bd7cccd70..28eb4f538 100644 --- a/src/main/java/org/jfree/chart/plot/RingPlot.java +++ b/src/main/java/org/jfree/chart/plot/RingPlot.java @@ -78,7 +78,7 @@ import org.jfree.chart.ui.RectangleInsets; import org.jfree.chart.ui.TextAnchor; import org.jfree.chart.urls.PieURLGenerator; -import org.jfree.chart.util.LineUtilities; +import org.jfree.chart.util.LineUtils; import org.jfree.chart.util.ObjectUtils; import org.jfree.chart.util.PaintUtils; import org.jfree.chart.util.ParamChecks; @@ -625,7 +625,7 @@ dataset, getPieIndex(), section, key, tip, } else if (currentPass == 2) { if (this.separatorsVisible) { - Line2D extendedSeparator = LineUtilities.extendLine( + Line2D extendedSeparator = LineUtils.extendLine( separator, this.innerSeparatorExtension, this.outerSeparatorExtension); g2.setStroke(this.separatorStroke); diff --git a/src/main/java/org/jfree/chart/renderer/xy/XYLineAndShapeRenderer.java b/src/main/java/org/jfree/chart/renderer/xy/XYLineAndShapeRenderer.java index fa639d95b..04ccb9d5a 100644 --- a/src/main/java/org/jfree/chart/renderer/xy/XYLineAndShapeRenderer.java +++ b/src/main/java/org/jfree/chart/renderer/xy/XYLineAndShapeRenderer.java @@ -95,7 +95,7 @@ import org.jfree.chart.plot.XYPlot; import org.jfree.chart.ui.RectangleEdge; import org.jfree.chart.util.BooleanList; -import org.jfree.chart.util.LineUtilities; +import org.jfree.chart.util.LineUtils; import org.jfree.chart.util.ObjectUtils; import org.jfree.chart.util.ParamChecks; import org.jfree.chart.util.PublicCloneable; @@ -856,7 +856,7 @@ protected void drawPrimaryLine(XYItemRendererState state, else if (orientation == PlotOrientation.VERTICAL) { state.workingLine.setLine(transX0, transY0, transX1, transY1); } - visible = LineUtilities.clipLine(state.workingLine, dataArea); + visible = LineUtils.clipLine(state.workingLine, dataArea); if (visible) { drawFirstPassShape(g2, pass, series, item, state.workingLine); } diff --git a/src/main/java/org/jfree/chart/renderer/xy/XYStepRenderer.java b/src/main/java/org/jfree/chart/renderer/xy/XYStepRenderer.java index 07500b9ee..55a7dd0e3 100644 --- a/src/main/java/org/jfree/chart/renderer/xy/XYStepRenderer.java +++ b/src/main/java/org/jfree/chart/renderer/xy/XYStepRenderer.java @@ -91,7 +91,7 @@ import org.jfree.chart.plot.XYPlot; import org.jfree.chart.ui.RectangleEdge; import org.jfree.chart.urls.XYURLGenerator; -import org.jfree.chart.util.LineUtilities; +import org.jfree.chart.util.LineUtils; import org.jfree.chart.util.PublicCloneable; import org.jfree.data.xy.XYDataset; @@ -324,7 +324,7 @@ private void drawLine(Graphics2D g2, Line2D line, double x0, double y0, return; } line.setLine(x0, y0, x1, y1); - boolean visible = LineUtilities.clipLine(line, dataArea); + boolean visible = LineUtils.clipLine(line, dataArea); if (visible) { g2.draw(line); } diff --git a/src/main/java/org/jfree/chart/util/LineUtilities.java b/src/main/java/org/jfree/chart/util/LineUtils.java similarity index 94% rename from src/main/java/org/jfree/chart/util/LineUtilities.java rename to src/main/java/org/jfree/chart/util/LineUtils.java index 9491f99b4..fbd4d7a4a 100644 --- a/src/main/java/org/jfree/chart/util/LineUtilities.java +++ b/src/main/java/org/jfree/chart/util/LineUtils.java @@ -2,7 +2,7 @@ * JFreeChart : a free chart library for the Java(tm) platform * =========================================================== * - * (C) Copyright 2000-2016, by Object Refinery Limited and Contributors. + * (C) Copyright 2000-2017, by Object Refinery Limited and Contributors. * * Project Info: http://www.jfree.org/jfreechart/index.html * @@ -27,7 +27,7 @@ * ------------------ * LineUtilities.java * ------------------ - * (C) Copyright 2008, 2014, by Object Refinery Limited and Contributors. + * (C) Copyright 2008-2017, by Object Refinery Limited and Contributors. * * Original Author: David Gilbert (for Object Refinery Limited); * Contributor(s): -; @@ -49,7 +49,7 @@ * * @since 1.0.12 */ -public class LineUtilities { +public class LineUtils { /** * Clips the specified line to the given rectangle. diff --git a/src/test/java/org/jfree/chart/util/LineUtilitiesTest.java b/src/test/java/org/jfree/chart/util/LineUtilitiesTest.java index aac0e5b2a..17b4a0cea 100644 --- a/src/test/java/org/jfree/chart/util/LineUtilitiesTest.java +++ b/src/test/java/org/jfree/chart/util/LineUtilitiesTest.java @@ -46,7 +46,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; /** - * Tests for the {@link LineUtilities} class. + * Tests for the {@link LineUtils} class. */ public class LineUtilitiesTest { @@ -66,56 +66,56 @@ public void testClipLine() { Rectangle2D rect = new Rectangle2D.Double(1.0, 1.0, 1.0, 1.0); Line2D line = new Line2D.Double(); - assertFalse(LineUtilities.clipLine(line, rect)); + assertFalse(LineUtils.clipLine(line, rect)); assertTrue(lineEquals(line, 0.0, 0.0, 0.0, 0.0)); line.setLine(0.5, 0.5, 0.6, 0.6); - assertFalse(LineUtilities.clipLine(line, rect)); + assertFalse(LineUtils.clipLine(line, rect)); assertTrue(lineEquals(line, 0.5, 0.5, 0.6, 0.6)); line.setLine(0.5, 0.5, 1.6, 0.6); - assertFalse(LineUtilities.clipLine(line, rect)); + assertFalse(LineUtils.clipLine(line, rect)); assertTrue(lineEquals(line, 0.5, 0.5, 1.6, 0.6)); line.setLine(0.5, 0.5, 2.6, 0.6); - assertFalse(LineUtilities.clipLine(line, rect)); + assertFalse(LineUtils.clipLine(line, rect)); assertTrue(lineEquals(line, 0.5, 0.5, 2.6, 0.6)); line.setLine(0.5, 0.5, 0.6, 1.6); - assertFalse(LineUtilities.clipLine(line, rect)); + assertFalse(LineUtils.clipLine(line, rect)); assertTrue(lineEquals(line, 0.5, 0.5, 0.6, 1.6)); line.setLine(0.5, 0.5, 1.6, 1.6); - assertTrue(LineUtilities.clipLine(line, rect)); + assertTrue(LineUtils.clipLine(line, rect)); assertTrue(lineEquals(line, 1.0, 1.0, 1.6, 1.6)); line.setLine(0.5, 0.5, 2.6, 1.6); - assertTrue(LineUtilities.clipLine(line, rect)); + assertTrue(LineUtils.clipLine(line, rect)); assertTrue(lineEquals(line, 1.4545454545454546, 1.0, 2.0, 1.2857142857142858)); line.setLine(0.5, 0.5, 0.5, 2.6); - assertFalse(LineUtilities.clipLine(line, rect)); + assertFalse(LineUtils.clipLine(line, rect)); assertTrue(lineEquals(line, 0.5, 0.5, 0.5, 2.6)); line.setLine(0.5, 0.5, 1.5, 2.6); - assertTrue(LineUtilities.clipLine(line, rect)); + assertTrue(LineUtils.clipLine(line, rect)); assertTrue(lineEquals(line, 1.0, 1.55, 1.2142857142857142, 2.0)); line.setLine(0.5, 0.5, 2.5, 2.6); - assertTrue(LineUtilities.clipLine(line, rect)); + assertTrue(LineUtils.clipLine(line, rect)); assertTrue(lineEquals(line, 1.0, 1.025, 1.9285714285714284, 2.0)); line.setLine(0.5, 0.5, 1.5, 1.5); - assertTrue(LineUtilities.clipLine(line, rect)); + assertTrue(LineUtils.clipLine(line, rect)); assertTrue(lineEquals(line, 1.0, 1.0, 1.5, 1.5)); line.setLine(2.5, 1.0, 1.5, 1.5); - assertTrue(LineUtilities.clipLine(line, rect)); + assertTrue(LineUtils.clipLine(line, rect)); assertTrue(lineEquals(line, 2.0, 1.25, 1.5, 1.5)); line.setLine(1.5, 1.5, 2.5, 1.0); - assertTrue(LineUtilities.clipLine(line, rect)); + assertTrue(LineUtils.clipLine(line, rect)); assertTrue(lineEquals(line, 1.5, 1.5, 2.0, 1.25)); }