ngb/zeichenmaschine
1
0
Fork 0
mirror of https://github.com/jneug/zeichenmaschine.git synced 2026-04-14 06:33:34 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Color refactored

Browse Source
This commit is contained in:
ngb
2022-07-14 17:59:32 +02:00
parent 0098621ebe
commit 1e4b865492
2 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/schule/ngb/zm/Color.java
View File

@@ -146,7 +146,7 @@ public class Color {
* @param alpha Transparentwert zwischen 0 und 255. * @param alpha Transparentwert zwischen 0 und 255.
*/ */
public Color( int red, int green, int blue, int alpha ) { public Color( int red, int green, int blue, int alpha ) {
rgba = (alpha << 24) | (red << 16) | (green << 8) | blue; rgba = ((alpha&0xFF) << 24) | ((red&0xFF) << 16) | ((green&0xFF) << 8) | ((blue&0xFF) << 0);
} }
/** /**
@@ -473,7 +473,13 @@ public class Color {
* @return {@code true}, wenn die Objekte gleich sind, sonst {@code false}. * @return {@code true}, wenn die Objekte gleich sind, sonst {@code false}.
*/ */
public boolean equals( Object obj ) { public boolean equals( Object obj ) {
return obj instanceof Color && ((Color) obj).getRGBA() == this.rgba; if( obj == null ) { return false; }
if( obj instanceof Color ) {
return ((Color) obj).getRGBA() == this.rgba;
} else if( obj instanceof java.awt.Color ) {
return ((java.awt.Color) obj).getRGB() == this.rgba;
}
return false;
} }
/** /**

38
src/test/java/schule/ngb/zm/ColorTest.java
View File

@@ -17,9 +17,9 @@ class ColorTest {
assertEquals(255, c.getAlpha()); assertEquals(255, c.getAlpha());
c = Color.BLUE; c = Color.BLUE;
assertEquals(0, c.getRed()); assertEquals(49, c.getRed());
assertEquals(0, c.getGreen()); assertEquals(197, c.getGreen());
assertEquals(255, c.getBlue()); assertEquals(244, c.getBlue());
assertEquals(255, c.getAlpha()); assertEquals(255, c.getAlpha());
c = new Color(50, 133, 64, 33); c = new Color(50, 133, 64, 33);
@@ -28,7 +28,7 @@ class ColorTest {
assertEquals(64, c.getBlue()); assertEquals(64, c.getBlue());
assertEquals(33, c.getAlpha()); assertEquals(33, c.getAlpha());
c = new Color(255, 0, 0); c = new Color(240, 80, 37);
assertEquals(Color.RED, c); assertEquals(Color.RED, c);
c = new Color(33, 50); c = new Color(33, 50);
@@ -97,8 +97,9 @@ class ColorTest {
assertEquals(c1, c2); assertEquals(c1, c2);
Color yellow = new Color(255, 255, 0); Color yellow = new Color(255, 255, 0);
assertEquals(java.awt.Color.YELLOW, yellow); assertNotEquals(java.awt.Color.YELLOW, yellow);
assertNotEquals(java.awt.Color.YELLOW, Color.YELLOW); assertEquals(yellow, java.awt.Color.YELLOW);
assertNotEquals(Color.YELLOW, java.awt.Color.YELLOW);
} }
@Test @Test
@@ -132,7 +133,7 @@ class ColorTest {
@Test @Test
void getRGBColor() { void getRGBColor() {
Color c1 = Color.getRGBColor(0xFFFF0000); Color c1 = Color.getRGBColor(0xFFF05025);
assertEquals(Color.RED, c1); assertEquals(Color.RED, c1);
} }
@@ -157,7 +158,7 @@ class ColorTest {
Color c; Color c;
float[] hsl; float[] hsl;
c = Color.RED; c = new Color(255, 0, 0);
hsl = Color.RGBtoHSL(c.getRGBA(), null); hsl = Color.RGBtoHSL(c.getRGBA(), null);
assertArrayEquals(new float[]{0f,1f,.5f}, hsl, 0.0001f); assertArrayEquals(new float[]{0f,1f,.5f}, hsl, 0.0001f);
@@ -183,28 +184,37 @@ class ColorTest {
@Test @Test
void getRGBA() { void getRGBA() {
Color yellow = new Color(255, 255, 0); Color yellow = new Color(255, 255, 0);
assertEquals(java.awt.Color.YELLOW.getRGB(), Color.YELLOW.getRGBA()); assertEquals(java.awt.Color.YELLOW.getRGB(), yellow.getRGBA());
} }
@Test @Test
void getRed() { void getRed() {
Color clr = new Color(123, 92, 0);
assertEquals(123, clr.getRed());
} }
@Test @Test
void getGreen() { void getGreen() {
Color clr = new Color(123, 92, 0);
assertEquals(92, clr.getGreen());
} }
@Test @Test
void getBlue() { void getBlue() {
Color clr = new Color(123, 92, 0);
assertEquals(0, clr.getBlue());
} }
@Test @Test
void getAlpha() { void getAlpha() {
Color clr = new Color(123, 92, 0);
assertEquals(255, clr.getAlpha());
Color clr2 = new Color(123, 92, 0, 45);
assertEquals(45, clr2.getAlpha());
} }
@Test @Test
void getJavaColor() { void getJavaColor() {
assertEquals(java.awt.Color.YELLOW, Color.YELLOW.getJavaColor());
assertEquals(new java.awt.Color(255, 31, 124), new Color(255, 31, 124).getJavaColor()); assertEquals(new java.awt.Color(255, 31, 124), new Color(255, 31, 124).getJavaColor());
} }
@@ -212,16 +222,8 @@ class ColorTest {
void brighter() { void brighter() {
} }
@Test
void testBrighter() {
}
@Test @Test
void darker() { void darker() {
} }
@Test
void testDarker() {
}
} }