You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/07/04 15:05:06 UTC
[commons-imaging] 13/19: Use Java naming conventions
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 245a90203a960237a0ce7739087f5d86ea19ecd5
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jul 4 10:38:13 2023 -0400
Use Java naming conventions
---
.../apache/commons/imaging/color/ColorCmyk.java | 38 +++++++++++-----------
.../commons/imaging/color/ColorConversions.java | 2 +-
.../commons/imaging/color/ColorCmykTest.java | 8 ++---
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java b/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java
index adde01f6..aa07c611 100644
--- a/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java
+++ b/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java
@@ -115,16 +115,16 @@ public final class ColorCmyk {
*/
public static final ColorCmyk BLUE = new ColorCmyk(100, 100, 0, 0);
- public final double C;
- public final double M;
- public final double Y;
- public final double K;
-
- public ColorCmyk(final double C, final double M, final double Y, final double K) {
- this.C = C;
- this.M = M;
- this.Y = Y;
- this.K = K;
+ public final double c;
+ public final double m;
+ public final double y;
+ public final double k;
+
+ public ColorCmyk(final double c, final double m, final double y, final double k) {
+ this.c = c;
+ this.m = m;
+ this.y = y;
+ this.k = k;
}
@Override
@@ -137,16 +137,16 @@ public final class ColorCmyk {
}
final ColorCmyk colorCmyk = (ColorCmyk) o;
- if (Double.compare(colorCmyk.C, C) != 0) {
+ if (Double.compare(colorCmyk.c, c) != 0) {
return false;
}
- if (Double.compare(colorCmyk.K, K) != 0) {
+ if (Double.compare(colorCmyk.k, k) != 0) {
return false;
}
- if (Double.compare(colorCmyk.M, M) != 0) {
+ if (Double.compare(colorCmyk.m, m) != 0) {
return false;
}
- if (Double.compare(colorCmyk.Y, Y) != 0) {
+ if (Double.compare(colorCmyk.y, y) != 0) {
return false;
}
@@ -157,19 +157,19 @@ public final class ColorCmyk {
public int hashCode() {
int result;
long temp;
- temp = Double.doubleToLongBits(C);
+ temp = Double.doubleToLongBits(c);
result = (int) (temp ^ (temp >>> 32));
- temp = Double.doubleToLongBits(M);
+ temp = Double.doubleToLongBits(m);
result = 31 * result + (int) (temp ^ (temp >>> 32));
- temp = Double.doubleToLongBits(Y);
+ temp = Double.doubleToLongBits(y);
result = 31 * result + (int) (temp ^ (temp >>> 32));
- temp = Double.doubleToLongBits(K);
+ temp = Double.doubleToLongBits(k);
result = 31 * result + (int) (temp ^ (temp >>> 32));
return result;
}
@Override
public String toString() {
- return "{C: " + C + ", M: " + M + ", Y: " + Y + ", K: " + K + "}";
+ return "{C: " + c + ", M: " + m + ", Y: " + y + ", K: " + k + "}";
}
}
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 f351008e..3f6f239a 100644
--- a/src/main/java/org/apache/commons/imaging/color/ColorConversions.java
+++ b/src/main/java/org/apache/commons/imaging/color/ColorConversions.java
@@ -220,7 +220,7 @@ public final class ColorConversions {
}
public static ColorCmy convertCMYKtoCMY(final ColorCmyk cmyk) {
- return convertCMYKtoCMY(cmyk.C, cmyk.M, cmyk.Y, cmyk.K);
+ return convertCMYKtoCMY(cmyk.c, cmyk.m, cmyk.y, cmyk.k);
}
public static ColorCmy convertCMYKtoCMY(double c, double m, double y,
diff --git a/src/test/java/org/apache/commons/imaging/color/ColorCmykTest.java b/src/test/java/org/apache/commons/imaging/color/ColorCmykTest.java
index ea61c564..007d8836 100644
--- a/src/test/java/org/apache/commons/imaging/color/ColorCmykTest.java
+++ b/src/test/java/org/apache/commons/imaging/color/ColorCmykTest.java
@@ -37,7 +37,7 @@ public class ColorCmykTest {
@Test
public void testCAssignment() {
- assertEquals(1.0, color.C, 0.0);
+ assertEquals(1.0, color.c, 0.0);
}
@Test
@@ -50,12 +50,12 @@ public class ColorCmykTest {
*/
@Test
public void testKAssignment() {
- assertEquals(4.0, color.K, 0.0);
+ assertEquals(4.0, color.k, 0.0);
}
@Test
public void testMAssignment() {
- assertEquals(2.0, color.M, 0.0);
+ assertEquals(2.0, color.m, 0.0);
}
@Test
@@ -65,6 +65,6 @@ public class ColorCmykTest {
@Test
public void testYAssignment() {
- assertEquals(3.0, color.Y, 0.0);
+ assertEquals(3.0, color.y, 0.0);
}
}