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 b30c9dd541cb1cebfa41efe234cf64d91cf25675 Author: Gary Gregory <[email protected]> AuthorDate: Tue Jul 4 10:40:00 2023 -0400 Use Java naming conventions --- .../commons/imaging/color/ColorConversions.java | 2 +- .../org/apache/commons/imaging/color/ColorHsl.java | 28 +++++++++++----------- .../apache/commons/imaging/color/ColorHslTest.java | 12 +++++----- 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 c4e30f8b..3a541caf 100644 --- a/src/main/java/org/apache/commons/imaging/color/ColorConversions.java +++ b/src/main/java/org/apache/commons/imaging/color/ColorConversions.java @@ -365,7 +365,7 @@ public final class ColorConversions { } public static int convertHSLtoRGB(final ColorHsl hsl) { - return convertHSLtoRGB(hsl.H, hsl.S, hsl.L); + return convertHSLtoRGB(hsl.h, hsl.s, hsl.l); } public static int convertHSLtoRGB(final double h, final double s, final double l) { diff --git a/src/main/java/org/apache/commons/imaging/color/ColorHsl.java b/src/main/java/org/apache/commons/imaging/color/ColorHsl.java index 447dd42b..4e9c2831 100644 --- a/src/main/java/org/apache/commons/imaging/color/ColorHsl.java +++ b/src/main/java/org/apache/commons/imaging/color/ColorHsl.java @@ -77,14 +77,14 @@ public final class ColorHsl { */ public static final ColorHsl BLUE = new ColorHsl(240, 100, 100); - public final double H; - public final double S; - public final double L; + public final double h; + public final double s; + public final double l; - public ColorHsl(final double H, final double S, final double L) { - this.H = H; - this.S = S; - this.L = L; + public ColorHsl(final double h, final double s, final double l) { + this.h = h; + this.s = s; + this.l = l; } @Override @@ -97,13 +97,13 @@ public final class ColorHsl { } final ColorHsl colorHsl = (ColorHsl) o; - if (Double.compare(colorHsl.H, H) != 0) { + if (Double.compare(colorHsl.h, h) != 0) { return false; } - if (Double.compare(colorHsl.L, L) != 0) { + if (Double.compare(colorHsl.l, l) != 0) { return false; } - if (Double.compare(colorHsl.S, S) != 0) { + if (Double.compare(colorHsl.s, s) != 0) { return false; } @@ -114,17 +114,17 @@ public final class ColorHsl { public int hashCode() { int result; long temp; - temp = Double.doubleToLongBits(H); + temp = Double.doubleToLongBits(h); result = (int) (temp ^ (temp >>> 32)); - temp = Double.doubleToLongBits(S); + temp = Double.doubleToLongBits(s); result = 31 * result + (int) (temp ^ (temp >>> 32)); - temp = Double.doubleToLongBits(L); + temp = Double.doubleToLongBits(l); result = 31 * result + (int) (temp ^ (temp >>> 32)); return result; } @Override public String toString() { - return "{H: " + H + ", S: " + S + ", L: " + L + "}"; + return "{H: " + h + ", S: " + s + ", L: " + l + "}"; } } diff --git a/src/test/java/org/apache/commons/imaging/color/ColorHslTest.java b/src/test/java/org/apache/commons/imaging/color/ColorHslTest.java index 62717f63..b6731659 100644 --- a/src/test/java/org/apache/commons/imaging/color/ColorHslTest.java +++ b/src/test/java/org/apache/commons/imaging/color/ColorHslTest.java @@ -41,9 +41,9 @@ public class ColorHslTest { final ColorHsl colorHsl = ColorHsl.BLUE; final ColorHsl colorHslTwo = new ColorHsl(100.0, 667.226, (-687.72287636)); - assertEquals(667.226, colorHslTwo.S, 0.01); - assertEquals(100.0, colorHslTwo.H, 0.01); - assertEquals((-687.72287636), colorHslTwo.L, 0.01); + assertEquals(667.226, colorHslTwo.s, 0.01); + assertEquals(100.0, colorHslTwo.h, 0.01); + assertEquals((-687.72287636), colorHslTwo.l, 0.01); assertNotEquals(colorHsl, colorHslTwo); } @@ -55,17 +55,17 @@ public class ColorHslTest { @Test public void testHAssignment() { - assertEquals(1.0, color.H, 0.0); + assertEquals(1.0, color.h, 0.0); } @Test public void testLAssignment() { - assertEquals(3.0, color.L, 0.0); + assertEquals(3.0, color.l, 0.0); } @Test public void testSAssignment() { - assertEquals(2.0, color.S, 0.0); + assertEquals(2.0, color.s, 0.0); } @Test
