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 dcecdda5038beb42a4a3dbc21a47ca46a168aa16 Author: Gary Gregory <[email protected]> AuthorDate: Tue Jul 4 10:40:38 2023 -0400 Use Java naming conventions --- .../commons/imaging/color/ColorConversions.java | 2 +- .../org/apache/commons/imaging/color/ColorHsv.java | 28 +++++++++++----------- .../apache/commons/imaging/color/ColorHsvTest.java | 6 ++--- 3 files changed, 18 insertions(+), 18 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 3a541caf..30efebff 100644 --- a/src/main/java/org/apache/commons/imaging/color/ColorConversions.java +++ b/src/main/java/org/apache/commons/imaging/color/ColorConversions.java @@ -396,7 +396,7 @@ public final class ColorConversions { } public static int convertHSVtoRGB(final ColorHsv HSV) { - return convertHSVtoRGB(HSV.H, HSV.S, HSV.V); + return convertHSVtoRGB(HSV.h, HSV.s, HSV.v); } public static int convertHSVtoRGB(final double h, final double s, final double v) { diff --git a/src/main/java/org/apache/commons/imaging/color/ColorHsv.java b/src/main/java/org/apache/commons/imaging/color/ColorHsv.java index 1650dbc1..1b6974e7 100644 --- a/src/main/java/org/apache/commons/imaging/color/ColorHsv.java +++ b/src/main/java/org/apache/commons/imaging/color/ColorHsv.java @@ -77,14 +77,14 @@ public final class ColorHsv { */ public static final ColorHsv BLUE = new ColorHsv(240, 100, 100); - public final double H; - public final double S; - public final double V; + public final double h; + public final double s; + public final double v; - public ColorHsv(final double H, final double S, final double V) { - this.H = H; - this.S = S; - this.V = V; + public ColorHsv(final double h, final double s, final double v) { + this.h = h; + this.s = s; + this.v = v; } @Override @@ -97,13 +97,13 @@ public final class ColorHsv { } final ColorHsv colorHsv = (ColorHsv) o; - if (Double.compare(colorHsv.H, H) != 0) { + if (Double.compare(colorHsv.h, h) != 0) { return false; } - if (Double.compare(colorHsv.S, S) != 0) { + if (Double.compare(colorHsv.s, s) != 0) { return false; } - if (Double.compare(colorHsv.V, V) != 0) { + if (Double.compare(colorHsv.v, v) != 0) { return false; } @@ -114,17 +114,17 @@ public final class ColorHsv { 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(V); + temp = Double.doubleToLongBits(v); result = 31 * result + (int) (temp ^ (temp >>> 32)); return result; } @Override public String toString() { - return "{H: " + H + ", S: " + S + ", V: " + V + "}"; + return "{H: " + h + ", S: " + s + ", V: " + v + "}"; } } diff --git a/src/test/java/org/apache/commons/imaging/color/ColorHsvTest.java b/src/test/java/org/apache/commons/imaging/color/ColorHsvTest.java index a4543e86..81937091 100644 --- a/src/test/java/org/apache/commons/imaging/color/ColorHsvTest.java +++ b/src/test/java/org/apache/commons/imaging/color/ColorHsvTest.java @@ -43,12 +43,12 @@ public class ColorHsvTest { @Test public void testHAssignment() { - assertEquals(1.0, color.H, 0.0); + assertEquals(1.0, color.h, 0.0); } @Test public void testSAssignment() { - assertEquals(2.0, color.S, 0.0); + assertEquals(2.0, color.s, 0.0); } @Test @@ -58,6 +58,6 @@ public class ColorHsvTest { @Test public void testVAssignment() { - assertEquals(3.0, color.V, 0.0); + assertEquals(3.0, color.v, 0.0); } }
