You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2020/03/28 22:14:39 UTC
svn commit: r1875826 - in /pivot/trunk/wtk:
src/org/apache/pivot/wtk/CSSColor.java
test/org/apache/pivot/wtk/test/CSSColorTest.java
Author: rwhitcomb
Date: Sat Mar 28 22:14:38 2020
New Revision: 1875826
URL: http://svn.apache.org/viewvc?rev=1875826&view=rev
Log:
PIVOT-1032: Finally figure out how to get rid of MethodParamPad check-style errors
in CSSColor. Get rid of some others in both CSSColor and CSSColorTest.
Modified:
pivot/trunk/wtk/src/org/apache/pivot/wtk/CSSColor.java
pivot/trunk/wtk/test/org/apache/pivot/wtk/test/CSSColorTest.java
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/CSSColor.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/CSSColor.java?rev=1875826&r1=1875825&r2=1875826&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/CSSColor.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/CSSColor.java Sat Mar 28 22:14:38 2020
@@ -53,179 +53,179 @@ import org.apache.pivot.wtk.util.ColorUt
* and {@link org.apache.pivot.wtk.content.ColorItem#allCSSColors} methods.
*/
public enum CSSColor {
- AliceBlue (240, 248, 255),
- AntiqueWhite (250, 235, 215),
- Aqua ( 0, 255, 255),
- Aquamarine (127, 255, 212),
- Azure (240, 255, 255),
- Beige (245, 245, 220),
- Bisque (255, 228, 196),
- black (Color.black),
- BLACK (Color.BLACK),
- Black ( 0, 0, 0),
- BlanchedAlmond (255, 235, 205),
- blue (Color.blue),
- BLUE (Color.BLUE),
- Blue ( 0, 0, 255),
- BlueViolet (138, 43, 226),
- Brown (165, 42, 42),
- Burlywood (222, 184, 135),
- CadetBlue ( 95, 158, 160),
- Chartreuse (127, 255, 0),
- Chocolate (210, 105, 30),
- Coral (255, 127, 80),
- CornflowerBlue (100, 149, 237),
- Cornsilk (255, 248, 220),
- Crimson (220, 20, 60),
- cyan (Color.cyan),
- CYAN (Color.CYAN),
- Cyan ( 0, 255, 255),
- DarkBlue ( 0, 0, 139),
- DarkCyan ( 0, 139, 139),
- DarkGoldenrod (184, 134, 11),
- darkGray (Color.darkGray),
- DARK_GRAY (Color.DARK_GRAY),
- DarkGray (169, 169, 169),
- DarkGreen ( 0, 100, 0),
- DarkGrey (169, 169, 169),
- DarkKhaki (189, 183, 107),
- DarkMagenta (139, 0, 139),
- DarkOliveGreen ( 85, 107, 47),
- DarkOrange (255, 140, 0),
- DarkOrchid (153, 50, 204),
- DarkRed (139, 0, 0),
- DarkSalmon (233, 150, 122),
- DarkSeaGreen (143, 188, 143),
- DarkSlateBlue ( 72, 61, 139),
- DarkSlateGray ( 47, 79, 79),
- DarkSlateGrey ( 47, 79, 79),
- DarkTurquoise ( 0, 206, 209),
- DarkViolet (148, 0, 211),
- DeepPink (255, 20, 147),
- DeepSkyBlue ( 0, 191, 255),
- DimGray (105, 105, 105),
- DimGrey (105, 105, 105),
- DodgerBlue ( 30, 144, 255),
- FireBrick (178, 34, 34),
- FloralWhite (255, 250, 240),
- ForestGreen ( 34, 139, 34),
- Fuchsia (255, 0, 255),
- Gainsboro (220, 220, 220),
- GhostWhite (248, 248, 255),
- Gold (255, 215, 0),
- Goldenrod (218, 165, 32),
- gray (Color.gray),
- GRAY (Color.GRAY),
- Gray (128, 128, 128),
- green (Color.green),
- GREEN (Color.GREEN),
- Green ( 0, 128, 0),
- GreenYellow (173, 255, 47),
- Grey (128, 128, 128),
- Honeydew (240, 255, 240),
- HotPink (255, 105, 180),
- IndianRed (205, 92, 92),
- Indigo ( 75, 0, 130),
- Ivory (255, 255, 240),
- Khaki (240, 230, 140),
- Lavender (230, 230, 250),
- LavenderBlush (255, 240, 245),
- LawnGreen (124, 252, 0),
- LemonChiffon (255, 250, 205),
- LightBlue (173, 216, 230),
- LightCoral (240, 128, 128),
- LightCyan (224, 255, 255),
+ AliceBlue(240, 248, 255),
+ AntiqueWhite(250, 235, 215),
+ Aqua( 0, 255, 255),
+ Aquamarine(127, 255, 212),
+ Azure(240, 255, 255),
+ Beige(245, 245, 220),
+ Bisque(255, 228, 196),
+ black(Color.black),
+ BLACK(Color.BLACK),
+ Black( 0, 0, 0),
+ BlanchedAlmond(255, 235, 205),
+ blue(Color.blue),
+ BLUE(Color.BLUE),
+ Blue( 0, 0, 255),
+ BlueViolet(138, 43, 226),
+ Brown(165, 42, 42),
+ Burlywood(222, 184, 135),
+ CadetBlue( 95, 158, 160),
+ Chartreuse(127, 255, 0),
+ Chocolate(210, 105, 30),
+ Coral(255, 127, 80),
+ CornflowerBlue(100, 149, 237),
+ Cornsilk(255, 248, 220),
+ Crimson(220, 20, 60),
+ cyan(Color.cyan),
+ CYAN(Color.CYAN),
+ Cyan( 0, 255, 255),
+ DarkBlue( 0, 0, 139),
+ DarkCyan( 0, 139, 139),
+ DarkGoldenrod(184, 134, 11),
+ darkGray(Color.darkGray),
+ DARK_GRAY(Color.DARK_GRAY),
+ DarkGray(169, 169, 169),
+ DarkGreen( 0, 100, 0),
+ DarkGrey(169, 169, 169),
+ DarkKhaki(189, 183, 107),
+ DarkMagenta(139, 0, 139),
+ DarkOliveGreen( 85, 107, 47),
+ DarkOrange(255, 140, 0),
+ DarkOrchid(153, 50, 204),
+ DarkRed(139, 0, 0),
+ DarkSalmon(233, 150, 122),
+ DarkSeaGreen(143, 188, 143),
+ DarkSlateBlue( 72, 61, 139),
+ DarkSlateGray( 47, 79, 79),
+ DarkSlateGrey( 47, 79, 79),
+ DarkTurquoise( 0, 206, 209),
+ DarkViolet(148, 0, 211),
+ DeepPink(255, 20, 147),
+ DeepSkyBlue( 0, 191, 255),
+ DimGray(105, 105, 105),
+ DimGrey(105, 105, 105),
+ DodgerBlue( 30, 144, 255),
+ FireBrick(178, 34, 34),
+ FloralWhite(255, 250, 240),
+ ForestGreen( 34, 139, 34),
+ Fuchsia(255, 0, 255),
+ Gainsboro(220, 220, 220),
+ GhostWhite(248, 248, 255),
+ Gold(255, 215, 0),
+ Goldenrod(218, 165, 32),
+ gray(Color.gray),
+ GRAY(Color.GRAY),
+ Gray(128, 128, 128),
+ green(Color.green),
+ GREEN(Color.GREEN),
+ Green( 0, 128, 0),
+ GreenYellow(173, 255, 47),
+ Grey(128, 128, 128),
+ Honeydew(240, 255, 240),
+ HotPink(255, 105, 180),
+ IndianRed(205, 92, 92),
+ Indigo( 75, 0, 130),
+ Ivory(255, 255, 240),
+ Khaki(240, 230, 140),
+ Lavender(230, 230, 250),
+ LavenderBlush(255, 240, 245),
+ LawnGreen(124, 252, 0),
+ LemonChiffon(255, 250, 205),
+ LightBlue(173, 216, 230),
+ LightCoral(240, 128, 128),
+ LightCyan(224, 255, 255),
LightGoldenrodYellow(250, 250, 210),
- lightGray (Color.lightGray),
- LIGHT_GRAY (Color.LIGHT_GRAY),
- LightGray (211, 211, 211),
- LightGreen (144, 238, 144),
- LightGrey (211, 211, 211),
- LightPink (255, 182, 193),
- LightSalmon (255, 160, 122),
- LightSeaGreen ( 32, 178, 170),
- LightSkyBlue (135, 206, 250),
- LightSlateGray (119, 136, 153),
- LightSlateGrey (119, 136, 153),
- LightSteelBlue (176, 196, 222),
- LightYellow (255, 255, 224),
- Lime ( 0, 255, 0),
- LimeGreen ( 50, 205, 50),
- Linen (250, 240, 230),
- magenta (Color.magenta),
- MAGENTA (Color.MAGENTA),
- Magenta (255, 0, 255),
- Maroon (128, 0, 0),
- MediumAquamarine (102, 205, 170),
- MediumBlue ( 0, 0, 205),
- MediumOrchid (186, 85, 211),
- MediumPurple (147, 112, 219),
- MediumSeaGreen ( 60, 179, 113),
- MediumSlateBlue (123, 104, 238),
- MediumSpringGreen ( 0, 250, 154),
- MediumTurquoise ( 72, 209, 204),
- MediumVioletRed (199, 21, 133),
- MidnightBlue ( 25, 25, 112),
- MintCream (245, 255, 250),
- MistyRose (255, 228, 225),
- Moccasin (255, 228, 181),
- NavajoWhite (255, 222, 173),
- Navy ( 0, 0, 128),
- OldLace (253, 245, 230),
- Olive (128, 128, 0),
- OliveDrab (107, 142, 35),
- orange (Color.orange),
- ORANGE (Color.ORANGE),
- Orange (255, 165, 0),
- OrangeRed (255, 69, 0),
- Orchid (218, 112, 214),
- PaleGoldenrod (238, 232, 170),
- PaleGreen (152, 251, 152),
- PaleTurquoise (175, 238, 238),
- PaleVioletRed (219, 112, 147),
- PapayaWhip (255, 239, 213),
- PeachPuff (255, 218, 185),
- Peru (205, 133, 63),
- pink (Color.pink),
- PINK (Color.PINK),
- Pink (255, 192, 203),
- Plum (221, 160, 221),
- PowderBlue (176, 224, 230),
- Purple (128, 0, 128),
- red (Color.red),
- RED (Color.RED),
- Red (255, 0, 0),
- RosyBrown (188, 143, 143),
- RoyalBlue ( 65, 105, 225),
- SaddleBrown (139, 69, 19),
- Salmon (250, 128, 114),
- SandyBrown (244, 164, 96),
- SeaGreen ( 46, 139, 87),
- Seashell (255, 245, 238),
- Sienna (160, 82, 45),
- Silver (192, 192, 192),
- SkyBlue (135, 206, 235),
- SlateBlue (106, 90, 205),
- SlateGray (112, 128, 144),
- SlateGrey (112, 128, 144),
- Snow (255, 250, 250),
- SpringGreen ( 0, 255, 127),
- SteelBlue ( 70, 130, 180),
- Tan (210, 180, 140),
- Teal ( 0, 128, 128),
- Thistle (216, 191, 216),
- Tomato (255, 99, 71),
- Turquoise ( 64, 224, 208),
- Violet (238, 130, 238),
- Wheat (245, 222, 179),
- white (Color.white),
- WHITE (Color.WHITE),
- White (255, 255, 255),
- WhiteSmoke (245, 245, 245),
- yellow (Color.yellow),
- YELLOW (Color.YELLOW),
- Yellow (255, 255, 0),
- YellowGreen (154, 205, 50);
+ lightGray(Color.lightGray),
+ LIGHT_GRAY(Color.LIGHT_GRAY),
+ LightGray(211, 211, 211),
+ LightGreen(144, 238, 144),
+ LightGrey(211, 211, 211),
+ LightPink(255, 182, 193),
+ LightSalmon(255, 160, 122),
+ LightSeaGreen( 32, 178, 170),
+ LightSkyBlue(135, 206, 250),
+ LightSlateGray(119, 136, 153),
+ LightSlateGrey(119, 136, 153),
+ LightSteelBlue(176, 196, 222),
+ LightYellow(255, 255, 224),
+ Lime( 0, 255, 0),
+ LimeGreen( 50, 205, 50),
+ Linen(250, 240, 230),
+ magenta(Color.magenta),
+ MAGENTA(Color.MAGENTA),
+ Magenta(255, 0, 255),
+ Maroon(128, 0, 0),
+ MediumAquamarine(102, 205, 170),
+ MediumBlue( 0, 0, 205),
+ MediumOrchid(186, 85, 211),
+ MediumPurple(147, 112, 219),
+ MediumSeaGreen( 60, 179, 113),
+ MediumSlateBlue(123, 104, 238),
+ MediumSpringGreen( 0, 250, 154),
+ MediumTurquoise( 72, 209, 204),
+ MediumVioletRed(199, 21, 133),
+ MidnightBlue( 25, 25, 112),
+ MintCream(245, 255, 250),
+ MistyRose(255, 228, 225),
+ Moccasin(255, 228, 181),
+ NavajoWhite(255, 222, 173),
+ Navy( 0, 0, 128),
+ OldLace(253, 245, 230),
+ Olive(128, 128, 0),
+ OliveDrab(107, 142, 35),
+ orange(Color.orange),
+ ORANGE(Color.ORANGE),
+ Orange(255, 165, 0),
+ OrangeRed(255, 69, 0),
+ Orchid(218, 112, 214),
+ PaleGoldenrod(238, 232, 170),
+ PaleGreen(152, 251, 152),
+ PaleTurquoise(175, 238, 238),
+ PaleVioletRed(219, 112, 147),
+ PapayaWhip(255, 239, 213),
+ PeachPuff(255, 218, 185),
+ Peru(205, 133, 63),
+ pink(Color.pink),
+ PINK(Color.PINK),
+ Pink(255, 192, 203),
+ Plum(221, 160, 221),
+ PowderBlue(176, 224, 230),
+ Purple(128, 0, 128),
+ red(Color.red),
+ RED(Color.RED),
+ Red(255, 0, 0),
+ RosyBrown(188, 143, 143),
+ RoyalBlue( 65, 105, 225),
+ SaddleBrown(139, 69, 19),
+ Salmon(250, 128, 114),
+ SandyBrown(244, 164, 96),
+ SeaGreen( 46, 139, 87),
+ Seashell(255, 245, 238),
+ Sienna(160, 82, 45),
+ Silver(192, 192, 192),
+ SkyBlue(135, 206, 235),
+ SlateBlue(106, 90, 205),
+ SlateGray(112, 128, 144),
+ SlateGrey(112, 128, 144),
+ Snow(255, 250, 250),
+ SpringGreen( 0, 255, 127),
+ SteelBlue( 70, 130, 180),
+ Tan(210, 180, 140),
+ Teal( 0, 128, 128),
+ Thistle(216, 191, 216),
+ Tomato(255, 99, 71),
+ Turquoise( 64, 224, 208),
+ Violet(238, 130, 238),
+ Wheat(245, 222, 179),
+ white(Color.white),
+ WHITE(Color.WHITE),
+ White(255, 255, 255),
+ WhiteSmoke(245, 245, 245),
+ yellow(Color.yellow),
+ YELLOW(Color.YELLOW),
+ Yellow(255, 255, 0),
+ YellowGreen(154, 205, 50);
/** The color value associated with this CSS color name. */
private Color color;
@@ -256,10 +256,10 @@ public enum CSSColor {
/**
* Construct from one of the {@link Color} equivalents.
- * @param color The Java AWT color value this corresponds to.
+ * @param awtColor The Java AWT color value this corresponds to.
*/
- CSSColor(final Color color) {
- this.color = color;
+ CSSColor(final Color awtColor) {
+ this.color = awtColor;
// Okay, this is ugly, BUT Color.GREEN isn't the same color as our "Green"
// (0,255,0) vs. (0,128,0), so make an ugly hack involving case, such that
// "Green" is our color, but "green" or "GREEN" is the Java version.
@@ -336,7 +336,7 @@ public enum CSSColor {
* @param color An RGB (solid) color to match with these values.
* @return The complete set (could be empty) of these colors with the same RGB values.
*/
- public static Set<CSSColor> getMatchingColors(Color color) {
+ public static Set<CSSColor> getMatchingColors(final Color color) {
Set<CSSColor> matches = EnumSet.noneOf(CSSColor.class);
Color solidColor = ColorUtilities.toSolidColor(color);
for (CSSColor cssColor : values()) {
Modified: pivot/trunk/wtk/test/org/apache/pivot/wtk/test/CSSColorTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/CSSColorTest.java?rev=1875826&r1=1875825&r2=1875826&view=diff
==============================================================================
--- pivot/trunk/wtk/test/org/apache/pivot/wtk/test/CSSColorTest.java (original)
+++ pivot/trunk/wtk/test/org/apache/pivot/wtk/test/CSSColorTest.java Sat Mar 28 22:14:38 2020
@@ -37,7 +37,7 @@ import org.apache.pivot.wtk.util.ColorUt
* Tests the {@link CSSColor} enum and various {@link ColorUtilities} methods.
*/
public class CSSColorTest {
- private void testColors(CSSColor original, CSSColor lookup) {
+ private void testColors(final CSSColor original, final CSSColor lookup) {
// Doing an exact match here is problematic because many of the
// CSS colors have duplicate color values, even synonyms
// (vis. DarkGray and DarkGrey), so do some clever checking.
@@ -73,7 +73,7 @@ public class CSSColorTest {
CSSColor lookupByDecodedValue = CSSColor.fromColor(decodedColor);
testColors(css, lookupByDecodedValue);
- String enumName = ((Object)css).toString();
+ String enumName = ((Object) css).toString();
CSSColor lookupByEnumName = CSSColor.fromString(enumName);
assertEquals(css, lookupByEnumName);
}
@@ -87,7 +87,8 @@ public class CSSColorTest {
if (clazz.equals(Color.class)) {
String javaColorName = f.getName();
CSSColor cssEquivalent = CSSColor.fromString(javaColorName);
- assertEquals(f.getName() + " does not match in CSSColor lookup", cssEquivalent.getColor(), (Color)f.get(null));
+ assertEquals(f.getName() + " does not match in CSSColor lookup",
+ cssEquivalent.getColor(), (Color) f.get(null));
}
}
}