Author: rwhitcomb
Date: Fri Feb 12 21:24:48 2016
New Revision: 1730110
URL: http://svn.apache.org/viewvc?rev=1730110&view=rev
Log:
PIVOT-985 (again): Since we supported the British spelling variation of these
two colors, it seems only right to support this variation for the "gray" value
as well (meaning "grey"). So, add that in the same way as the other two.
This is a merge of revision 1730108 from "trunk" to "branches/2.0.x".
Modified:
pivot/branches/2.0.x/ (props changed)
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/GraphicsUtilities.java
Propchange: pivot/branches/2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 12 21:24:48 2016
@@ -1 +1 @@
-/pivot/trunk:1346574,1347051,1394847,1394858,1398511,1399331,1401781,1405882,1407585,1409081,1410536,1410555,1417081,1417258,1428056,1428650,1435351,1436707,1438126,1438659,1444260,1444910,1502657,1510821,1516518,1519859,1522078,1523205,1523736,1523776,1525982,1526005,1536829,1537222,1604238,1610563,1611829,1614462,1624381,1675204,1675517,1678238,1678251,1687873-1687874,1688306,1688484,1688523,1691618,1712175,1717360,1727931,1728247,1729480,1729493,1730100
+/pivot/trunk:1346574,1347051,1394847,1394858,1398511,1399331,1401781,1405882,1407585,1409081,1410536,1410555,1417081,1417258,1428056,1428650,1435351,1436707,1438126,1438659,1444260,1444910,1502657,1510821,1516518,1519859,1522078,1523205,1523736,1523776,1525982,1526005,1536829,1537222,1604238,1610563,1611829,1614462,1624381,1675204,1675517,1678238,1678251,1687873-1687874,1688306,1688484,1688523,1691618,1712175,1717360,1727931,1728247,1729480,1729493,1730100,1730108
Modified:
pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/GraphicsUtilities.java
URL:
http://svn.apache.org/viewvc/pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/GraphicsUtilities.java?rev=1730110&r1=1730109&r2=1730110&view=diff
==============================================================================
--- pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/GraphicsUtilities.java
(original)
+++ pivot/branches/2.0.x/wtk/src/org/apache/pivot/wtk/GraphicsUtilities.java
Fri Feb 12 21:24:48 2016
@@ -228,11 +228,14 @@ public final class GraphicsUtilities {
color =
(Color)Color.class.getDeclaredField(valueLowercase).get(null);
} catch (Exception exception) {
// PIVOT-985: special case for two values (plus spelling
variants)
- // that don't work with just a pure lower case name lookup
+ // that don't work with just a pure lower case name lookup,
plus the
+ // British spelling variant of the standard "gray".
if (valueLowercase.equals("darkgray") ||
valueLowercase.equals("darkgrey")) {
color = Color.darkGray;
} else if (valueLowercase.equals("lightgray") ||
valueLowercase.equals("lightgrey")) {
color = Color.lightGray;
+ } else if (valueLowercase.equals("grey")) {
+ color = Color.gray;
} else {
throw new IllegalArgumentException("\"" + valueLowercase
+ "\" is not a valid color constant.");
