This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
commit 41b159b3e86c9b18796d153757d04dbc1ba08f8b Author: Gary Gregory <[email protected]> AuthorDate: Tue Jul 4 10:34:14 2023 -0400 Use Java naming conventions --- .../commons/imaging/color/ColorConversions.java | 8 +++---- .../org/apache/commons/imaging/color/ColorXyz.java | 28 +++++++++++----------- .../apache/commons/imaging/color/ColorXyzTest.java | 6 ++--- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/apache/commons/imaging/color/ColorConversions.java b/src/main/java/org/apache/commons/imaging/color/ColorConversions.java index f44316f0..b4fcf96b 100644 --- a/src/main/java/org/apache/commons/imaging/color/ColorConversions.java +++ b/src/main/java/org/apache/commons/imaging/color/ColorConversions.java @@ -697,7 +697,7 @@ public final class ColorConversions { } public static ColorCieLab convertXYZtoCIELab(final ColorXyz xyz) { - return convertXYZtoCIELab(xyz.X, xyz.Y, xyz.Z); + return convertXYZtoCIELab(xyz.x, xyz.y, xyz.z); } public static ColorCieLab convertXYZtoCIELab(final double x, final double y, final double z) { @@ -719,7 +719,7 @@ public final class ColorConversions { } public static ColorCieLuv convertXYZtoCIELuv(final ColorXyz xyz) { - return convertXYZtoCIELuv(xyz.X, xyz.Y, xyz.Z); + return convertXYZtoCIELuv(xyz.x, xyz.y, xyz.z); } public static ColorCieLuv convertXYZtoCIELuv(final double x, final double y, final double z) { @@ -752,7 +752,7 @@ public final class ColorConversions { } public static ColorHunterLab convertXYZtoHunterLab(final ColorXyz xyz) { - return convertXYZtoHunterLab(xyz.X, xyz.Y, xyz.Z); + return convertXYZtoHunterLab(xyz.x, xyz.y, xyz.z); } public static ColorHunterLab convertXYZtoHunterLab(final double x, @@ -765,7 +765,7 @@ public final class ColorConversions { } public static int convertXYZtoRGB(final ColorXyz xyz) { - return convertXYZtoRGB(xyz.X, xyz.Y, xyz.Z); + return convertXYZtoRGB(xyz.x, xyz.y, xyz.z); } public static int convertXYZtoRGB(final double x, final double y, final double z) { diff --git a/src/main/java/org/apache/commons/imaging/color/ColorXyz.java b/src/main/java/org/apache/commons/imaging/color/ColorXyz.java index 8a5a209d..0a6f9d59 100644 --- a/src/main/java/org/apache/commons/imaging/color/ColorXyz.java +++ b/src/main/java/org/apache/commons/imaging/color/ColorXyz.java @@ -78,14 +78,14 @@ public final class ColorXyz { */ public static final ColorXyz BLUE = new ColorXyz(18.05, 7.22, 95.05); - public final double X; - public final double Y; - public final double Z; + public final double x; + public final double y; + public final double z; - public ColorXyz(final double X, final double Y, final double Z) { - this.X = X; - this.Y = Y; - this.Z = Z; + public ColorXyz(final double x, final double y, final double z) { + this.x = x; + this.y = y; + this.z = z; } @Override @@ -98,13 +98,13 @@ public final class ColorXyz { } final ColorXyz colorXyz = (ColorXyz) o; - if (Double.compare(colorXyz.X, X) != 0) { + if (Double.compare(colorXyz.x, x) != 0) { return false; } - if (Double.compare(colorXyz.Y, Y) != 0) { + if (Double.compare(colorXyz.y, y) != 0) { return false; } - if (Double.compare(colorXyz.Z, Z) != 0) { + if (Double.compare(colorXyz.z, z) != 0) { return false; } @@ -115,17 +115,17 @@ public final class ColorXyz { public int hashCode() { int result; long temp; - temp = Double.doubleToLongBits(X); + temp = Double.doubleToLongBits(x); result = (int) (temp ^ (temp >>> 32)); - temp = Double.doubleToLongBits(Y); + temp = Double.doubleToLongBits(y); result = 31 * result + (int) (temp ^ (temp >>> 32)); - temp = Double.doubleToLongBits(Z); + temp = Double.doubleToLongBits(z); result = 31 * result + (int) (temp ^ (temp >>> 32)); return result; } @Override public String toString() { - return "{X: " + X + ", Y: " + Y + ", Z: " + Z + "}"; + return "{X: " + x + ", Y: " + y + ", Z: " + z + "}"; } } diff --git a/src/test/java/org/apache/commons/imaging/color/ColorXyzTest.java b/src/test/java/org/apache/commons/imaging/color/ColorXyzTest.java index 8c127f3e..93244733 100644 --- a/src/test/java/org/apache/commons/imaging/color/ColorXyzTest.java +++ b/src/test/java/org/apache/commons/imaging/color/ColorXyzTest.java @@ -48,16 +48,16 @@ public class ColorXyzTest { @Test public void testXAssignment() { - assertEquals(1.0, color.X, 0.0); + assertEquals(1.0, color.x, 0.0); } @Test public void testYAssignment() { - assertEquals(2.0, color.Y, 0.0); + assertEquals(2.0, color.y, 0.0); } @Test public void testZAssignment() { - assertEquals(3.0, color.Z, 0.0); + assertEquals(3.0, color.z, 0.0); } }
