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/30 01:12:31 UTC
svn commit: r789488 [1/2] - in /incubator/pivot/trunk:
demos/src/org/apache/pivot/demos/dnd/ demos/src/org/apache/pivot/demos/dom/
demos/src/org/apache/pivot/demos/itunes/
demos/src/org/apache/pivot/demos/million/
demos/src/org/apache/pivot/demos/rowed...
Author: gbrown
Date: Mon Jun 29 23:12:30 2009
New Revision: 789488
URL: http://svn.apache.org/viewvc?rev=789488&view=rev
Log:
Eliminate enum decode() methods in favor of case-independent valueOf() calls; add a NamedGroupDictionary class to Button.
Modified:
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/drag_and_drop.wtkx
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.wtkx
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dom/im_client.wtkx
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/itunes/search_demo.wtkx
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/million/large_data.wtkx
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/demo.wtkx
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/rss/rss_feed_demo.wtkx
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/tables/fixed_column_table.wtkx
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/tools/src/org/apache/pivot/tools/net/Request.java
incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/application.wtkx
incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/log.wtkx
incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/request.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/alerts.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/RadioButtons.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/link_buttons.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowser/FileBrowser.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowser/file_browser.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/list_views.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/stocktracker.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/tables.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text.wtkx
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/trees.wtkx
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Button.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.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/FlowPane.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Form.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/effects/ScaleDecorator.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TagDecorator.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/BufferedImageSerializer.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/media/drawing/Text.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/CardPaneSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ImageViewSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/MovieViewSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraFormSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraScrollBarSkin.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTabPaneSkin.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/CardPaneTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/drawing_test.wtkx
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/file_browser_test.wtkx
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/sample.wtkd
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/text/test/text_area_test.wtkx
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/drag_and_drop.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/drag_and_drop.wtkx?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/drag_and_drop.wtkx (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/drag_and_drop.wtkx Mon Jun 29 23:12:30 2009
@@ -43,7 +43,7 @@
<TablePane.Row height="1*">
<Border styles="{color:10}">
<content>
- <ScrollPane horizontalScrollBarPolicy="fill" verticalScrollBarPolicy="fillToCapacity">
+ <ScrollPane horizontalScrollBarPolicy="fill" verticalScrollBarPolicy="fill_to_capacity">
<view>
<Label wtkx:id="label"
styles="{horizontalAlignment:'left', verticalAlignment:'top', wrapText:true}" />
@@ -107,7 +107,7 @@
<TablePane.Row height="1*">
<Border styles="{color:10, padding:0}">
<content>
- <ScrollPane horizontalScrollBarPolicy="fillToCapacity" verticalScrollBarPolicy="fillToCapacity">
+ <ScrollPane horizontalScrollBarPolicy="fill_to_capacity" verticalScrollBarPolicy="fill_to_capacity">
<view>
<ListView wtkx:id="listView" selectMode="none"/>
</view>
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.wtkx?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.wtkx (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.wtkx Mon Jun 29 23:12:30 2009
@@ -29,8 +29,8 @@
<TablePane.Row height="1*">
<Border styles="{color:10, padding:0}">
<content>
- <ScrollPane horizontalScrollBarPolicy="fillToCapacity"
- verticalScrollBarPolicy="fillToCapacity">
+ <ScrollPane horizontalScrollBarPolicy="fill_to_capacity"
+ verticalScrollBarPolicy="fill_to_capacity">
<view>
<TableView wtkx:id="fileTableView" selectMode="multi"
styles="{showHorizontalGridLines:false}">
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dom/im_client.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dom/im_client.wtkx?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dom/im_client.wtkx (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dom/im_client.wtkx Mon Jun 29 23:12:30 2009
@@ -22,7 +22,7 @@
<content>
<Border styles="{padding:8}">
<content>
- <CardPane wtkx:id="cardPane" selectedIndex="0" styles="{selectionChangeEffect:'horizontalSlide'}">
+ <CardPane wtkx:id="cardPane" selectedIndex="0" styles="{selectionChangeEffect:'horizontal_slide'}">
<Form wtkx:id="loginForm" styles="{fieldAlignment:'justify'}">
<sections>
<Form.Section>
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/itunes/search_demo.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/itunes/search_demo.wtkx?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/itunes/search_demo.wtkx (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/itunes/search_demo.wtkx Mon Jun 29 23:12:30 2009
@@ -117,7 +117,7 @@
<StackPane>
<Border styles="{padding:0}">
<content>
- <ScrollPane horizontalScrollBarPolicy="fill" verticalScrollBarPolicy="fillToCapacity">
+ <ScrollPane horizontalScrollBarPolicy="fill" verticalScrollBarPolicy="fill_to_capacity">
<view>
<TableView wtkx:id="resultsTableView">
<columns>
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/million/large_data.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/million/large_data.wtkx?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/million/large_data.wtkx (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/million/large_data.wtkx Mon Jun 29 23:12:30 2009
@@ -42,7 +42,7 @@
<TablePane.Row height="1*">
<Border styles="{padding:0}">
<content>
- <ScrollPane horizontalScrollBarPolicy="fillToCapacity">
+ <ScrollPane horizontalScrollBarPolicy="fill_to_capacity">
<view>
<TableView wtkx:id="tableView" selectMode="single"
styles="{showHorizontalGridLines:false}">
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/demo.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/demo.wtkx?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/demo.wtkx (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/demo.wtkx Mon Jun 29 23:12:30 2009
@@ -37,7 +37,7 @@
<TablePane.Row height="1*">
<Border styles="{padding:0}">
<content>
- <ScrollPane horizontalScrollBarPolicy="fillToCapacity">
+ <ScrollPane horizontalScrollBarPolicy="fill_to_capacity">
<view>
<TableView wtkx:id="tableView" selectMode="single">
<columns>
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/rss/rss_feed_demo.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/rss/rss_feed_demo.wtkx?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/rss/rss_feed_demo.wtkx (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/rss/rss_feed_demo.wtkx Mon Jun 29 23:12:30 2009
@@ -27,7 +27,7 @@
<CardPane wtkx:id="cardPane" selectedIndex="0" styles="{selectionChangeEffect:'crossfade'}">
<Label wtkx:id="statusLabel" text="Loading..."
styles="{horizontalAlignment:'center', verticalAlignment:'center'}"/>
- <ScrollPane horizontalScrollBarPolicy="fillToCapacity">
+ <ScrollPane horizontalScrollBarPolicy="fill_to_capacity">
<view>
<ListView wtkx:id="feedListView"/>
</view>
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/tables/fixed_column_table.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/tables/fixed_column_table.wtkx?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/tables/fixed_column_table.wtkx (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/tables/fixed_column_table.wtkx Mon Jun 29 23:12:30 2009
@@ -24,7 +24,7 @@
<content>
<Border styles="{color:10, padding:0}">
<content>
- <ScrollPane horizontalScrollBarPolicy="fillToCapacity">
+ <ScrollPane horizontalScrollBarPolicy="fill_to_capacity">
<view>
<TableView wtkx:id="primaryTableView" selectMode="multi"
styles="{selectionColor:'#ffffff', inactiveSelectionColor:'#ffffff',
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=789488&r1=789487&r2=789488&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 23:12:30 2009
@@ -24,8 +24,8 @@
<content>
<Border styles="{padding:0, color:10}">
<content>
- <ScrollPane horizontalScrollBarPolicy="fillToCapacity"
- verticalScrollBarPolicy="fillToCapacity">
+ <ScrollPane horizontalScrollBarPolicy="fill_to_capacity"
+ verticalScrollBarPolicy="fill_to_capacity">
<view>
<TreeView wtkx:id="treeView" dropTarget="$treeViewDropTarget">
<nodeRenderer>
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=789488&r1=789487&r2=789488&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 23:12:30 2009
@@ -61,7 +61,7 @@
*
* @author tvolkert
*/
- private static enum Protocol {
+ public enum Protocol {
HTTP,
HTTPS;
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -44,7 +44,7 @@
*
* @author tvolkert
*/
- public static enum Method {
+ public enum Method {
GET,
POST,
PUT,
@@ -53,33 +53,6 @@
HEAD,
TRACE;
- 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 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() {
return (this == POST || this == PUT);
}
@@ -174,7 +147,7 @@
*
*/
public Request(String method, String protocol, String host, int port, String path) {
- this.method = Method.decode(method);
+ this.method = Method.valueOf(method.toUpperCase());
try {
location = new URL(protocol, host, port, path);
Modified: incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/application.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/application.wtkx?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/application.wtkx (original)
+++ incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/application.wtkx Mon Jun 29 23:12:30 2009
@@ -33,7 +33,7 @@
<TablePane.Row height="1*">
<Border styles="{thickness:0, padding:2}">
<content>
- <SplitPane orientation="vertical" splitLocation="400" primaryRegion="topLeft">
+ <SplitPane orientation="vertical" splitLocation="400" primaryRegion="top_left">
<top>
<wtkx:include wtkx:id="request" src="request.wtkx" />
</top>
Modified: incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/log.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/log.wtkx?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/log.wtkx (original)
+++ incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/log.wtkx Mon Jun 29 23:12:30 2009
@@ -21,7 +21,7 @@
xmlns:net="org.apache.pivot.tools.net"
styles="{thickness:1, color:7, backgroundColor:11, padding:0}">
<content>
- <ScrollPane horizontalScrollBarPolicy="fillToCapacity">
+ <ScrollPane horizontalScrollBarPolicy="fill_to_capacity">
<view>
<TableView wtkx:id="tableView">
<columns>
Modified: incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/request.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/request.wtkx?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/request.wtkx (original)
+++ incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/request.wtkx Mon Jun 29 23:12:30 2009
@@ -73,7 +73,7 @@
<content>
<ScrollPane preferredWidth="400" preferredHeight="150"
horizontalScrollBarPolicy="fill"
- verticalScrollBarPolicy="fillToCapacity">
+ verticalScrollBarPolicy="fill_to_capacity">
<view>
<TextArea wtkx:id="body" text="Content" />
</view>
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java Mon Jun 29 23:12:30 2009
@@ -279,7 +279,7 @@
}
public void perform() {
- Button.Group imageMenuGroup = Button.getGroup("imageMenuGroup");
+ Button.Group imageMenuGroup = Button.getNamedGroups().get("imageMenuGroup");
Button selectedItem = imageMenuGroup.getSelection();
String imageName = (String)selectedItem.getUserData().get("image");
@@ -733,7 +733,7 @@
alertButton.getButtonPressListeners().add(new ButtonPressListener() {
public void buttonPressed(Button button) {
- Button.Group messageTypeGroup = Button.getGroup("messageType");
+ Button.Group messageTypeGroup = Button.getNamedGroups().get("messageType");
Button selection = messageTypeGroup.getSelection();
Map<String, ?> userData;
@@ -743,9 +743,9 @@
throw new RuntimeException(exception);
}
- String messageType = (String)userData.get("type");
+ String messageType = (String)userData.get("messageType");
- if (messageType.equals("custom")) {
+ if (messageType == null) {
ArrayList<String> options = new ArrayList<String>();
options.add("OK");
options.add("Cancel");
@@ -767,14 +767,14 @@
alert.open(window);
} else {
String message = (String)userData.get("message");
- Alert.alert(MessageType.decode(messageType), message, window);
+ Alert.alert(MessageType.valueOf(messageType.toUpperCase()), message, window);
}
}
});
promptButton.getButtonPressListeners().add(new ButtonPressListener() {
public void buttonPressed(Button button) {
- Button.Group messageTypeGroup = Button.getGroup("messageType");
+ Button.Group messageTypeGroup = Button.getNamedGroups().get("messageType");
Button selection = messageTypeGroup.getSelection();
Map<String, ?> userData;
@@ -784,9 +784,9 @@
throw new RuntimeException(exception);
}
- String messageType = (String)userData.get("type");
+ String messageType = (String)userData.get("messageType");
- if (messageType.equals("custom")) {
+ if (messageType == null) {
ArrayList<String> options = new ArrayList<String>();
options.add("OK");
options.add("Cancel");
@@ -808,7 +808,7 @@
prompt.open(window);
} else {
String message = (String)userData.get("message");
- Prompt.prompt(MessageType.decode(messageType), message, window);
+ Prompt.prompt(MessageType.valueOf(messageType.toUpperCase()), message, window);
}
}
});
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/alerts.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/alerts.wtkx?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/alerts.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/alerts.wtkx Mon Jun 29 23:12:30 2009
@@ -24,19 +24,19 @@
<FlowPane orientation="vertical" styles="{spacing: 12}">
<FlowPane orientation="vertical" styles="{padding: 6, spacing: 6}">
<RadioButton buttonData="Error" group="messageType" selected="true">
- <userData messageInfo="{type:'error', message:'This is an error message.'}"/>
+ <userData messageInfo="{messageType:'error', message:'This is an error message.'}"/>
</RadioButton>
<RadioButton buttonData="Warning" group="messageType">
- <userData messageInfo="{type:'warning', message:'This is a warning message.'}"/>
+ <userData messageInfo="{messageType:'warning', message:'This is a warning message.'}"/>
</RadioButton>
<RadioButton buttonData="Question" group="messageType">
- <userData messageInfo="{type:'question', message:'This is a question message.'}"/>
+ <userData messageInfo="{messageType:'question', message:'This is a question message.'}"/>
</RadioButton>
<RadioButton buttonData="Info" group="messageType">
- <userData messageInfo="{type:'info', message:'This is an info message.'}"/>
+ <userData messageInfo="{messageType:'info', message:'This is an info message.'}"/>
</RadioButton>
<RadioButton buttonData="Custom" group="messageType">
- <userData messageInfo="{type:'custom', message:'This is a custom message.'}"/>
+ <userData messageInfo="{message:'This is a custom message.'}"/>
</RadioButton>
<FlowPane>
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/RadioButtons.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/RadioButtons.java?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/RadioButtons.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/RadioButtons.java Mon Jun 29 23:12:30 2009
@@ -39,7 +39,7 @@
selectButton = (PushButton)wtkxSerializer.get("selectButton");
// Get a reference to the button group
- final Button.Group numbersGroup = Button.getGroup("numbers");
+ final Button.Group numbersGroup = Button.getNamedGroups().get("numbers");
// Add a button press listener
selectButton.getButtonPressListeners().add(new ButtonPressListener() {
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/link_buttons.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/link_buttons.wtkx?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/link_buttons.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/link_buttons.wtkx Mon Jun 29 23:12:30 2009
@@ -21,7 +21,7 @@
xmlns:content="org.apache.pivot.wtk.content"
xmlns="org.apache.pivot.wtk">
<content>
- <CardPane wtkx:id="cardPane" selectedIndex="0" styles="{selectionChangeEffect:'horizontalSlide'}">
+ <CardPane wtkx:id="cardPane" selectedIndex="0" styles="{selectionChangeEffect:'horizontal_slide'}">
<FlowPane orientation="vertical" styles="{horizontalAlignment:'center', verticalAlignment:'center'}">
<ImageView image="org/apache/pivot/tutorials/IMG_0735_2.jpg"/>
<LinkButton wtkx:id="nextButton">
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowser/FileBrowser.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowser/FileBrowser.java?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowser/FileBrowser.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowser/FileBrowser.java Mon Jun 29 23:12:30 2009
@@ -102,6 +102,7 @@
});
window.open(display);
+ folderTreeView.requestFocus();
}
public boolean shutdown(boolean optional) throws Exception {
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowser/file_browser.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowser/file_browser.wtkx?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowser/file_browser.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowser/file_browser.wtkx Mon Jun 29 23:12:30 2009
@@ -23,7 +23,7 @@
<content>
<Border styles="{color:10, padding:0}">
<content>
- <ScrollPane preferredWidth="240" horizontalScrollBarPolicy="fillToCapacity">
+ <ScrollPane preferredWidth="240" horizontalScrollBarPolicy="fill_to_capacity">
<view>
<TreeView wtkx:id="folderTreeView">
<nodeRenderer>
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/list_views.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/list_views.wtkx?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/list_views.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/list_views.wtkx Mon Jun 29 23:12:30 2009
@@ -25,7 +25,7 @@
<content>
<ScrollPane preferredWidth="80" preferredHeight="110"
horizontalScrollBarPolicy="fill"
- verticalScrollBarPolicy="fillToCapacity">
+ verticalScrollBarPolicy="fill_to_capacity">
<view>
<ListView wtkx:id="listView" selectMode="multi"
listData="['One', 'Two', 'Three', 'Four', 'Five',
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/stocktracker.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/stocktracker.wtkx?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/stocktracker.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/stocktracker.wtkx Mon Jun 29 23:12:30 2009
@@ -37,8 +37,8 @@
<TablePane.Row height="1*">
<Border styles="{padding:0, color:10}">
<content>
- <ScrollPane horizontalScrollBarPolicy="fillToCapacity"
- verticalScrollBarPolicy="fillToCapacity">
+ <ScrollPane horizontalScrollBarPolicy="fill_to_capacity"
+ verticalScrollBarPolicy="fill_to_capacity">
<view>
<TableView wtkx:id="stocksTableView" selectMode="multi"
styles="{showHorizontalGridLines:false}">
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/tables.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/tables.wtkx?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/tables.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/tables.wtkx Mon Jun 29 23:12:30 2009
@@ -27,7 +27,7 @@
<Label text="Sortable" styles="{fontBold:true}"/>
<Border styles="{padding:0, color:10}">
<content>
- <ScrollPane wtkx:id="sortableScrollPane" horizontalScrollBarPolicy="fillToCapacity"
+ <ScrollPane wtkx:id="sortableScrollPane" horizontalScrollBarPolicy="fill_to_capacity"
preferredWidth="276" preferredHeight="160">
<view>
<TableView wtkx:id="sortableTableView" selectMode="multi">
@@ -54,7 +54,7 @@
<Label text="Custom Content" styles="{fontBold:true}"/>
<Border styles="{padding:0, color:10}">
<content>
- <ScrollPane horizontalScrollBarPolicy="fillToCapacity" preferredWidth="160">
+ <ScrollPane horizontalScrollBarPolicy="fill_to_capacity" preferredWidth="160">
<view>
<TableView wtkx:id="customTableView" selectMode="multi"
styles="{showHorizontalGridLines:false}">
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text.wtkx?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text.wtkx Mon Jun 29 23:12:30 2009
@@ -61,7 +61,7 @@
<TablePane.Row height="1*">
<Border styles="{padding:0, color:10}">
<content>
- <ScrollPane horizontalScrollBarPolicy="fill" verticalScrollBarPolicy="fillToCapacity">
+ <ScrollPane horizontalScrollBarPolicy="fill" verticalScrollBarPolicy="fill_to_capacity">
<view>
<TextArea wtkx:id="textArea" editable="true"
styles="{breakOnWhitespaceOnly:true}"/>
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/trees.wtkx
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/trees.wtkx?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/trees.wtkx (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/trees.wtkx Mon Jun 29 23:12:30 2009
@@ -27,7 +27,7 @@
<Border styles="{padding:0, color:10}">
<content>
<ScrollPane wtkx:id="editableTreeViewScrollPane" preferredWidth="160" preferredHeight="240"
- horizontalScrollBarPolicy="fillToCapacity"
+ horizontalScrollBarPolicy="fill_to_capacity"
styles="{backgroundColor:null}">
<view>
<TreeView wtkx:id="editableTreeView">
@@ -97,7 +97,7 @@
<Border styles="{padding:0, color:10}">
<content>
<ScrollPane preferredWidth="160" preferredHeight="240"
- horizontalScrollBarPolicy="fillToCapacity"
+ horizontalScrollBarPolicy="fill_to_capacity"
styles="{backgroundColor:null}">
<view>
<TreeView selectMode="multi">
@@ -160,7 +160,7 @@
<Border styles="{padding:0, color:10}">
<content>
<ScrollPane preferredWidth="160" preferredHeight="240"
- horizontalScrollBarPolicy="fillToCapacity"
+ horizontalScrollBarPolicy="fill_to_capacity"
styles="{backgroundColor:null}">
<view>
<TreeView checkmarksEnabled="true" showMixedCheckmarkState="true">
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -16,21 +16,16 @@
*/
package org.apache.pivot.wtk;
+import java.util.Iterator;
+
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.HashMap;
+import org.apache.pivot.util.ImmutableIterator;
import org.apache.pivot.util.ListenerList;
/**
* Abstract base class for button components.
- * <p>
- * TODO Ensure that button group names are unique across applications?
- * Applets downloaded from different domains won't clash, but multiple instances
- * of the same application from the same domain would. Put the groups in the
- * application context?
- * <p>
- * TODO Allow callers to remove a button group (possibly by exposing group
- * dictionary interface).
*
* @author gbrown
*/
@@ -43,26 +38,7 @@
public enum State {
SELECTED,
UNSELECTED,
- MIXED;
-
- public static State decode(String value) {
- 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;
- }
+ MIXED
}
/**
@@ -129,6 +105,69 @@
}
/**
+ * Named group dictionary.
+ *
+ * @author gbrown
+ */
+ public static class NamedGroupDictionary
+ implements Dictionary<String, Group>, Iterable<String> {
+ private NamedGroupDictionary() {
+ }
+
+ public Group get(String name) {
+ return namedGroups.get(name);
+ }
+
+ public Group put(String name, Group group) {
+ boolean update = containsKey(name);
+ Group previousGroup = namedGroups.put(name, group);
+
+ if (update) {
+ namedGroupDictionaryListeners.groupUpdated(name, previousGroup);
+ }
+ else {
+ namedGroupDictionaryListeners.groupAdded(name);
+ }
+
+ return previousGroup;
+ }
+
+ public Group remove(String name) {
+ Group group = null;
+
+ if (containsKey(name)) {
+ group = namedGroups.remove(name);
+ namedGroupDictionaryListeners.groupRemoved(name, group);
+ }
+
+ return group;
+ }
+
+ public boolean containsKey(String name) {
+ return namedGroups.containsKey(name);
+ }
+
+ public boolean isEmpty() {
+ return namedGroups.isEmpty();
+ }
+
+ public Iterator<String> iterator() {
+ return new ImmutableIterator<String>(namedGroups.iterator());
+ }
+ }
+
+ /**
+ * Named group dictionary listener interface.
+ *
+ * @author gbrown
+ */
+ public interface NamedGroupDictionaryListener {
+ public void groupAdded(String name);
+ public void groupUpdated(String name, Group previousGroup);
+ public void groupRemoved(String name, Group group);
+ };
+
+ /**
* Button listener list.
*
* @author gbrown
@@ -212,6 +251,27 @@
}
}
+ private static class NamedGroupDictionaryListenerList extends ListenerList<NamedGroupDictionaryListener>
+ implements NamedGroupDictionaryListener {
+ public void groupAdded(String name) {
+ for (NamedGroupDictionaryListener listener : this) {
+ listener.groupAdded(name);
+ }
+ }
+
+ public void groupUpdated(String name, Group previousGroup) {
+ for (NamedGroupDictionaryListener listener : this) {
+ listener.groupUpdated(name, previousGroup);
+ }
+ }
+
+ public void groupRemoved(String name, Group group) {
+ for (NamedGroupDictionaryListener listener : this) {
+ listener.groupRemoved(name, group);
+ }
+ }
+ }
+
private Object buttonData = null;
private DataRenderer dataRenderer = null;
private Action action = null;
@@ -233,7 +293,9 @@
private ButtonStateListenerList buttonStateListeners = new ButtonStateListenerList();
private ButtonPressListenerList buttonPressListeners = new ButtonPressListenerList();
- private static HashMap<String, Group> groups = new HashMap<String, Group>();
+ private static HashMap<String, Group> namedGroups = new HashMap<String, Group>();
+ private static NamedGroupDictionary namedGroupDictionary = new NamedGroupDictionary();
+ private static NamedGroupDictionaryListenerList namedGroupDictionaryListeners = new NamedGroupDictionaryListenerList();
public Button() {
this(null);
@@ -434,7 +496,7 @@
throw new IllegalArgumentException("state is null.");
}
- setState(State.decode(state));
+ setState(State.valueOf(state.toUpperCase()));
}
/**
@@ -542,11 +604,11 @@
throw new IllegalArgumentException("group is null.");
}
- if (!groups.containsKey(group)) {
- groups.put(group, new Group());
+ if (!namedGroups.containsKey(group)) {
+ namedGroups.put(group, new Group());
}
- setGroup(groups.get(group));
+ setGroup(namedGroups.get(group));
}
public String getSelectedKey() {
@@ -586,9 +648,6 @@
if (stateKey != null
&& context.containsKey(stateKey)) {
Object value = context.get(stateKey);
- if (value instanceof String) {
- value = State.decode((String)value);
- }
if (!(value instanceof State)) {
throw new IllegalArgumentException("value must be an instance of "
@@ -611,10 +670,6 @@
}
}
- public static Group getGroup(String groupName) {
- return groups.get(groupName);
- }
-
public ListenerList<ButtonListener> getButtonListeners() {
return buttonListeners;
}
@@ -626,4 +681,12 @@
public ListenerList<ButtonPressListener> getButtonPressListeners() {
return buttonPressListeners;
}
+
+ public static NamedGroupDictionary getNamedGroups() {
+ return namedGroupDictionary;
+ }
+
+ public static ListenerList<NamedGroupDictionaryListener> getNamedGroupDictionaryListeners() {
+ return namedGroupDictionaryListeners;
+ }
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Component.java Mon Jun 29 23:12:30 2009
@@ -1924,7 +1924,11 @@
}
public final void setCursor(String cursor) {
- setCursor((cursor == null) ? null : Cursor.decode(cursor));
+ if (cursor == null) {
+ setCursor((Cursor)null);
+ } else {
+ setCursor(Cursor.valueOf(cursor.toUpperCase()));
+ }
}
/**
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -35,46 +35,5 @@
RESIZE_NORTH_EAST,
RESIZE_NORTH_WEST,
RESIZE_SOUTH_EAST,
- RESIZE_SOUTH_WEST;
-
- public static Cursor decode(String value) {
- if (value == null) {
- throw new IllegalArgumentException();
- }
-
- Cursor cursor = null;
- if (value.equals("default")) {
- cursor = Cursor.DEFAULT;
- } else if (value.equals("hand")) {
- cursor = Cursor.HAND;
- } else if (value.equals("text")) {
- cursor = Cursor.TEXT;
- } else if (value.equals("wait")) {
- cursor = Cursor.WAIT;
- } else if (value.equals("crosshair")) {
- cursor = Cursor.CROSSHAIR;
- } else if (value.equals("move")) {
- cursor = Cursor.MOVE;
- } else if (value.equals("resizeNorth")) {
- cursor = Cursor.RESIZE_NORTH;
- } else if (value.equals("resizeSouth")) {
- cursor = Cursor.RESIZE_SOUTH;
- } else if (value.equals("resizeEast")) {
- cursor = Cursor.RESIZE_EAST;
- } else if (value.equals("resizeWest")) {
- cursor = Cursor.RESIZE_WEST;
- } else if (value.equals("resizeNorthEast")) {
- cursor = Cursor.RESIZE_NORTH_EAST;
- } else if (value.equals("resizeNorthWest")) {
- cursor = Cursor.RESIZE_NORTH_WEST;
- } else if (value.equals("resizeSouthEast")) {
- cursor = Cursor.RESIZE_SOUTH_EAST;
- } else if (value.equals("resizeSouthWest")) {
- cursor = Cursor.RESIZE_SOUTH_WEST;
- } else {
- cursor = valueOf(value);
- }
-
- return cursor;
- }
+ RESIZE_SOUTH_WEST
}
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -23,22 +23,5 @@
*/
public enum Direction {
FORWARD,
- BACKWARD;
-
- public static Direction decode(String value) {
- 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;
- }
+ BACKWARD
}
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -33,23 +33,4 @@
public boolean isSelected(int dropActions) {
return ((dropActions & getMask()) > 0);
}
-
- public static DropAction decode(String value) {
- 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/FlowPane.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FlowPane.java?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FlowPane.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/FlowPane.java Mon Jun 29 23:12:30 2009
@@ -63,7 +63,7 @@
throw new IllegalArgumentException();
}
- setOrientation(Orientation.decode(orientation));
+ setOrientation(Orientation.valueOf(orientation.toUpperCase()));
}
public ListenerList<FlowPaneListener> getFlowPaneListeners() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Form.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Form.java?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Form.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Form.java Mon Jun 29 23:12:30 2009
@@ -342,7 +342,12 @@
throw new IllegalArgumentException(exception);
}
- Flag value = new Flag(MessageType.decode((String)map.get(MESSAGE_TYPE_KEY)),
+ String messageType = (String)map.get(MESSAGE_TYPE_KEY);
+ if (messageType == null) {
+ throw new IllegalArgumentException(MESSAGE_TYPE_KEY + " is required.");
+ }
+
+ Flag value = new Flag(MessageType.valueOf(messageType.toUpperCase()),
(String)map.get(MESSAGE_KEY));
return value;
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -42,28 +42,7 @@
SOLID_COLOR,
GRADIENT,
LINEAR_GRADIENT,
- RADIAL_GRADIENT;
-
- public static PaintType decode(String value) {
- if (value == null) {
- throw new IllegalArgumentException();
- }
-
- PaintType paintType;
- if (value.equals("solidColor")) {
- paintType = SOLID_COLOR;
- } else if (value.equals("gradient")) {
- paintType = GRADIENT;
- } else if (value.equals("linearGradient")) {
- paintType = LINEAR_GRADIENT;
- } else if (value.equals("radialGradient")) {
- paintType = RADIAL_GRADIENT;
- } else {
- paintType = valueOf(value);
- }
-
- return paintType;
- }
+ RADIAL_GRADIENT
}
public static final String PAINT_TYPE_KEY = "paintType";
@@ -261,7 +240,7 @@
}
Paint paint;
- switch(PaintType.decode(paintType)) {
+ switch(PaintType.valueOf(paintType.toUpperCase())) {
case SOLID_COLOR: {
String color = JSONSerializer.getString(value, COLOR_KEY);
paint = decodeColor(color);
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -22,33 +22,23 @@
* @author gbrown
*/
public enum HorizontalAlignment {
+ /**
+ * Align to the right.
+ */
RIGHT,
- LEFT,
- CENTER,
/**
- * Stretch the contents to fill the available space.
+ * Align to the left.
*/
- JUSTIFY;
-
- public static HorizontalAlignment decode(String value) {
- if (value == null) {
- throw new IllegalArgumentException();
- }
+ LEFT,
- 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);
- }
+ /**
+ * Align to center.
+ */
+ CENTER,
- return horizontalAlignment;
- }
+ /**
+ * Stretch to fill the available space.
+ */
+ JUSTIFY
}
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -43,27 +43,6 @@
public boolean isSelected(int modifiers) {
return ((modifiers & getMask()) > 0);
}
-
- public static Modifier decode(String value) {
- 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;
- }
}
/**
@@ -75,28 +54,7 @@
STANDARD,
LEFT,
RIGHT,
- KEYPAD;
-
- public static KeyLocation decode(String value) {
- 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;
- }
+ KEYPAD
}
/**
@@ -180,7 +138,7 @@
for (int i = 0, n = keys.length; i < n; i++) {
if (i < n - 1) {
// Modifier
- Modifier modifier = Modifier.decode(keys[i]);
+ Modifier modifier = Modifier.valueOf(keys[i].toUpperCase());
modifiers |= modifier.getMask();
} else {
// Keycode
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -53,26 +53,7 @@
/**
* Multiple indexes may be concurrently selected.
*/
- MULTI;
-
- public static SelectMode decode(String value) {
- 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;
- }
+ MULTI
}
/**
@@ -944,7 +925,7 @@
throw new IllegalArgumentException("selectMode is null.");
}
- setSelectMode(SelectMode.decode(selectMode));
+ setSelectMode(SelectMode.valueOf(selectMode.toUpperCase()));
}
/**
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -26,28 +26,5 @@
WARNING,
QUESTION,
INFO,
- APPLICATION;
-
- public static MessageType decode(String value) {
- 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;
- }
+ APPLICATION
}
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -41,25 +41,6 @@
public boolean isSelected(int buttons) {
return ((buttons & getMask()) > 0);
}
-
- public static Button decode(String value) {
- 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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -23,22 +23,5 @@
*/
public enum Orientation {
HORIZONTAL,
- VERTICAL;
-
- public static Orientation decode(String value) {
- 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;
- }
+ VERTICAL
}
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -37,30 +37,7 @@
NEVER,
ALWAYS,
FILL,
- FILL_TO_CAPACITY;
-
- public static ScrollBarPolicy decode(String value) {
- if (value == null) {
- throw new IllegalArgumentException();
- }
-
- ScrollBarPolicy scrollBarPolicy = null;
- if (value.equals("auto")) {
- scrollBarPolicy = AUTO;
- } else if (value.equals("never")) {
- scrollBarPolicy = NEVER;
- } else if (value.equals("always")) {
- scrollBarPolicy = ALWAYS;
- } else if (value.equals("fill")) {
- scrollBarPolicy = FILL;
- } else if (value.equals("fillToCapacity")) {
- scrollBarPolicy = FILL_TO_CAPACITY;
- } else {
- scrollBarPolicy = valueOf(value);
- }
-
- return scrollBarPolicy;
- }
+ FILL_TO_CAPACITY
}
private static class ScrollPaneListenerList extends ListenerList<ScrollPaneListener>
@@ -116,7 +93,7 @@
*
* @author tvolkert
*/
- public static enum Placement {
+ public enum Placement {
TOP_LEFT,
BOTTOM_LEFT,
BOTTOM_RIGHT,
@@ -192,7 +169,7 @@
throw new IllegalArgumentException("horizontalScrollBarPolicy is null.");
}
- setHorizontalScrollBarPolicy(ScrollBarPolicy.decode(horizontalScrollBarPolicy));
+ setHorizontalScrollBarPolicy(ScrollBarPolicy.valueOf(horizontalScrollBarPolicy.toUpperCase()));
}
public ScrollBarPolicy getVerticalScrollBarPolicy() {
@@ -218,7 +195,7 @@
throw new IllegalArgumentException("verticalScrollBarPolicy is null.");
}
- setVerticalScrollBarPolicy(ScrollBarPolicy.decode(verticalScrollBarPolicy));
+ setVerticalScrollBarPolicy(ScrollBarPolicy.valueOf(verticalScrollBarPolicy.toUpperCase()));
}
public Component getRowHeader() {
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -24,22 +24,5 @@
*/
public enum SortDirection {
ASCENDING,
- DESCENDING;
-
- public static SortDirection decode(String value) {
- 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;
- }
+ DESCENDING
}
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -47,24 +47,7 @@
*/
public enum Region {
TOP_LEFT,
- BOTTOM_RIGHT;
-
- public static Region decode(String value) {
- 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;
- }
+ BOTTOM_RIGHT
}
private static class SplitPaneListenerList extends ListenerList<SplitPaneListener>
@@ -243,7 +226,7 @@
throw new IllegalArgumentException("orientation is null.");
}
- setOrientation(Orientation.decode(orientation));
+ setOrientation(Orientation.valueOf(orientation.toUpperCase()));
}
public Region getPrimaryRegion() {
@@ -267,7 +250,7 @@
throw new IllegalArgumentException("primaryRegion is null.");
}
- setPrimaryRegion(Region.decode(primaryRegion));
+ setPrimaryRegion(Region.valueOf(primaryRegion.toUpperCase()));
}
public int getSplitLocation() {
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -332,8 +332,11 @@
* sort direction
*/
public final void setSortDirection(String sortDirection) {
- setSortDirection(sortDirection == null ? (SortDirection)null :
- SortDirection.decode(sortDirection));
+ if (sortDirection == null) {
+ setSortDirection((SortDirection)null);
+ } else {
+ setSortDirection(SortDirection.valueOf(sortDirection.toUpperCase()));
+ }
}
/**
@@ -417,26 +420,7 @@
/**
* Multiple indexes may be concurrently selected.
*/
- MULTI;
-
- public static SelectMode decode(String value) {
- 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;
- }
+ MULTI
}
/**
@@ -1370,7 +1354,7 @@
throw new IllegalArgumentException("selectMode is null.");
}
- setSelectMode(SelectMode.decode(selectMode));
+ setSelectMode(SelectMode.valueOf(selectMode.toUpperCase()));
}
/**
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -23,22 +23,5 @@
*/
public enum TextDecoration {
UNDERLINE,
- STRIKETHROUGH;
-
- public static TextDecoration decode(String value) {
- 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;
- }
+ STRIKETHROUGH
}
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -52,26 +52,7 @@
/**
* Multiple paths may be concurrently selected.
*/
- MULTI;
-
- public static SelectMode decode(String value) {
- 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;
- }
+ MULTI
}
/**
@@ -100,26 +81,7 @@
* be reported if <tt>showMixedCheckmarkState</tt> is true. Otherwise,
* the node will be reported as {@link #UNCHECKED}.
*/
- MIXED;
-
- public static NodeCheckState decode(String value) {
- 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;
- }
+ MIXED
}
/**
@@ -1013,7 +975,7 @@
throw new IllegalArgumentException("selectMode is null.");
}
- setSelectMode(SelectMode.decode(selectMode));
+ setSelectMode(SelectMode.valueOf(selectMode.toUpperCase()));
}
/**
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -22,33 +22,23 @@
* @author gbrown
*/
public enum VerticalAlignment {
+ /**
+ * Align to top.
+ */
TOP,
- BOTTOM,
- CENTER,
/**
- * Stretch the contents to fill the available space.
+ * Align to bottom.
*/
- JUSTIFY;
-
- public static VerticalAlignment decode(String value) {
- if (value == null) {
- throw new IllegalArgumentException();
- }
+ BOTTOM,
- 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);
- }
+ /**
+ * Align to center.
+ */
+ CENTER,
- return verticalAlignment;
- }
+ /**
+ * Stretch to fill the available space.
+ */
+ JUSTIFY
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/ScaleDecorator.java Mon Jun 29 23:12:30 2009
@@ -203,7 +203,7 @@
throw new IllegalArgumentException("horizontalAlignment is null.");
}
- setHorizontalAlignment(HorizontalAlignment.decode(horizontalAlignment));
+ setHorizontalAlignment(HorizontalAlignment.valueOf(horizontalAlignment.toUpperCase()));
}
/**
@@ -260,7 +260,7 @@
throw new IllegalArgumentException("verticalAlignment is null.");
}
- setVerticalAlignment(VerticalAlignment.decode(verticalAlignment));
+ setVerticalAlignment(VerticalAlignment.valueOf(verticalAlignment.toUpperCase()));
}
/**
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TagDecorator.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TagDecorator.java?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TagDecorator.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/effects/TagDecorator.java Mon Jun 29 23:12:30 2009
@@ -104,7 +104,7 @@
throw new IllegalArgumentException("horizontalAlignment is null.");
}
- setHorizontalAlignment(HorizontalAlignment.decode(horizontalAlignment));
+ setHorizontalAlignment(HorizontalAlignment.valueOf(horizontalAlignment.toUpperCase()));
}
public VerticalAlignment getVerticalAlignment() {
@@ -128,7 +128,7 @@
throw new IllegalArgumentException("verticalAlignment is null.");
}
- setVerticalAlignment(VerticalAlignment.decode(verticalAlignment));
+ setVerticalAlignment(VerticalAlignment.valueOf(verticalAlignment.toUpperCase()));
}
public int getXOffset() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/BufferedImageSerializer.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/BufferedImageSerializer.java?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/BufferedImageSerializer.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/BufferedImageSerializer.java Mon Jun 29 23:12:30 2009
@@ -39,7 +39,7 @@
*
* @author tvolkert
*/
- public static enum Format {
+ public enum Format {
PNG("png", "image/png"),
JPEG("jpeg", "image/jpeg"),
BMP("bmp", "image/bmp"),
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -23,7 +23,6 @@
import org.apache.pivot.util.ListenerList;
-
/**
* Shape representing an arc.
*
@@ -38,26 +37,7 @@
public enum Type {
CHORD,
OPEN,
- PIE;
-
- public static Type decode(String value) {
- 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;
- }
+ PIE
}
private static class ArcListenerList extends ListenerList<ArcListener>
@@ -198,7 +178,7 @@
throw new IllegalArgumentException("type is null.");
}
- setType(Type.decode(type));
+ setType(Type.valueOf(type.toUpperCase()));
}
@Override
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -460,7 +460,7 @@
*
* @author tvolkert
*/
- public static enum WindingRule {
+ public enum WindingRule {
/**
* A <tt>NON_ZERO</tt> winding rule means that if a ray is drawn in any
* direction from a given point to infinity and the places where the
@@ -469,14 +469,14 @@
* ray from left to right does not equal the number of times that the
* path crosses the ray from right to left.
*/
- NON_ZERO (GeneralPath.WIND_NON_ZERO),
+ NON_ZERO(GeneralPath.WIND_NON_ZERO),
/**
* An <tt>EVEN_ODD</tt> winding rule means that enclosed regions of the
* path alternate between interior and exterior areas as traversed from
* the outside of the path towards a point inside the region.
*/
- EVEN_ODD (GeneralPath.WIND_EVEN_ODD);
+ EVEN_ODD(GeneralPath.WIND_EVEN_ODD);
private int constantValue;
@@ -493,23 +493,6 @@
private int getConstantValue() {
return constantValue;
}
-
- public static WindingRule decode(String value) {
- 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;
- }
}
/**
@@ -581,7 +564,7 @@
}
public final void setWindingRule(String windingRule) {
- setWindingRule(WindingRule.decode(windingRule));
+ setWindingRule(WindingRule.valueOf(windingRule.toUpperCase()));
}
/**
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/drawing/Text.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/drawing/Text.java?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/drawing/Text.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/drawing/Text.java Mon Jun 29 23:12:30 2009
@@ -200,7 +200,7 @@
throw new IllegalArgumentException();
}
- setAlignment(HorizontalAlignment.decode(alignment));
+ setAlignment(HorizontalAlignment.valueOf(alignment.toUpperCase()));
}
@Override
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=789488&r1=789487&r2=789488&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 Mon Jun 29 23:12:30 2009
@@ -44,26 +44,7 @@
public enum SelectionChangeEffect {
CROSSFADE,
HORIZONTAL_SLIDE,
- VERTICAL_SLIDE;
-
- public static SelectionChangeEffect decode(String value) {
- if (value == null) {
- 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 {
- selectionChangeEffect = valueOf(value);
- }
-
- return selectionChangeEffect;
- }
+ VERTICAL_SLIDE
}
/**
@@ -349,7 +330,7 @@
throw new IllegalArgumentException();
}
- setSelectionChangeEffect(SelectionChangeEffect.decode(selectionChangeEffect));
+ setSelectionChangeEffect(SelectionChangeEffect.valueOf(selectionChangeEffect.toUpperCase()));
}
@Override
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/FlowPaneSkin.java Mon Jun 29 23:12:30 2009
@@ -558,7 +558,7 @@
throw new IllegalArgumentException("horizontalAlignment is null.");
}
- setHorizontalAlignment(HorizontalAlignment.decode(horizontalAlignment));
+ setHorizontalAlignment(HorizontalAlignment.valueOf(horizontalAlignment.toUpperCase()));
}
public VerticalAlignment getVerticalAlignment() {
@@ -579,7 +579,7 @@
throw new IllegalArgumentException("verticalAlignment is null.");
}
- setVerticalAlignment(VerticalAlignment.decode(verticalAlignment));
+ setVerticalAlignment(VerticalAlignment.valueOf(verticalAlignment.toUpperCase()));
}
public Insets getPadding() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ImageViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ImageViewSkin.java?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ImageViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/ImageViewSkin.java Mon Jun 29 23:12:30 2009
@@ -282,7 +282,7 @@
throw new IllegalArgumentException("horizontalAlignment is null.");
}
- setHorizontalAlignment(HorizontalAlignment.decode(horizontalAlignment));
+ setHorizontalAlignment(HorizontalAlignment.valueOf(horizontalAlignment.toUpperCase()));
}
public VerticalAlignment getVerticalAlignment() {
@@ -304,7 +304,7 @@
throw new IllegalArgumentException("verticalAlignment is null.");
}
- setVerticalAlignment(VerticalAlignment.decode(verticalAlignment));
+ setVerticalAlignment(VerticalAlignment.valueOf(verticalAlignment.toUpperCase()));
}
// Image view events
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java?rev=789488&r1=789487&r2=789488&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/LabelSkin.java Mon Jun 29 23:12:30 2009
@@ -409,7 +409,7 @@
throw new IllegalArgumentException("textDecoration is null.");
}
- setTextDecoration(TextDecoration.decode(textDecoration));
+ setTextDecoration(TextDecoration.valueOf(textDecoration.toUpperCase()));
}
public HorizontalAlignment getHorizontalAlignment() {
@@ -434,7 +434,7 @@
throw new IllegalArgumentException("horizontalAlignment is null.");
}
- setHorizontalAlignment(HorizontalAlignment.decode(horizontalAlignment));
+ setHorizontalAlignment(HorizontalAlignment.valueOf(horizontalAlignment.toUpperCase()));
}
public VerticalAlignment getVerticalAlignment() {
@@ -459,7 +459,7 @@
throw new IllegalArgumentException("verticalAlignment is null.");
}
- setVerticalAlignment(VerticalAlignment.decode(verticalAlignment));
+ setVerticalAlignment(VerticalAlignment.valueOf(verticalAlignment.toUpperCase()));
}
public Insets getPadding() {