You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/06/26 23:51:17 UTC
svn commit: r788879 - in /incubator/pivot/trunk:
core/src/org/apache/pivot/util/ tools/src/org/apache/pivot/tools/net/
web/src/org/apache/pivot/web/ web/src/org/apache/pivot/web/server/
wtk/src/org/apache/pivot/wtk/ wtk/src/org/apache/pivot/wtk/media/d...
Author: gbrown
Date: Fri Jun 26 21:51:16 2009
New Revision: 788879
URL: http://svn.apache.org/viewvc?rev=788879&view=rev
Log:
Standardize enum decode() implementations.
Modified:
incubator/pivot/trunk/core/src/org/apache/pivot/util/Vote.java
incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/HTTPClient.java
incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/Request.java
incubator/pivot/trunk/web/src/org/apache/pivot/web/Query.java
incubator/pivot/trunk/web/src/org/apache/pivot/web/server/QueryServlet.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Cursor.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Direction.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DropAction.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/GraphicsUtilities.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/HorizontalAlignment.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MessageType.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Mouse.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Orientation.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollPane.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SortDirection.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextDecoration.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/VerticalAlignment.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/drawing/Arc.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/drawing/Path.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java
Modified: incubator/pivot/trunk/core/src/org/apache/pivot/util/Vote.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/core/src/org/apache/pivot/util/Vote.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/core/src/org/apache/pivot/util/Vote.java (original)
+++ incubator/pivot/trunk/core/src/org/apache/pivot/util/Vote.java Fri Jun 26 21:51:16 2009
@@ -69,6 +69,21 @@
}
public static Vote decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ Vote vote;
+ if (value.equals("approve")) {
+ vote = APPROVE;
+ } else if (value.equals("deny")) {
+ vote = DENY;
+ } else if (value.equals("defer")) {
+ vote = DEFER;
+ } else {
+ vote = valueOf(value);
+ }
+
+ return vote;
}
}
Modified: incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/HTTPClient.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/HTTPClient.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/HTTPClient.java (original)
+++ incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/HTTPClient.java Fri Jun 26 21:51:16 2009
@@ -66,7 +66,20 @@
HTTPS;
public static Protocol decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ Protocol protocol;
+ if (value.equals("http")) {
+ protocol = HTTP;
+ } else if (value.equals("https")) {
+ protocol = HTTPS;
+ } else {
+ protocol = valueOf(value);
+ }
+
+ return protocol;
}
public boolean isSecure() {
Modified: incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/Request.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/Request.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/Request.java (original)
+++ incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/Request.java Fri Jun 26 21:51:16 2009
@@ -33,7 +33,6 @@
import org.apache.pivot.util.ListenerList;
import org.apache.pivot.util.concurrent.TaskExecutionException;
-
/**
* An asynchronous operation that executes an HTTP request.
*
@@ -55,7 +54,30 @@
TRACE;
public static Method decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ Method method;
+ if (value.equals("get")) {
+ method = GET;
+ } else if (value.equals("post")) {
+ method = POST;
+ } else if (value.equals("put")) {
+ method = PUT;
+ } else if (value.equals("delete")) {
+ method = DELETE;
+ } else if (value.equals("options")) {
+ method = OPTIONS;
+ } else if (value.equals("head")) {
+ method = HEAD;
+ } else if (value.equals("trace")) {
+ method = TRACE;
+ } else {
+ method = valueOf(value);
+ }
+
+ return method;
}
public boolean supportsOutput() {
Modified: incubator/pivot/trunk/web/src/org/apache/pivot/web/Query.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/web/src/org/apache/pivot/web/Query.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/web/src/org/apache/pivot/web/Query.java (original)
+++ incubator/pivot/trunk/web/src/org/apache/pivot/web/Query.java Fri Jun 26 21:51:16 2009
@@ -61,7 +61,31 @@
* @author gbrown
*/
public enum Method {
- GET, POST, PUT, DELETE
+ GET,
+ POST,
+ PUT,
+ DELETE;
+
+ public static Method decode(String value) {
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ Method method;
+ if (value.equals("get")) {
+ method = GET;
+ } else if (value.equals("post")) {
+ method = POST;
+ } else if (value.equals("put")) {
+ method = PUT;
+ } else if (value.equals("delete")) {
+ method = DELETE;
+ } else {
+ method = valueOf(value);
+ }
+
+ return method;
+ }
}
/**
Modified: incubator/pivot/trunk/web/src/org/apache/pivot/web/server/QueryServlet.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/web/src/org/apache/pivot/web/server/QueryServlet.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/web/src/org/apache/pivot/web/server/QueryServlet.java (original)
+++ incubator/pivot/trunk/web/src/org/apache/pivot/web/server/QueryServlet.java Fri Jun 26 21:51:16 2009
@@ -48,18 +48,35 @@
static final long serialVersionUID = -646654620936816287L;
/**
- * The supported HTTP methods.
+ * Supported HTTP methods.
*
* @author tvolkert
*/
- protected enum Method {
+ public enum Method {
GET,
POST,
PUT,
DELETE;
public static Method decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ Method method;
+ if (value.equals("get")) {
+ method = GET;
+ } else if (value.equals("post")) {
+ method = POST;
+ } else if (value.equals("put")) {
+ method = PUT;
+ } else if (value.equals("delete")) {
+ method = DELETE;
+ } else {
+ method = valueOf(value);
+ }
+
+ return method;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java Fri Jun 26 21:51:16 2009
@@ -46,7 +46,22 @@
MIXED;
public static State decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ State state;
+ if (value.equals("selected")) {
+ state = SELECTED;
+ } else if (value.equals("unselected")) {
+ state = UNSELECTED;
+ } else if (value.equals("mixed")) {
+ state = MIXED;
+ } else {
+ state = valueOf(value);
+ }
+
+ return state;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Cursor.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Cursor.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Cursor.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Cursor.java Fri Jun 26 21:51:16 2009
@@ -39,42 +39,40 @@
public static Cursor decode(String value) {
if (value == null) {
- throw new IllegalArgumentException("value is null.");
+ throw new IllegalArgumentException();
}
Cursor cursor = null;
-
- if (value.equalsIgnoreCase("default")) {
+ if (value.equals("default")) {
cursor = Cursor.DEFAULT;
- } else if (value.equalsIgnoreCase("hand")) {
+ } else if (value.equals("hand")) {
cursor = Cursor.HAND;
- } else if (value.equalsIgnoreCase("text")) {
+ } else if (value.equals("text")) {
cursor = Cursor.TEXT;
- } else if (value.equalsIgnoreCase("wait")) {
+ } else if (value.equals("wait")) {
cursor = Cursor.WAIT;
- } else if (value.equalsIgnoreCase("crosshair")) {
+ } else if (value.equals("crosshair")) {
cursor = Cursor.CROSSHAIR;
- } else if (value.equalsIgnoreCase("move")) {
+ } else if (value.equals("move")) {
cursor = Cursor.MOVE;
- } else if (value.equalsIgnoreCase("resizeNorth")) {
+ } else if (value.equals("resizeNorth")) {
cursor = Cursor.RESIZE_NORTH;
- } else if (value.equalsIgnoreCase("resizeSouth")) {
+ } else if (value.equals("resizeSouth")) {
cursor = Cursor.RESIZE_SOUTH;
- } else if (value.equalsIgnoreCase("resizeEast")) {
+ } else if (value.equals("resizeEast")) {
cursor = Cursor.RESIZE_EAST;
- } else if (value.equalsIgnoreCase("resizeWest")) {
+ } else if (value.equals("resizeWest")) {
cursor = Cursor.RESIZE_WEST;
- } else if (value.equalsIgnoreCase("resizeNorthEast")) {
+ } else if (value.equals("resizeNorthEast")) {
cursor = Cursor.RESIZE_NORTH_EAST;
- } else if (value.equalsIgnoreCase("resizeNorthWest")) {
+ } else if (value.equals("resizeNorthWest")) {
cursor = Cursor.RESIZE_NORTH_WEST;
- } else if (value.equalsIgnoreCase("resizeSouthEast")) {
+ } else if (value.equals("resizeSouthEast")) {
cursor = Cursor.RESIZE_SOUTH_EAST;
- } else if (value.equalsIgnoreCase("resizeSouthWest")) {
+ } else if (value.equals("resizeSouthWest")) {
cursor = Cursor.RESIZE_SOUTH_WEST;
} else {
- throw new IllegalArgumentException("\"" + value
- + "\" is not a valid cursor.");
+ cursor = valueOf(value);
}
return cursor;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Direction.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Direction.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Direction.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Direction.java Fri Jun 26 21:51:16 2009
@@ -26,6 +26,19 @@
BACKWARD;
public static Direction decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ Direction direction;
+ if (value.equals("forward")) {
+ direction = FORWARD;
+ } else if (value.equals("backward")) {
+ direction = BACKWARD;
+ } else {
+ direction = valueOf(value);
+ }
+
+ return direction;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DropAction.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DropAction.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DropAction.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DropAction.java Fri Jun 26 21:51:16 2009
@@ -35,6 +35,21 @@
}
public static DropAction decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ DropAction dropAction;
+ if (value.equals("copy")) {
+ dropAction = COPY;
+ } else if (value.equals("move")) {
+ dropAction = MOVE;
+ } else if (value.equals("link")) {
+ dropAction = LINK;
+ } else {
+ dropAction = valueOf(value);
+ }
+
+ return dropAction;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/GraphicsUtilities.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/GraphicsUtilities.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/GraphicsUtilities.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/GraphicsUtilities.java Fri Jun 26 21:51:16 2009
@@ -59,7 +59,7 @@
} else if (value.equals("radialGradient")) {
paintType = RADIAL_GRADIENT;
} else {
- throw new IllegalArgumentException("\"" + value + "\" is not a valid paint type.");
+ paintType = valueOf(value);
}
return paintType;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/HorizontalAlignment.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/HorizontalAlignment.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/HorizontalAlignment.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/HorizontalAlignment.java Fri Jun 26 21:51:16 2009
@@ -32,6 +32,23 @@
JUSTIFY;
public static HorizontalAlignment decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ HorizontalAlignment horizontalAlignment;
+ if (value.equals("right")) {
+ horizontalAlignment = RIGHT;
+ } else if (value.equals("left")) {
+ horizontalAlignment = LEFT;
+ } else if (value.equals("center")) {
+ horizontalAlignment = CENTER;
+ } else if (value.equals("justify")) {
+ horizontalAlignment = JUSTIFY;
+ } else {
+ horizontalAlignment = valueOf(value);
+ }
+
+ return horizontalAlignment;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Keyboard.java Fri Jun 26 21:51:16 2009
@@ -45,7 +45,24 @@
}
public static Modifier decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ Modifier modifier;
+ if (value.equals("shift")) {
+ modifier = SHIFT;
+ } else if (value.equals("ctrl")) {
+ modifier = CTRL;
+ } else if (value.equals("alt")) {
+ modifier = ALT;
+ } else if (value.equals("meta")) {
+ modifier = META;
+ } else {
+ modifier = valueOf(value);
+ }
+
+ return modifier;
}
}
@@ -61,7 +78,24 @@
KEYPAD;
public static KeyLocation decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ KeyLocation keyLocation;
+ if (value.equals("standard")) {
+ keyLocation = STANDARD;
+ } else if (value.equals("left")) {
+ keyLocation = LEFT;
+ } else if (value.equals("right")) {
+ keyLocation = RIGHT;
+ } else if (value.equals("keypad")) {
+ keyLocation = KEYPAD;
+ } else {
+ keyLocation = valueOf(value);
+ }
+
+ return keyLocation;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ListView.java Fri Jun 26 21:51:16 2009
@@ -56,7 +56,22 @@
MULTI;
public static SelectMode decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ SelectMode selectMode;
+ if (value.equals("none")) {
+ selectMode = NONE;
+ } else if (value.equals("single")) {
+ selectMode = SINGLE;
+ } else if (value.equals("multi")) {
+ selectMode = MULTI;
+ } else {
+ selectMode = valueOf(value);
+ }
+
+ return selectMode;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MessageType.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MessageType.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MessageType.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/MessageType.java Fri Jun 26 21:51:16 2009
@@ -29,6 +29,25 @@
APPLICATION;
public static MessageType decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ MessageType messageType;
+ if (value.equals("error")) {
+ messageType = ERROR;
+ } else if (value.equals("warning")) {
+ messageType = WARNING;
+ } else if (value.equals("question")) {
+ messageType = QUESTION;
+ } else if (value.equals("info")) {
+ messageType = INFO;
+ } else if (value.equals("application")) {
+ messageType = APPLICATION;
+ } else {
+ messageType = valueOf(value);
+ }
+
+ return messageType;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Mouse.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Mouse.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Mouse.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Mouse.java Fri Jun 26 21:51:16 2009
@@ -43,7 +43,22 @@
}
public static Button decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ Button button;
+ if (value.equals("left")) {
+ button = LEFT;
+ } else if (value.equals("right")) {
+ button = RIGHT;
+ } else if (value.equals("middle")) {
+ button = MIDDLE;
+ } else {
+ button = valueOf(value);
+ }
+
+ return button;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Orientation.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Orientation.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Orientation.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Orientation.java Fri Jun 26 21:51:16 2009
@@ -26,6 +26,19 @@
VERTICAL;
public static Orientation decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ Orientation orientation;
+ if (value.equals("horizontal")) {
+ orientation = HORIZONTAL;
+ } else if (value.equals("vertical")) {
+ orientation = VERTICAL;
+ } else {
+ orientation = valueOf(value);
+ }
+
+ return orientation;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollPane.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollPane.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollPane.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScrollPane.java Fri Jun 26 21:51:16 2009
@@ -41,24 +41,22 @@
public static ScrollBarPolicy decode(String value) {
if (value == null) {
- throw new IllegalArgumentException("value is null.");
+ throw new IllegalArgumentException();
}
ScrollBarPolicy scrollBarPolicy = null;
-
- if (value.equalsIgnoreCase("auto")) {
+ if (value.equals("auto")) {
scrollBarPolicy = AUTO;
- } else if (value.equalsIgnoreCase("never")) {
+ } else if (value.equals("never")) {
scrollBarPolicy = NEVER;
- } else if (value.equalsIgnoreCase("always")) {
+ } else if (value.equals("always")) {
scrollBarPolicy = ALWAYS;
- } else if (value.equalsIgnoreCase("fill")) {
+ } else if (value.equals("fill")) {
scrollBarPolicy = FILL;
- } else if (value.equalsIgnoreCase("fillToCapacity")) {
+ } else if (value.equals("fillToCapacity")) {
scrollBarPolicy = FILL_TO_CAPACITY;
} else {
- throw new IllegalArgumentException("\"" + value
- + "\" is not a valid scroll bar policy.");
+ scrollBarPolicy = valueOf(value);
}
return scrollBarPolicy;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SortDirection.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SortDirection.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SortDirection.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SortDirection.java Fri Jun 26 21:51:16 2009
@@ -27,6 +27,19 @@
DESCENDING;
public static SortDirection decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ SortDirection sortDirection;
+ if (value.equals("ascending")) {
+ sortDirection = ASCENDING;
+ } else if (value.equals("descending")) {
+ sortDirection = DESCENDING;
+ } else {
+ sortDirection = valueOf(value);
+ }
+
+ return sortDirection;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/SplitPane.java Fri Jun 26 21:51:16 2009
@@ -50,7 +50,20 @@
BOTTOM_RIGHT;
public static Region decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ Region region;
+ if (value.equals("topLeft")) {
+ region = TOP_LEFT;
+ } else if (value.equals("bottomRight")) {
+ region = BOTTOM_RIGHT;
+ } else {
+ region = valueOf(value);
+ }
+
+ return region;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TableView.java Fri Jun 26 21:51:16 2009
@@ -420,7 +420,22 @@
MULTI;
public static SelectMode decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ SelectMode selectMode;
+ if (value.equals("none")) {
+ selectMode = NONE;
+ } else if (value.equals("single")) {
+ selectMode = SINGLE;
+ } else if (value.equals("multi")) {
+ selectMode = MULTI;
+ } else {
+ selectMode = valueOf(value);
+ }
+
+ return selectMode;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextDecoration.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextDecoration.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextDecoration.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TextDecoration.java Fri Jun 26 21:51:16 2009
@@ -26,6 +26,19 @@
STRIKETHROUGH;
public static TextDecoration decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ TextDecoration textDecoration;
+ if (value.equals("underline")) {
+ textDecoration = UNDERLINE;
+ } else if (value.equals("strikethrough")) {
+ textDecoration = STRIKETHROUGH;
+ } else {
+ textDecoration = valueOf(value);
+ }
+
+ return textDecoration;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/TreeView.java Fri Jun 26 21:51:16 2009
@@ -55,7 +55,22 @@
MULTI;
public static SelectMode decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ SelectMode selectMode;
+ if (value.equals("none")) {
+ selectMode = NONE;
+ } else if (value.equals("single")) {
+ selectMode = SINGLE;
+ } else if (value.equals("multi")) {
+ selectMode = MULTI;
+ } else {
+ selectMode = valueOf(value);
+ }
+
+ return selectMode;
}
}
@@ -88,7 +103,22 @@
MIXED;
public static NodeCheckState decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ NodeCheckState nodeCheckState;
+ if (value.equals("checked")) {
+ nodeCheckState = CHECKED;
+ } else if (value.equals("unchecked")) {
+ nodeCheckState = UNCHECKED;
+ } else if (value.equals("mixed")) {
+ nodeCheckState = MIXED;
+ } else {
+ nodeCheckState = valueOf(value);
+ }
+
+ return nodeCheckState;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/VerticalAlignment.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/VerticalAlignment.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/VerticalAlignment.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/VerticalAlignment.java Fri Jun 26 21:51:16 2009
@@ -32,6 +32,23 @@
JUSTIFY;
public static VerticalAlignment decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ VerticalAlignment verticalAlignment;
+ if (value.equals("top")) {
+ verticalAlignment = TOP;
+ } else if (value.equals("bottom")) {
+ verticalAlignment = BOTTOM;
+ } else if (value.equals("center")) {
+ verticalAlignment = CENTER;
+ } else if (value.equals("justify")) {
+ verticalAlignment = JUSTIFY;
+ } else {
+ verticalAlignment = valueOf(value);
+ }
+
+ return verticalAlignment;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/drawing/Arc.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/drawing/Arc.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/drawing/Arc.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/drawing/Arc.java Fri Jun 26 21:51:16 2009
@@ -41,7 +41,22 @@
PIE;
public static Type decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ Type type;
+ if (value.equals("chord")) {
+ type = CHORD;
+ } else if (value.equals("open")) {
+ type = OPEN;
+ } else if (value.equals("pie")) {
+ type = PIE;
+ } else {
+ type = valueOf(value);
+ }
+
+ return type;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/drawing/Path.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/drawing/Path.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/drawing/Path.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/drawing/Path.java Fri Jun 26 21:51:16 2009
@@ -495,7 +495,20 @@
}
public static WindingRule decode(String value) {
- return valueOf(value.toUpperCase());
+ if (value == null) {
+ throw new IllegalArgumentException();
+ }
+
+ WindingRule windingRule;
+ if (value.equals("nonZero")) {
+ windingRule = NON_ZERO;
+ } else if (value.equals("evenOdd")) {
+ windingRule = EVEN_ODD;
+ } else {
+ windingRule = valueOf(value);
+ }
+
+ return windingRule;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java?rev=788879&r1=788878&r2=788879&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java Fri Jun 26 21:51:16 2009
@@ -47,18 +47,19 @@
VERTICAL_SLIDE;
public static SelectionChangeEffect decode(String value) {
- SelectionChangeEffect selectionChangeEffect;
-
if (value == null) {
- selectionChangeEffect = null;
- } else if (value.equals("crossfade")) {
+ throw new IllegalArgumentException();
+ }
+
+ SelectionChangeEffect selectionChangeEffect;
+ if (value.equals("crossfade")) {
selectionChangeEffect = CROSSFADE;
} else if (value.equals("horizontalSlide")) {
selectionChangeEffect = HORIZONTAL_SLIDE;
} else if (value.equals("verticalSlide")) {
selectionChangeEffect = VERTICAL_SLIDE;
} else {
- throw new IllegalArgumentException();
+ selectionChangeEffect = valueOf(value);
}
return selectionChangeEffect;