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/29 18:36:51 UTC
svn commit: r789380 - in /incubator/pivot/trunk:
core/src/org/apache/pivot/util/ tools/src/org/apache/pivot/tools/json/
tools/src/org/apache/pivot/tools/net/ web/src/org/apache/pivot/web/
web/src/org/apache/pivot/web/server/
Author: gbrown
Date: Mon Jun 29 16:36:49 2009
New Revision: 789380
URL: http://svn.apache.org/viewvc?rev=789380&view=rev
Log:
Eliminate decode() method from non-WTK enums.
Modified:
incubator/pivot/trunk/core/src/org/apache/pivot/util/Vote.java
incubator/pivot/trunk/tools/src/org/apache/pivot/tools/json/json_viewer.wtkx
incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/HTTPClient.java
incubator/pivot/trunk/web/src/org/apache/pivot/web/Query.java
incubator/pivot/trunk/web/src/org/apache/pivot/web/server/QueryServlet.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=789380&r1=789379&r2=789380&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 Mon Jun 29 16:36:49 2009
@@ -67,23 +67,4 @@
public boolean isApproved() {
return approved;
}
-
- public static Vote decode(String value) {
- 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/json/json_viewer.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tools/src/org/apache/pivot/tools/json/json_viewer.wtkx?rev=789380&r1=789379&r2=789380&view=diff
==============================================================================
--- incubator/pivot/trunk/tools/src/org/apache/pivot/tools/json/json_viewer.wtkx (original)
+++ incubator/pivot/trunk/tools/src/org/apache/pivot/tools/json/json_viewer.wtkx Mon Jun 29 16:36:49 2009
@@ -22,7 +22,7 @@
xmlns="org.apache.pivot.wtk">
<wtkx:script src="json_viewer.js"/>
<content>
- <Border styles="{color:10}">
+ <Border styles="{padding:0, color:10}">
<content>
<ScrollPane horizontalScrollBarPolicy="fillToCapacity"
verticalScrollBarPolicy="fillToCapacity">
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=789380&r1=789379&r2=789380&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 Mon Jun 29 16:36:49 2009
@@ -65,23 +65,6 @@
HTTP,
HTTPS;
- public static Protocol decode(String value) {
- 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() {
return (this == HTTPS);
}
@@ -132,7 +115,7 @@
private Request getRequest() {
ListButton protocolListButton = (ListButton)serializer.get("request.protocol");
ListItem protocolListItem = (ListItem)protocolListButton.getSelectedItem();
- Protocol protocol = Protocol.decode(protocolListItem.getText());
+ Protocol protocol = Protocol.valueOf(protocolListItem.getText().toUpperCase());
boolean secure = protocol.isSecure();
TextInput hostTextInput = (TextInput)serializer.get("request.host");
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=789380&r1=789379&r2=789380&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 Mon Jun 29 16:36:49 2009
@@ -65,27 +65,6 @@
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=789380&r1=789379&r2=789380&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 Mon Jun 29 16:36:49 2009
@@ -57,27 +57,6 @@
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;
- }
}
/**
@@ -373,7 +352,7 @@
queryPath = request.getRequestURI();
port = request.getLocalPort();
secure = url.getProtocol().equalsIgnoreCase(HTTPS_PROTOCOL);
- method = Method.decode(request.getMethod());
+ method = Method.valueOf(request.getMethod().toUpperCase());
if (queryPath.startsWith(contextPath)) {
queryPath = queryPath.substring(contextPath.length());