You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/05/14 17:32:54 UTC
svn commit: r774824 [1/2] - in /incubator/pivot/trunk:
demos/src/pivot/demos/clock/ demos/src/pivot/demos/decorator/
demos/src/pivot/demos/dnd/ demos/src/pivot/demos/dom/
demos/src/pivot/demos/million/ demos/src/pivot/demos/roweditor/
demos/src/pivot/d...
Author: tvolkert
Date: Thu May 14 15:32:51 2009
New Revision: 774824
URL: http://svn.apache.org/viewvc?rev=774824&view=rev
Log:
Changed syntax of WTKX binding to use @Load(resourceName="") instead of @Load(name=""), @Bind(fieldName="", id="") instead of @Bind(property="", name=""), changed WTKXSerializer.getObjectByName() to WTKXSerializer.getObjectByID()
Modified:
incubator/pivot/trunk/demos/src/pivot/demos/clock/Clock.java
incubator/pivot/trunk/demos/src/pivot/demos/decorator/DecoratorDemo.java
incubator/pivot/trunk/demos/src/pivot/demos/dnd/DragAndDropDemo.java
incubator/pivot/trunk/demos/src/pivot/demos/dnd/FileDropTargetDemo.java
incubator/pivot/trunk/demos/src/pivot/demos/dom/IMClient.java
incubator/pivot/trunk/demos/src/pivot/demos/million/LargeData.java
incubator/pivot/trunk/demos/src/pivot/demos/roweditor/Demo.java
incubator/pivot/trunk/demos/src/pivot/demos/rss/RSSFeedDemo.java
incubator/pivot/trunk/demos/src/pivot/demos/scripting/ScriptingDemo.java
incubator/pivot/trunk/demos/src/pivot/demos/tables/FixedColumnTable.java
incubator/pivot/trunk/tools/src/pivot/tools/net/HTTPClient.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/HelloWTKX.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/Checkboxes.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/LinkButtons.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/PushButtons.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/RadioButtons.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/ToggleButtons.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/databinding/DataBinding.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/drawing/RotateLine.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/filebrowser/FileBrowser.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/labels/Labels.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/Borders.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/FlowPanes.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/Forms.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/StackPanes.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/lists/ListButtons.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/lists/ListViews.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/progress/ActivityIndicators.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/separators/Separators.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/stocktracker/StockTracker.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/text/Text.java
incubator/pivot/trunk/tutorials/src/pivot/tutorials/transition/Transitions.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraAlertSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPromptSkin.java
incubator/pivot/trunk/wtk/src/pivot/wtkx/BindProcessor.java
incubator/pivot/trunk/wtk/src/pivot/wtkx/Bindable.java
incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java
incubator/pivot/trunk/wtk/test/pivot/wtk/test/CardPaneTest.java
incubator/pivot/trunk/wtk/test/pivot/wtk/test/FileBrowserTest.java
incubator/pivot/trunk/wtk/test/pivot/wtk/test/SliderTest.java
incubator/pivot/trunk/wtk/test/pivot/wtk/test/SpinnerFocusTest.java
incubator/pivot/trunk/wtk/test/pivot/wtk/test/TextInputValidatorTest.java
incubator/pivot/trunk/wtk/test/pivot/wtk/text/test/TextAreaTest.java
incubator/pivot/trunk/wtk/test/pivot/wtkx/test/BindTestA.java
incubator/pivot/trunk/wtk/test/pivot/wtkx/test/BindTestB.java
Modified: incubator/pivot/trunk/demos/src/pivot/demos/clock/Clock.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/pivot/demos/clock/Clock.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/pivot/demos/clock/Clock.java (original)
+++ incubator/pivot/trunk/demos/src/pivot/demos/clock/Clock.java Thu May 14 15:32:51 2009
@@ -58,9 +58,9 @@
}
public void setCurrentFrame(int currentFrame) {
- Shape.Rotate secondsRotation = wtkxSerializer.getObjectByName("secondsRotation");
- Shape.Rotate minutesRotation = wtkxSerializer.getObjectByName("minutesRotation");
- Shape.Rotate hoursRotation = wtkxSerializer.getObjectByName("hoursRotation");
+ Shape.Rotate secondsRotation = wtkxSerializer.getObjectByID("secondsRotation");
+ Shape.Rotate minutesRotation = wtkxSerializer.getObjectByID("minutesRotation");
+ Shape.Rotate hoursRotation = wtkxSerializer.getObjectByID("hoursRotation");
calendar.setTimeInMillis(System.currentTimeMillis());
Modified: incubator/pivot/trunk/demos/src/pivot/demos/decorator/DecoratorDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/pivot/demos/decorator/DecoratorDemo.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/pivot/demos/decorator/DecoratorDemo.java (original)
+++ incubator/pivot/trunk/demos/src/pivot/demos/decorator/DecoratorDemo.java Thu May 14 15:32:51 2009
@@ -28,8 +28,8 @@
import pivot.wtkx.Bindable;
public class DecoratorDemo extends Bindable implements Application {
- @Load(name="reflection.wtkx") private Window reflectionWindow;
- @Load(name="translucent.wtkx") private Frame translucentFrame;
+ @Load(resourceName="reflection.wtkx") private Window reflectionWindow;
+ @Load(resourceName="translucent.wtkx") private Frame translucentFrame;
public void startup(Display display, Dictionary<String, String> properties)
throws Exception {
Modified: incubator/pivot/trunk/demos/src/pivot/demos/dnd/DragAndDropDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/pivot/demos/dnd/DragAndDropDemo.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/pivot/demos/dnd/DragAndDropDemo.java (original)
+++ incubator/pivot/trunk/demos/src/pivot/demos/dnd/DragAndDropDemo.java Thu May 14 15:32:51 2009
@@ -43,16 +43,16 @@
import pivot.wtkx.Bindable;
public class DragAndDropDemo extends Bindable implements Application {
- @Load(name="drag_and_drop.wtkx") private Window window;
- @Bind(property="window") private Label label;
- @Bind(property="window") private PushButton copyTextButton;
- @Bind(property="window") private PushButton pasteTextButton;
- @Bind(property="window") private ImageView imageView;
- @Bind(property="window") private PushButton copyImageButton;
- @Bind(property="window") private PushButton pasteImageButton;
- @Bind(property="window") private ListView listView;
- @Bind(property="window") private PushButton copyFilesButton;
- @Bind(property="window") private PushButton pasteFilesButton;
+ @Load(resourceName="drag_and_drop.wtkx") private Window window;
+ @Bind(fieldName="window") private Label label;
+ @Bind(fieldName="window") private PushButton copyTextButton;
+ @Bind(fieldName="window") private PushButton pasteTextButton;
+ @Bind(fieldName="window") private ImageView imageView;
+ @Bind(fieldName="window") private PushButton copyImageButton;
+ @Bind(fieldName="window") private PushButton pasteImageButton;
+ @Bind(fieldName="window") private ListView listView;
+ @Bind(fieldName="window") private PushButton copyFilesButton;
+ @Bind(fieldName="window") private PushButton pasteFilesButton;
public void startup(Display display, Dictionary<String, String> properties)
throws Exception {
Modified: incubator/pivot/trunk/demos/src/pivot/demos/dnd/FileDropTargetDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/pivot/demos/dnd/FileDropTargetDemo.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/pivot/demos/dnd/FileDropTargetDemo.java (original)
+++ incubator/pivot/trunk/demos/src/pivot/demos/dnd/FileDropTargetDemo.java Thu May 14 15:32:51 2009
@@ -45,9 +45,9 @@
import pivot.wtkx.Bindable;
public class FileDropTargetDemo extends Bindable implements Application {
- @Load(name="file_drop_target_demo.wtkx") private Window window;
- @Bind(property="window") private TableView fileTableView;
- @Bind(property="window") private PushButton uploadButton;
+ @Load(resourceName="file_drop_target_demo.wtkx") private Window window;
+ @Bind(fieldName="window") private TableView fileTableView;
+ @Bind(fieldName="window") private PushButton uploadButton;
private FileList fileList = null;
Modified: incubator/pivot/trunk/demos/src/pivot/demos/dom/IMClient.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/pivot/demos/dom/IMClient.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/pivot/demos/dom/IMClient.java (original)
+++ incubator/pivot/trunk/demos/src/pivot/demos/dom/IMClient.java Thu May 14 15:32:51 2009
@@ -78,15 +78,15 @@
private XMPPConnection xmppConnection = null;
- @Load(name="im_client.wtkx") private Window window;
- @Bind(property="window") private CardPane cardPane;
- @Bind(property="window") private Form loginForm;
- @Bind(property="window") private TextInput usernameTextInput;
- @Bind(property="window") private TextInput passwordTextInput;
- @Bind(property="window") private TextInput domainTextInput;
- @Bind(property="window") private PushButton loginButton;
- @Bind(property="window") private Label errorMessageLabel;
- @Bind(property="window") private Label messageLabel;
+ @Load(resourceName="im_client.wtkx") private Window window;
+ @Bind(fieldName="window") private CardPane cardPane;
+ @Bind(fieldName="window") private Form loginForm;
+ @Bind(fieldName="window") private TextInput usernameTextInput;
+ @Bind(fieldName="window") private TextInput passwordTextInput;
+ @Bind(fieldName="window") private TextInput domainTextInput;
+ @Bind(fieldName="window") private PushButton loginButton;
+ @Bind(fieldName="window") private Label errorMessageLabel;
+ @Bind(fieldName="window") private Label messageLabel;
private ApplicationContext.ScheduledCallback scheduledFadeCallback = null;
Modified: incubator/pivot/trunk/demos/src/pivot/demos/million/LargeData.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/pivot/demos/million/LargeData.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/pivot/demos/million/LargeData.java (original)
+++ incubator/pivot/trunk/demos/src/pivot/demos/million/LargeData.java Thu May 14 15:32:51 2009
@@ -133,13 +133,13 @@
private String basePath = null;
- @Load(name="large_data.wtkx") private Window window;
- @Bind(property="window") private ListButton fileListButton;
- @Bind(property="window") private PushButton loadDataButton;
- @Bind(property="window") private PushButton cancelButton;
- @Bind(property="window") private Label statusLabel;
- @Bind(property="window") private TableView tableView;
- @Bind(property="window") private TableViewHeader tableViewHeader;
+ @Load(resourceName="large_data.wtkx") private Window window;
+ @Bind(fieldName="window") private ListButton fileListButton;
+ @Bind(fieldName="window") private PushButton loadDataButton;
+ @Bind(fieldName="window") private PushButton cancelButton;
+ @Bind(fieldName="window") private Label statusLabel;
+ @Bind(fieldName="window") private TableView tableView;
+ @Bind(fieldName="window") private TableViewHeader tableViewHeader;
private CSVSerializer csvSerializer;
@@ -149,11 +149,11 @@
private static final int PAGE_SIZE = 100;
public LargeData() {
- csvSerializer = new CSVSerializer("ISO-8859-1");
- csvSerializer.getKeys().add("c0");
- csvSerializer.getKeys().add("c1");
- csvSerializer.getKeys().add("c2");
- csvSerializer.getKeys().add("c3");
+ csvSerializer = new CSVSerializer("ISO-8859-1");
+ csvSerializer.getKeys().add("c0");
+ csvSerializer.getKeys().add("c1");
+ csvSerializer.getKeys().add("c2");
+ csvSerializer.getKeys().add("c3");
}
public void startup(Display display, Dictionary<String, String> properties)
@@ -166,12 +166,12 @@
bind();
loadDataButton.getButtonPressListeners().add(new ButtonPressListener() {
- public void buttonPressed(Button button) {
- loadDataButton.setEnabled(false);
- cancelButton.setEnabled(true);
+ public void buttonPressed(Button button) {
+ loadDataButton.setEnabled(false);
+ cancelButton.setEnabled(true);
- loadData();
- }
+ loadData();
+ }
});
cancelButton.getButtonPressListeners().add(new ButtonPressListener() {
@@ -184,14 +184,14 @@
});
tableViewHeader.getTableViewHeaderPressListeners().add(new TableView.SortHandler() {
- @Override
- public void headerPressed(TableViewHeader tableViewHeader, int index) {
- long startTime = System.currentTimeMillis();
- super.headerPressed(tableViewHeader, index);
- long endTime = System.currentTimeMillis();
+ @Override
+ public void headerPressed(TableViewHeader tableViewHeader, int index) {
+ long startTime = System.currentTimeMillis();
+ super.headerPressed(tableViewHeader, index);
+ long endTime = System.currentTimeMillis();
- statusLabel.setText("Data sorted in " + (endTime - startTime) + " ms.");
- }
+ statusLabel.setText("Data sorted in " + (endTime - startTime) + " ms.");
+ }
});
window.open(display);
@@ -215,26 +215,26 @@
abort = false;
tableView.getTableData().clear();
- String fileName = (String)fileListButton.getSelectedItem();
+ String fileName = (String)fileListButton.getSelectedItem();
- URL origin = ApplicationContext.getOrigin();
+ URL origin = ApplicationContext.getOrigin();
- URL fileURL = null;
- try {
- fileURL = new URL(origin, basePath + "/" + fileName);
- } catch(MalformedURLException exception) {
- System.err.println(exception.getMessage());
- }
-
- if (fileURL != null) {
- statusLabel.setText("Loading " + fileURL);
-
- LoadDataCallback callback = new LoadDataCallback(fileURL);
- Thread thread = new Thread(callback);
- thread.setDaemon(true);
- thread.setPriority(Thread.MIN_PRIORITY);
- thread.start();
- }
+ URL fileURL = null;
+ try {
+ fileURL = new URL(origin, basePath + "/" + fileName);
+ } catch(MalformedURLException exception) {
+ System.err.println(exception.getMessage());
+ }
+
+ if (fileURL != null) {
+ statusLabel.setText("Loading " + fileURL);
+
+ LoadDataCallback callback = new LoadDataCallback(fileURL);
+ Thread thread = new Thread(callback);
+ thread.setDaemon(true);
+ thread.setPriority(Thread.MIN_PRIORITY);
+ thread.start();
+ }
}
public static void main(String[] args) {
Modified: incubator/pivot/trunk/demos/src/pivot/demos/roweditor/Demo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/pivot/demos/roweditor/Demo.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/pivot/demos/roweditor/Demo.java (original)
+++ incubator/pivot/trunk/demos/src/pivot/demos/roweditor/Demo.java Thu May 14 15:32:51 2009
@@ -36,8 +36,8 @@
* @author tvolkert
*/
public class Demo extends Bindable implements Application {
- @Load(name="demo.wtkx") private Window window;
- @Bind(property="window") TableView tableView;
+ @Load(resourceName="demo.wtkx") private Window window;
+ @Bind(fieldName="window") TableView tableView;
public void startup(Display display, Dictionary<String, String> properties)
throws Exception {
Modified: incubator/pivot/trunk/demos/src/pivot/demos/rss/RSSFeedDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/pivot/demos/rss/RSSFeedDemo.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/pivot/demos/rss/RSSFeedDemo.java (original)
+++ incubator/pivot/trunk/demos/src/pivot/demos/rss/RSSFeedDemo.java Thu May 14 15:32:51 2009
@@ -227,10 +227,10 @@
private XPath xpath;
- @Load(name="rss_feed_demo.wtkx") private Window window;
- @Bind(property="window") private ListView feedListView;
- @Bind(property="window") private CardPane cardPane;
- @Bind(property="window") private Label statusLabel;
+ @Load(resourceName="rss_feed_demo.wtkx") private Window window;
+ @Bind(fieldName="window") private ListView feedListView;
+ @Bind(fieldName="window") private CardPane cardPane;
+ @Bind(fieldName="window") private Label statusLabel;
public static final String FEED_URI = "http://feeds.dzone.com/javalobby/frontpage?format=xml";
Modified: incubator/pivot/trunk/demos/src/pivot/demos/scripting/ScriptingDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/pivot/demos/scripting/ScriptingDemo.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/pivot/demos/scripting/ScriptingDemo.java (original)
+++ incubator/pivot/trunk/demos/src/pivot/demos/scripting/ScriptingDemo.java Thu May 14 15:32:51 2009
@@ -32,8 +32,8 @@
}
}
- @Load(name="scripting_demo.wtkx") private Window window;
- @Bind(property="window") private String foo;
+ @Load(resourceName="scripting_demo.wtkx") private Window window;
+ @Bind(fieldName="window") private String foo;
public void startup(Display display, Dictionary<String, String> properties)
throws Exception {
Modified: incubator/pivot/trunk/demos/src/pivot/demos/tables/FixedColumnTable.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/pivot/demos/tables/FixedColumnTable.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/pivot/demos/tables/FixedColumnTable.java (original)
+++ incubator/pivot/trunk/demos/src/pivot/demos/tables/FixedColumnTable.java Thu May 14 15:32:51 2009
@@ -30,11 +30,11 @@
import pivot.wtkx.Bindable;
public class FixedColumnTable extends Bindable implements Application {
- @Load(name="fixed_column_table.wtkx") private Window window;
- @Bind(property="window") private TableView primaryTableView;
- @Bind(property="window") private TableViewHeader primaryTableViewHeader;
- @Bind(property="window") private TableView fixedTableView;
- @Bind(property="window") private TableViewHeader fixedTableViewHeader;
+ @Load(resourceName="fixed_column_table.wtkx") private Window window;
+ @Bind(fieldName="window") private TableView primaryTableView;
+ @Bind(fieldName="window") private TableViewHeader primaryTableViewHeader;
+ @Bind(fieldName="window") private TableView fixedTableView;
+ @Bind(fieldName="window") private TableViewHeader fixedTableViewHeader;
private boolean synchronizingSelection = false;
Modified: incubator/pivot/trunk/tools/src/pivot/tools/net/HTTPClient.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tools/src/pivot/tools/net/HTTPClient.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tools/src/pivot/tools/net/HTTPClient.java (original)
+++ incubator/pivot/trunk/tools/src/pivot/tools/net/HTTPClient.java Thu May 14 15:32:51 2009
@@ -116,15 +116,15 @@
* Gets the query to issue to the server, authenticated if needed.
*/
private Request getRequest() {
- ListButton protocolListButton = (ListButton)serializer.getObjectByName("request.protocol");
+ ListButton protocolListButton = (ListButton)serializer.getObjectByID("request.protocol");
ListItem protocolListItem = (ListItem)protocolListButton.getSelectedItem();
Protocol protocol = Protocol.decode(protocolListItem.getText());
boolean secure = protocol.isSecure();
- TextInput hostTextInput = (TextInput)serializer.getObjectByName("request.host");
+ TextInput hostTextInput = (TextInput)serializer.getObjectByID("request.host");
String host = hostTextInput.getText();
- TextInput portTextInput = (TextInput)serializer.getObjectByName("request.port");
+ TextInput portTextInput = (TextInput)serializer.getObjectByID("request.port");
String portText = portTextInput.getText();
int port;
try {
@@ -133,16 +133,16 @@
port = secure ? 443 : 80;
}
- TextInput pathTextInput = (TextInput)serializer.getObjectByName("request.path");
+ TextInput pathTextInput = (TextInput)serializer.getObjectByID("request.path");
String path = pathTextInput.getText();
- ListButton methodListButton = (ListButton)serializer.getObjectByName("request.method");
+ ListButton methodListButton = (ListButton)serializer.getObjectByID("request.method");
ListItem methodListItem = (ListItem)methodListButton.getSelectedItem();
// Construct the HTTP request
Request httpRequest = new Request(methodListItem.getText(), protocol.toString(), host, port, path);
- TextArea textArea = (TextArea)serializer.getObjectByName("request.body");
+ TextArea textArea = (TextArea)serializer.getObjectByID("request.body");
String body = textArea.getText();
httpRequest.setBody(body.getBytes());
@@ -178,14 +178,14 @@
throw new RuntimeException(ex);
}
- Button okButton = (Button)sheetSerializer.getObjectByName("okButton");
+ Button okButton = (Button)sheetSerializer.getObjectByID("okButton");
okButton.getButtonPressListeners().add(new ButtonPressListener() {
public void buttonPressed(Button button) {
sheet.close(true);
}
});
- Button cancelButton = (Button)sheetSerializer.getObjectByName("cancelButton");
+ Button cancelButton = (Button)sheetSerializer.getObjectByID("cancelButton");
cancelButton.getButtonPressListeners().add(new ButtonPressListener() {
public void buttonPressed(Button button) {
sheet.close(false);
@@ -193,8 +193,8 @@
});
if (credentials != null) {
- TextInput usernameTextInput = (TextInput)sheetSerializer.getObjectByName("username");
- TextInput passwordTextInput = (TextInput)sheetSerializer.getObjectByName("password");
+ TextInput usernameTextInput = (TextInput)sheetSerializer.getObjectByID("username");
+ TextInput passwordTextInput = (TextInput)sheetSerializer.getObjectByID("password");
usernameTextInput.setText(credentials.getUsername());
passwordTextInput.setText(credentials.getPassword());
}
@@ -211,9 +211,9 @@
public void sheetClosed(Sheet sheet) {
if (sheet.getResult()) {
TextInput usernameTextInput = (TextInput)
- sheetSerializer.getObjectByName("username");
+ sheetSerializer.getObjectByID("username");
TextInput passwordTextInput = (TextInput)
- sheetSerializer.getObjectByName("password");
+ sheetSerializer.getObjectByID("password");
String username = usernameTextInput.getText();
String password = passwordTextInput.getText();
@@ -259,14 +259,14 @@
throw new RuntimeException(ex);
}
- Button okButton = (Button)sheetSerializer.getObjectByName("okButton");
+ Button okButton = (Button)sheetSerializer.getObjectByID("okButton");
okButton.getButtonPressListeners().add(new ButtonPressListener() {
public void buttonPressed(Button button) {
sheet.close(true);
}
});
- Button cancelButton = (Button)sheetSerializer.getObjectByName("cancelButton");
+ Button cancelButton = (Button)sheetSerializer.getObjectByID("cancelButton");
cancelButton.getButtonPressListeners().add(new ButtonPressListener() {
public void buttonPressed(Button button) {
sheet.close(false);
@@ -274,12 +274,12 @@
});
if (keystorePath != null) {
- TextInput pathTextInput = (TextInput)sheetSerializer.getObjectByName("path");
+ TextInput pathTextInput = (TextInput)sheetSerializer.getObjectByID("path");
pathTextInput.setText(keystorePath);
}
if (keystorePassword != null) {
- TextInput passwdTextInput = (TextInput)sheetSerializer.getObjectByName("passwd");
+ TextInput passwdTextInput = (TextInput)sheetSerializer.getObjectByID("passwd");
passwdTextInput.setText(keystorePassword);
}
@@ -288,8 +288,8 @@
Vote vote = Vote.APPROVE;
if (result) {
- TextInput pathTextInput = (TextInput)sheetSerializer.getObjectByName("path");
- TextInput passwdTextInput = (TextInput)sheetSerializer.getObjectByName("passwd");
+ TextInput pathTextInput = (TextInput)sheetSerializer.getObjectByID("path");
+ TextInput passwdTextInput = (TextInput)sheetSerializer.getObjectByID("passwd");
keystorePath = pathTextInput.getText();
keystorePassword = passwdTextInput.getText();
@@ -327,7 +327,7 @@
window = (Window)serializer.readObject("pivot/tools/net/application.wtkx");
window.open(display);
- TableView tableView = (TableView)serializer.getObjectByName("log.tableView");
+ TableView tableView = (TableView)serializer.getObjectByID("log.tableView");
tableView.getComponentMouseButtonListeners().add(new ComponentMouseButtonListener.Adapter() {
public boolean mouseClick(Component component, Mouse.Button button, int x, int y, int count) {
boolean consumed = false;
@@ -353,7 +353,7 @@
}
});
- PushButton submitButton = (PushButton)serializer.getObjectByName("request.submit");
+ PushButton submitButton = (PushButton)serializer.getObjectByID("request.submit");
submitButton.getButtonPressListeners().add(new ButtonPressListener() {
public void buttonPressed(final Button button) {
button.setEnabled(false);
@@ -365,7 +365,7 @@
Response httpResponse = task.getResult();
Transaction transaction = new Transaction((Request)task, httpResponse);
- TableView tableView = (TableView)serializer.getObjectByName("log.tableView");
+ TableView tableView = (TableView)serializer.getObjectByID("log.tableView");
List<Transaction> tableData = (List<Transaction>)tableView.getTableData();
tableData.add(transaction);
}
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java Thu May 14 15:32:51 2009
@@ -97,7 +97,7 @@
}
private class ButtonsRollupStateHandler extends RollupStateHandler {
- @Load(name="buttons.wtkx")
+ @Load(resourceName="buttons.wtkx")
private Component component;
public Vote previewExpandedChange(Rollup rollup) {
@@ -111,10 +111,10 @@
}
private class ListsRollupStateHandler extends RollupStateHandler {
- @Load(name="lists.wtkx") private Component component;
- @Bind(property="component") private ListView editableListView;
- @Bind(property="component") private ListView iconListView;
- @Bind(property="component") private ListView checkedListView;
+ @Load(resourceName="lists.wtkx") private Component component;
+ @Bind(fieldName="component") private ListView editableListView;
+ @Bind(fieldName="component") private ListView iconListView;
+ @Bind(fieldName="component") private ListView checkedListView;
@SuppressWarnings("unchecked")
public Vote previewExpandedChange(Rollup rollup) {
@@ -144,8 +144,8 @@
}
private class TextRollupStateHandler extends RollupStateHandler {
- @Load(name="text.wtkx") private Component component;
- @Bind(property="component") private TextArea textArea;
+ @Load(resourceName="text.wtkx") private Component component;
+ @Bind(fieldName="component") private TextArea textArea;
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
@@ -187,7 +187,7 @@
}
private class CalendarsRollupStateHandler extends RollupStateHandler {
- @Load(name="calendars.wtkx") private Component component;
+ @Load(resourceName="calendars.wtkx") private Component component;
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
@@ -200,7 +200,7 @@
}
private class NavigationRollupStateHandler extends RollupStateHandler {
- @Load(name="navigation.wtkx") private Component component;
+ @Load(resourceName="navigation.wtkx") private Component component;
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
@@ -213,7 +213,7 @@
}
private class SplittersRollupStateHandler extends RollupStateHandler {
- @Load(name="splitters.wtkx") private Component component;
+ @Load(resourceName="splitters.wtkx") private Component component;
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
@@ -226,13 +226,13 @@
}
private class MenusRollupStateHandler extends RollupStateHandler {
- @Load(name="menus.wtkx") private Component component;
- @Bind(property="component") private ImageView menuImageView;
+ @Load(resourceName="menus.wtkx") private Component component;
+ @Bind(fieldName="component") private ImageView menuImageView;
- @Bind(property="component", name="menubar.helpAboutMenuItem")
+ @Bind(fieldName="component", id="menubar.helpAboutMenuItem")
private Menu.Item helpAboutMenuItem;
- @Load(name="menu_popup.wtkx") private MenuPopup menuPopup;
+ @Load(resourceName="menu_popup.wtkx") private MenuPopup menuPopup;
{ new Action("selectImageAction") {
public String getDescription() {
@@ -293,10 +293,10 @@
}
private class MetersRollupStateHandler extends RollupStateHandler {
- @Load(name="meters.wtkx") private Component component;
- @Bind(property="component") private ActivityIndicator activityIndicator1;
- @Bind(property="component") private ActivityIndicator activityIndicator2;
- @Bind(property="component") private ActivityIndicator activityIndicator3;
+ @Load(resourceName="meters.wtkx") private Component component;
+ @Bind(fieldName="component") private ActivityIndicator activityIndicator1;
+ @Bind(fieldName="component") private ActivityIndicator activityIndicator2;
+ @Bind(fieldName="component") private ActivityIndicator activityIndicator3;
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
@@ -325,15 +325,15 @@
}
private class SpinnersRollupStateHandler extends RollupStateHandler {
- @Load(name="spinners.wtkx") private Component component;
+ @Load(resourceName="spinners.wtkx") private Component component;
- @Bind(property="component") private Spinner numericSpinner;
- @Bind(property="component") private Spinner dateSpinner;
+ @Bind(fieldName="component") private Spinner numericSpinner;
+ @Bind(fieldName="component") private Spinner dateSpinner;
- @Bind(property="component") private Slider redSlider;
- @Bind(property="component") private Slider greenSlider;
- @Bind(property="component") private Slider blueSlider;
- @Bind(property="component") private Border colorBorder;
+ @Bind(fieldName="component") private Slider redSlider;
+ @Bind(fieldName="component") private Slider greenSlider;
+ @Bind(fieldName="component") private Slider blueSlider;
+ @Bind(fieldName="component") private Border colorBorder;
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
@@ -381,10 +381,10 @@
}
private class TablesRollupStateHandler extends RollupStateHandler {
- @Load(name="tables.wtkx") private Component component;
- @Bind(property="component") private TableView sortableTableView;
- @Bind(property="component") private TableView customTableView;
- @Bind(property="component") private TableViewHeader sortableTableViewHeader;
+ @Load(resourceName="tables.wtkx") private Component component;
+ @Bind(fieldName="component") private TableView sortableTableView;
+ @Bind(fieldName="component") private TableView customTableView;
+ @Bind(fieldName="component") private TableViewHeader sortableTableViewHeader;
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
@@ -447,8 +447,8 @@
}
private class TreesRollupStateHandler extends RollupStateHandler {
- @Load(name="trees.wtkx") private Component component;
- @Bind(property="component") private TreeView editableTreeView;
+ @Load(resourceName="trees.wtkx") private Component component;
+ @Bind(fieldName="component") private TreeView editableTreeView;
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
@@ -464,10 +464,10 @@
}
private class DragDropRollupStateHandler extends RollupStateHandler {
- @Load(name="dragdrop.wtkx") private Component component;
- @Bind(property="component") private ImageView imageView1;
- @Bind(property="component") private ImageView imageView2;
- @Bind(property="component") private ImageView imageView3;
+ @Load(resourceName="dragdrop.wtkx") private Component component;
+ @Bind(fieldName="component") private ImageView imageView1;
+ @Bind(fieldName="component") private ImageView imageView2;
+ @Bind(fieldName="component") private ImageView imageView3;
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
@@ -591,9 +591,9 @@
}
private class AlertsRollupStateHandler extends RollupStateHandler {
- @Load(name="alerts.wtkx") private Component component;
- @Bind(property="component") private PushButton alertButton;
- @Bind(property="component") private PushButton promptButton;
+ @Load(resourceName="alerts.wtkx") private Component component;
+ @Bind(fieldName="component") private PushButton alertButton;
+ @Bind(fieldName="component") private PushButton promptButton;
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
@@ -675,20 +675,20 @@
}
}
- @Load(name="demo.wtkx") private Window window;
- @Bind(property="window") private Rollup buttonsRollup;
- @Bind(property="window") private Rollup listsRollup;
- @Bind(property="window") private Rollup textRollup;
- @Bind(property="window") private Rollup calendarsRollup;
- @Bind(property="window") private Rollup navigationRollup;
- @Bind(property="window") private Rollup splittersRollup;
- @Bind(property="window") private Rollup menusRollup;
- @Bind(property="window") private Rollup metersRollup;
- @Bind(property="window") private Rollup spinnersRollup;
- @Bind(property="window") private Rollup tablesRollup;
- @Bind(property="window") private Rollup treesRollup;
- @Bind(property="window") private Rollup dragDropRollup;
- @Bind(property="window") private Rollup alertsRollup;
+ @Load(resourceName="demo.wtkx") private Window window;
+ @Bind(fieldName="window") private Rollup buttonsRollup;
+ @Bind(fieldName="window") private Rollup listsRollup;
+ @Bind(fieldName="window") private Rollup textRollup;
+ @Bind(fieldName="window") private Rollup calendarsRollup;
+ @Bind(fieldName="window") private Rollup navigationRollup;
+ @Bind(fieldName="window") private Rollup splittersRollup;
+ @Bind(fieldName="window") private Rollup menusRollup;
+ @Bind(fieldName="window") private Rollup metersRollup;
+ @Bind(fieldName="window") private Rollup spinnersRollup;
+ @Bind(fieldName="window") private Rollup tablesRollup;
+ @Bind(fieldName="window") private Rollup treesRollup;
+ @Bind(fieldName="window") private Rollup dragDropRollup;
+ @Bind(fieldName="window") private Rollup alertsRollup;
public static void main(String[] args) {
DesktopApplicationContext.main(Demo.class, args);
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/HelloWTKX.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/HelloWTKX.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/HelloWTKX.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/HelloWTKX.java Thu May 14 15:32:51 2009
@@ -24,7 +24,7 @@
import pivot.wtkx.Bindable;
public class HelloWTKX extends Bindable implements Application {
- @Load(name="hello.wtkx") private Window window;
+ @Load(resourceName="hello.wtkx") private Window window;
public void startup(Display display, Dictionary<String, String> properties)
throws Exception {
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/Checkboxes.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/Checkboxes.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/Checkboxes.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/Checkboxes.java Thu May 14 15:32:51 2009
@@ -28,13 +28,13 @@
import pivot.wtkx.Bindable;
public class Checkboxes extends Bindable implements Application {
- @Load(name="checkboxes.wtkx") private Window window = null;
- @Bind(property="window") private Checkbox bellCheckbox;
- @Bind(property="window") private Checkbox clockCheckbox;
- @Bind(property="window") private Checkbox houseCheckbox;
- @Bind(property="window") private ImageView bellImageView;
- @Bind(property="window") private ImageView clockImageView;
- @Bind(property="window") private ImageView houseImageView;
+ @Load(resourceName="checkboxes.wtkx") private Window window = null;
+ @Bind(fieldName="window") private Checkbox bellCheckbox;
+ @Bind(fieldName="window") private Checkbox clockCheckbox;
+ @Bind(fieldName="window") private Checkbox houseCheckbox;
+ @Bind(fieldName="window") private ImageView bellImageView;
+ @Bind(fieldName="window") private ImageView clockImageView;
+ @Bind(fieldName="window") private ImageView houseImageView;
public void startup(Display display, Dictionary<String, String> properties) throws Exception {
bind();
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/LinkButtons.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/LinkButtons.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/LinkButtons.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/LinkButtons.java Thu May 14 15:32:51 2009
@@ -28,10 +28,10 @@
import pivot.wtkx.Bindable;
public class LinkButtons extends Bindable implements Application {
- @Load(name="link_buttons.wtkx") private Window window = null;
- @Bind(property="window") private CardPane cardPane;
- @Bind(property="window") private LinkButton nextButton;
- @Bind(property="window") private LinkButton previousButton;
+ @Load(resourceName="link_buttons.wtkx") private Window window = null;
+ @Bind(fieldName="window") private CardPane cardPane;
+ @Bind(fieldName="window") private LinkButton nextButton;
+ @Bind(fieldName="window") private LinkButton previousButton;
public void startup(Display display, Dictionary<String, String> properties) throws Exception {
bind();
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/PushButtons.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/PushButtons.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/PushButtons.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/PushButtons.java Thu May 14 15:32:51 2009
@@ -29,8 +29,8 @@
import pivot.wtkx.Bindable;
public class PushButtons extends Bindable implements Application {
- @Load(name="push_buttons.wtkx") private Window window = null;
- @Bind(property="window") private PushButton pushButton;
+ @Load(resourceName="push_buttons.wtkx") private Window window = null;
+ @Bind(fieldName="window") private PushButton pushButton;
public void startup(Display display, Dictionary<String, String> properties) throws Exception {
bind();
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/RadioButtons.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/RadioButtons.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/RadioButtons.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/RadioButtons.java Thu May 14 15:32:51 2009
@@ -30,9 +30,9 @@
import pivot.wtkx.Bindable;
public class RadioButtons extends Bindable implements Application {
- @Load(name="radio_buttons.wtkx") private Window window;
- @Bind(property="window") private RadioButton oneButton;
- @Bind(property="window") private PushButton selectButton;
+ @Load(resourceName="radio_buttons.wtkx") private Window window;
+ @Bind(fieldName="window") private RadioButton oneButton;
+ @Bind(fieldName="window") private PushButton selectButton;
public void startup(Display display, Dictionary<String, String> properties)
throws Exception {
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/ToggleButtons.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/ToggleButtons.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/ToggleButtons.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/buttons/ToggleButtons.java Thu May 14 15:32:51 2009
@@ -24,7 +24,7 @@
import pivot.wtkx.Bindable;
public class ToggleButtons extends Bindable implements Application {
- @Load(name="toggle_buttons.wtkx") private Window window;
+ @Load(resourceName="toggle_buttons.wtkx") private Window window;
public void startup(Display display, Dictionary<String, String> properties)
throws Exception {
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/databinding/DataBinding.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/databinding/DataBinding.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/databinding/DataBinding.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/databinding/DataBinding.java Thu May 14 15:32:51 2009
@@ -33,12 +33,12 @@
import pivot.wtkx.Bindable;
public class DataBinding extends Bindable implements Application {
- @Load(name="data_binding.wtkx") private Window window;
- @Bind(property="window") private Form form;
- @Bind(property="window") private PushButton loadJavaButton;
- @Bind(property="window") private PushButton loadJSONButton;
- @Bind(property="window") private PushButton clearButton;
- @Bind(property="window") private Label sourceLabel;
+ @Load(resourceName="data_binding.wtkx") private Window window;
+ @Bind(fieldName="window") private Form form;
+ @Bind(fieldName="window") private PushButton loadJavaButton;
+ @Bind(fieldName="window") private PushButton loadJSONButton;
+ @Bind(fieldName="window") private PushButton clearButton;
+ @Bind(fieldName="window") private Label sourceLabel;
private static final Contact CONTACT = new Contact("101", "Joe Smith",
new Address("123 Main St.", "Cambridge", "MA", "02142"),
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/drawing/RotateLine.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/drawing/RotateLine.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/drawing/RotateLine.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/drawing/RotateLine.java Thu May 14 15:32:51 2009
@@ -28,8 +28,8 @@
import pivot.wtkx.Bindable;
public class RotateLine extends Bindable implements Application {
- @Load(name="rotate_line.wtkd") private Drawing drawing;
- @Bind(property="drawing") private Shape.Rotate rotation;
+ @Load(resourceName="rotate_line.wtkd") private Drawing drawing;
+ @Bind(fieldName="drawing") private Shape.Rotate rotation;
private Window window = null;
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/filebrowser/FileBrowser.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/filebrowser/FileBrowser.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/filebrowser/FileBrowser.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/filebrowser/FileBrowser.java Thu May 14 15:32:51 2009
@@ -39,8 +39,8 @@
import pivot.wtkx.Bindable;
public class FileBrowser extends Bindable implements Application {
- @Load(name="file_browser.wtkx") private Window window;
- @Bind(property="window") private TreeView folderTreeView;
+ @Load(resourceName="file_browser.wtkx") private Window window;
+ @Bind(fieldName="window") private TreeView folderTreeView;
public void startup(Display display, Dictionary<String, String> properties)
throws Exception {
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/labels/Labels.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/labels/Labels.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/labels/Labels.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/labels/Labels.java Thu May 14 15:32:51 2009
@@ -24,7 +24,7 @@
import pivot.wtkx.Bindable;
public class Labels extends Bindable implements Application {
- @Load(name="labels.wtkx") private Window window;
+ @Load(resourceName="labels.wtkx") private Window window;
public void startup(Display display, Dictionary<String, String> properties) throws Exception {
bind();
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/Borders.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/Borders.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/Borders.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/Borders.java Thu May 14 15:32:51 2009
@@ -24,7 +24,7 @@
import pivot.wtkx.Bindable;
public class Borders extends Bindable implements Application {
- @Load(name="borders.wtkx") private Window window;
+ @Load(resourceName="borders.wtkx") private Window window;
public void startup(Display display, Dictionary<String, String> properties) throws Exception {
bind();
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/FlowPanes.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/FlowPanes.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/FlowPanes.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/FlowPanes.java Thu May 14 15:32:51 2009
@@ -31,18 +31,18 @@
import pivot.wtkx.Bindable;
public class FlowPanes extends Bindable implements Application {
- @Load(name="flow_panes.wtkx") private Window window;
- @Bind(property="window") private FlowPane flowPane;
- @Bind(property="window") private RadioButton horizontalOrientationButton;
- @Bind(property="window") private RadioButton verticalOrientationButton;
- @Bind(property="window") private RadioButton horizontalAlignmentRightButton;
- @Bind(property="window") private RadioButton horizontalAlignmentLeftButton;
- @Bind(property="window") private RadioButton horizontalAlignmentCenterButton;
- @Bind(property="window") private RadioButton horizontalAlignmentJustifyButton;
- @Bind(property="window") private RadioButton verticalAlignmentTopButton;
- @Bind(property="window") private RadioButton verticalAlignmentBottomButton;
- @Bind(property="window") private RadioButton verticalAlignmentCenterButton;
- @Bind(property="window") private RadioButton verticalAlignmentJustifyButton;
+ @Load(resourceName="flow_panes.wtkx") private Window window;
+ @Bind(fieldName="window") private FlowPane flowPane;
+ @Bind(fieldName="window") private RadioButton horizontalOrientationButton;
+ @Bind(fieldName="window") private RadioButton verticalOrientationButton;
+ @Bind(fieldName="window") private RadioButton horizontalAlignmentRightButton;
+ @Bind(fieldName="window") private RadioButton horizontalAlignmentLeftButton;
+ @Bind(fieldName="window") private RadioButton horizontalAlignmentCenterButton;
+ @Bind(fieldName="window") private RadioButton horizontalAlignmentJustifyButton;
+ @Bind(fieldName="window") private RadioButton verticalAlignmentTopButton;
+ @Bind(fieldName="window") private RadioButton verticalAlignmentBottomButton;
+ @Bind(fieldName="window") private RadioButton verticalAlignmentCenterButton;
+ @Bind(fieldName="window") private RadioButton verticalAlignmentJustifyButton;
private ButtonStateListener buttonStateListener = new ButtonStateListener() {
public void stateChanged(Button button, Button.State previousState) {
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/Forms.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/Forms.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/Forms.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/Forms.java Thu May 14 15:32:51 2009
@@ -33,12 +33,12 @@
import pivot.wtkx.Bindable;
public class Forms extends Bindable implements Application {
- @Load(name="forms.wtkx") private Window window;
- @Bind(property="window") private FlowPane nameFlowPane;
- @Bind(property="window") private TextInput lastNameTextInput;
- @Bind(property="window") private TextInput firstNameTextInput;
- @Bind(property="window") private PushButton submitButton;
- @Bind(property="window") private Label errorLabel;
+ @Load(resourceName="forms.wtkx") private Window window;
+ @Bind(fieldName="window") private FlowPane nameFlowPane;
+ @Bind(fieldName="window") private TextInput lastNameTextInput;
+ @Bind(fieldName="window") private TextInput firstNameTextInput;
+ @Bind(fieldName="window") private PushButton submitButton;
+ @Bind(fieldName="window") private Label errorLabel;
public void startup(Display display, Dictionary<String, String> properties) throws Exception {
bind();
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/StackPanes.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/StackPanes.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/StackPanes.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/layout/StackPanes.java Thu May 14 15:32:51 2009
@@ -24,7 +24,7 @@
import pivot.wtkx.Bindable;
public class StackPanes extends Bindable implements Application {
- @Load(name="stack_panes.wtkx") private Window window;
+ @Load(resourceName="stack_panes.wtkx") private Window window;
public void startup(Display display, Dictionary<String, String> properties) throws Exception {
bind();
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/lists/ListButtons.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/lists/ListButtons.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/lists/ListButtons.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/lists/ListButtons.java Thu May 14 15:32:51 2009
@@ -31,9 +31,9 @@
import pivot.wtkx.Bindable;
public class ListButtons extends Bindable implements Application {
- @Load(name="list_buttons.wtkx") private Window window;
- @Bind(property="window") private ListButton listButton;
- @Bind(property="window") private ImageView imageView;
+ @Load(resourceName="list_buttons.wtkx") private Window window;
+ @Bind(fieldName="window") private ListButton listButton;
+ @Bind(fieldName="window") private ImageView imageView;
private ListButtonSelectionListener listButtonSelectionListener =
new ListButtonSelectionListener() {
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/lists/ListViews.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/lists/ListViews.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/lists/ListViews.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/lists/ListViews.java Thu May 14 15:32:51 2009
@@ -29,9 +29,9 @@
import pivot.wtkx.Bindable;
public class ListViews extends Bindable implements Application {
- @Load(name="list_views.wtkx") private Window window;
- @Bind(property="window") private Label selectionLabel;
- @Bind(property="window") private ListView listView;
+ @Load(resourceName="list_views.wtkx") private Window window;
+ @Bind(fieldName="window") private Label selectionLabel;
+ @Bind(fieldName="window") private ListView listView;
private ListViewSelectionListener listViewSelectionListener =
new ListViewSelectionListener() {
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/progress/ActivityIndicators.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/progress/ActivityIndicators.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/progress/ActivityIndicators.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/progress/ActivityIndicators.java Thu May 14 15:32:51 2009
@@ -28,11 +28,11 @@
import pivot.wtkx.Bindable;
public class ActivityIndicators extends Bindable implements Application {
- @Load(name="activity_indicators.wtkx") private Window window;
- @Bind(property="window") private ActivityIndicator activityIndicator1;
- @Bind(property="window") private ActivityIndicator activityIndicator2;
- @Bind(property="window") private ActivityIndicator activityIndicator3;
- @Bind(property="window") private PushButton activityButton;
+ @Load(resourceName="activity_indicators.wtkx") private Window window;
+ @Bind(fieldName="window") private ActivityIndicator activityIndicator1;
+ @Bind(fieldName="window") private ActivityIndicator activityIndicator2;
+ @Bind(fieldName="window") private ActivityIndicator activityIndicator3;
+ @Bind(fieldName="window") private PushButton activityButton;
public void startup(Display display, Dictionary<String, String> properties)
throws Exception {
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/separators/Separators.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/separators/Separators.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/separators/Separators.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/separators/Separators.java Thu May 14 15:32:51 2009
@@ -24,7 +24,7 @@
import pivot.wtkx.Bindable;
public class Separators extends Bindable implements Application {
- @Load(name="separators.wtkx") private Window window;
+ @Load(resourceName="separators.wtkx") private Window window;
public void startup(Display display, Dictionary<String, String> properties)
throws Exception {
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/stocktracker/StockTracker.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/stocktracker/StockTracker.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/stocktracker/StockTracker.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/stocktracker/StockTracker.java Thu May 14 15:32:51 2009
@@ -57,19 +57,19 @@
public class StockTracker extends Bindable implements Application {
private ArrayList<String> symbols = new ArrayList<String>();
- @Load(name="stocktracker.wtkx") private Window window;
+ @Load(resourceName="stocktracker.wtkx") private Window window;
- @Bind(property="window") private TableView stocksTableView;
- @Bind(property="window") private TextInput symbolTextInput;
- @Bind(property="window") private Button addSymbolButton;
- @Bind(property="window") private Button removeSymbolsButton;
- @Bind(property="window") private Label lastUpdateLabel;
- @Bind(property="window") private Button yahooFinanceButton;
+ @Bind(fieldName="window") private TableView stocksTableView;
+ @Bind(fieldName="window") private TextInput symbolTextInput;
+ @Bind(fieldName="window") private Button addSymbolButton;
+ @Bind(fieldName="window") private Button removeSymbolsButton;
+ @Bind(fieldName="window") private Label lastUpdateLabel;
+ @Bind(fieldName="window") private Button yahooFinanceButton;
- @Bind(property="window", name="detail.rootPane")
+ @Bind(fieldName="window", id="detail.rootPane")
private Container detailRootPane;
- @Bind(property="window", name="detail.changeLabel")
+ @Bind(fieldName="window", id="detail.changeLabel")
private Label detailChangeLabel;
private GetQuery getQuery = null;
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/text/Text.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/text/Text.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/text/Text.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/text/Text.java Thu May 14 15:32:51 2009
@@ -28,8 +28,8 @@
import pivot.wtkx.Bindable;
public class Text extends Bindable implements Application {
- @Load(name="text.wtkx") private Window window;
- @Bind(property="window") private TextInput stateTextInput;
+ @Load(resourceName="text.wtkx") private Window window;
+ @Bind(fieldName="window") private TextInput stateTextInput;
private ArrayList<String> states;
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/transition/Transitions.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/transition/Transitions.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/transition/Transitions.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/transition/Transitions.java Thu May 14 15:32:51 2009
@@ -26,11 +26,11 @@
import pivot.wtkx.Bindable;
public class Transitions extends Bindable implements Application {
- @Load(name="transitions.wtkx") private Window window;
- @Bind(property="window") private Button button1;
- @Bind(property="window") private Button button2;
- @Bind(property="window") private Button button3;
- @Bind(property="window") private Button button4;
+ @Load(resourceName="transitions.wtkx") private Window window;
+ @Bind(fieldName="window") private Button button1;
+ @Bind(fieldName="window") private Button button2;
+ @Bind(fieldName="window") private Button button3;
+ @Bind(fieldName="window") private Button button4;
public void startup(Display display, Dictionary<String, String> properties)
throws Exception {
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraAlertSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraAlertSkin.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraAlertSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraAlertSkin.java Thu May 14 15:32:51 2009
@@ -70,23 +70,23 @@
// Set the type image
TerraTheme theme = (TerraTheme)Theme.getTheme();
- ImageView typeImageView = (ImageView)wtkxSerializer.getObjectByName("typeImageView");
+ ImageView typeImageView = wtkxSerializer.getObjectByID("typeImageView");
typeImageView.setImage(theme.getMessageIcon(alert.getMessageType()));
// Set the message
- Label messageLabel = (Label)wtkxSerializer.getObjectByName("messageLabel");
+ Label messageLabel = wtkxSerializer.getObjectByID("messageLabel");
String message = alert.getMessage();
messageLabel.setText(message);
// Set the body
- FlowPane messageFlowPane = (FlowPane)wtkxSerializer.getObjectByName("messageFlowPane");
+ FlowPane messageFlowPane = wtkxSerializer.getObjectByID("messageFlowPane");
Component body = alert.getBody();
if (body != null) {
messageFlowPane.add(body);
}
// Add the option buttons
- FlowPane buttonFlowPane = (FlowPane)wtkxSerializer.getObjectByName("buttonFlowPane");
+ FlowPane buttonFlowPane = wtkxSerializer.getObjectByID("buttonFlowPane");
for (int i = 0, n = alert.getOptionCount(); i < n; i++) {
Object option = alert.getOption(i);
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPromptSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPromptSkin.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPromptSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/skin/terra/TerraPromptSkin.java Thu May 14 15:32:51 2009
@@ -67,23 +67,23 @@
// Set the type image
TerraTheme theme = (TerraTheme)Theme.getTheme();
- ImageView typeImageView = (ImageView)wtkxSerializer.getObjectByName("typeImageView");
+ ImageView typeImageView = wtkxSerializer.getObjectByID("typeImageView");
typeImageView.setImage(theme.getMessageIcon(prompt.getMessageType()));
// Set the message
- Label messageLabel = (Label)wtkxSerializer.getObjectByName("messageLabel");
+ Label messageLabel = wtkxSerializer.getObjectByID("messageLabel");
String message = prompt.getMessage();
messageLabel.setText(message);
// Set the body
- FlowPane messageFlowPane = (FlowPane)wtkxSerializer.getObjectByName("messageFlowPane");
+ FlowPane messageFlowPane = wtkxSerializer.getObjectByID("messageFlowPane");
Component body = prompt.getBody();
if (body != null) {
messageFlowPane.add(body);
}
// Add the option buttons
- FlowPane buttonFlowPane = (FlowPane)wtkxSerializer.getObjectByName("buttonFlowPane");
+ FlowPane buttonFlowPane = wtkxSerializer.getObjectByID("buttonFlowPane");
for (int i = 0, n = prompt.getOptionCount(); i < n; i++) {
Object option = prompt.getOption(i);
Modified: incubator/pivot/trunk/wtk/src/pivot/wtkx/BindProcessor.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtkx/BindProcessor.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtkx/BindProcessor.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtkx/BindProcessor.java Thu May 14 15:32:51 2009
@@ -213,7 +213,7 @@
boolean added = false;
JCAnnotation bindAnnotation = getBindAnnotation(bindField);
- String loadFieldName = getAnnotationProperty(bindAnnotation, "property");
+ String loadFieldName = getAnnotationProperty(bindAnnotation, "fieldName");
if (loadGroups != null
&& loadGroups.containsKey(loadFieldName)) {
@@ -406,7 +406,7 @@
// Get annotation properties
JCAnnotation loadAnnotation = getLoadAnnotation(loadField);
- String resourceName = getAnnotationProperty(loadAnnotation, "name");
+ String resourceName = getAnnotationProperty(loadAnnotation, "resourceName");
InputStream inputStream;
try {
@@ -450,19 +450,18 @@
String bindFieldName = bindField.name.toString();
JCAnnotation bindAnnotation = getBindAnnotation(bindField);
- String bindName = getAnnotationProperty(bindAnnotation, "name");
- if (bindName == null) {
+ String wtkxID = getAnnotationProperty(bindAnnotation, "id");
+ if (wtkxID == null) {
// The bind name defaults to the field name
- bindName = bindFieldName;
+ wtkxID = bindFieldName;
}
buf.append(String.format
- ("object = __namedObjects.get(\"%s\");", bindName));
+ ("object = __namedObjects.get(\"%s\");", wtkxID));
buf.append
("if (object == null) ");
buf.append(String.format
- ("throw new pivot.wtkx.BindException(\"Element not found: %s.\");",
- bindName));
+ ("throw new pivot.wtkx.BindException(\"Element not found: %s.\");", wtkxID));
buf.append(String.format
("%s = (%s)object;", bindFieldName, bindField.vartype.toString()));
}
@@ -507,7 +506,7 @@
// Get annotation properties
JCAnnotation loadAnnotation = getLoadAnnotation(loadField);
- String resourceName = getAnnotationProperty(loadAnnotation, "name");
+ String resourceName = getAnnotationProperty(loadAnnotation, "resourceName");
String baseName = getAnnotationProperty(loadAnnotation, "resources");
String language = getAnnotationProperty(loadAnnotation, "locale");
@@ -569,18 +568,18 @@
String bindFieldName = bindField.name.toString();
JCAnnotation bindAnnotation = getBindAnnotation(bindField);
- String bindName = getAnnotationProperty(bindAnnotation, "name");
- if (bindName == null) {
+ String wtkxID = getAnnotationProperty(bindAnnotation, "id");
+ if (wtkxID == null) {
// The bind name defaults to the field name
- bindName = bindFieldName;
+ wtkxID = bindFieldName;
}
buf.append(String.format
- ("object = wtkxSerializer.getObjectByName(\"%s\");", bindName));
+ ("object = wtkxSerializer.getObjectByID(\"%s\");", wtkxID));
buf.append
("if (object == null) ");
buf.append(String.format
- ("throw new pivot.wtkx.BindException(\"Element not found: %s.\");", bindName));
+ ("throw new pivot.wtkx.BindException(\"Element not found: %s.\");", wtkxID));
buf.append(String.format
("%s = (%s)object;", bindFieldName, bindField.vartype.toString()));
}
@@ -604,12 +603,12 @@
for (JCVariableDecl bindField : strandedBindFields) {
String bindFieldName = bindField.name.toString();
JCAnnotation bindAnnotation = getBindAnnotation(bindField);
- String loadFieldName = getAnnotationProperty(bindAnnotation, "property");
+ String loadFieldName = getAnnotationProperty(bindAnnotation, "fieldName");
- String bindName = getAnnotationProperty(bindAnnotation, "name");
- if (bindName == null) {
+ String wtkxID = getAnnotationProperty(bindAnnotation, "id");
+ if (wtkxID == null) {
// The bind name defaults to the field name
- bindName = bindFieldName;
+ wtkxID = bindFieldName;
}
buf.append(String.format
@@ -623,11 +622,11 @@
("}");
buf.append(String.format
- ("object = namedObjects.get(\"%s\");", bindName));
+ ("object = namedObjects.get(\"%s\");", wtkxID));
buf.append
("if (object == null) ");
buf.append(String.format
- ("throw new pivot.wtkx.BindException(\"Element not found: %s.\");", bindName));
+ ("throw new pivot.wtkx.BindException(\"Element not found: %s.\");", wtkxID));
buf.append(String.format
("%s = (%s)object;", bindFieldName, bindField.vartype.toString()));
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtkx/Bindable.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtkx/Bindable.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtkx/Bindable.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtkx/Bindable.java Thu May 14 15:32:51 2009
@@ -59,12 +59,12 @@
* <p>
* <pre>
* public class Example extends Bindable {
- * @Load(name="example.wtkx") private Border border;
+ * @Load(resourceName="example.wtkx") private Border border;
*
- * @Bind(property="border") private Slider redSlider;
- * @Bind(property="border") private Slider greenSlider;
- * @Bind(property="border") private Slider blueSlider;
- * @Bind(property="border", name="colorBorder") private Border colorSample;
+ * @Bind(fieldName="border") private Slider redSlider;
+ * @Bind(fieldName="border") private Slider greenSlider;
+ * @Bind(fieldName="border") private Slider blueSlider;
+ * @Bind(fieldName="border", id="colorBorder") private Border colorSample;
*
* public Example() {
* // Your annotated variables will be null until you call bind()
@@ -139,7 +139,7 @@
* should be of the form defined by {@link Class#getResource(String)}
* and is relative to the <tt>Bindable</tt> subclass.
*/
- public String name();
+ public String resourceName();
/**
* The base name of the resources to associate with the WTKX load.
@@ -150,9 +150,9 @@
public String resources() default "\0";
/**
- * The locale with which to load the WTKX. This should be a lowercase
- * two-letter ISO-639 code. If unspecified, the user's default locale
- * will be used.
+ * The locale with which to load WTKX resources. This should be a
+ * lowercase two-letter ISO-639 code. If unspecified, the user's
+ * default locale will be used.
*/
public String locale() default "\0";
@@ -168,7 +168,7 @@
* Annotation that causes a loaded WTKX element to be bound to the
* annotated field. This annotation necessitates the prior use of a
* <tt>@Load</tt> annotation and references the loaded field via the
- * <tt>property</tt> attribute.
+ * <tt>fieldName</tt> attribute.
*
* @author gbrown
*/
@@ -176,24 +176,24 @@
@Target(ElementType.FIELD)
protected static @interface Bind {
/**
- * The name of the property that was loaded via the <tt>@Load</tt>
+ * The name of the field that was loaded via the <tt>@Load</tt>
* annotation.
*
* @see
* Load
*/
- public String property();
+ public String fieldName();
/**
- * The name of the WTKX variable that references the element to bind.
+ * The ID of the WTKX variable that references the element to bind.
* It should be a valid <tt>wtkx:id</tt> from the loaded
- * WTKX resource. If unspecified, the name of the annotated property
+ * WTKX resource. If unspecified, the name of the annotated field
* will be used.
*
* @see
- * WTKXSerializer#getObjectByName(String)
+ * WTKXSerializer#getObjectByID(String)
*/
- public String name() default "\0";
+ public String id() default "\0";
}
/**
@@ -244,7 +244,7 @@
}
if (bindOverload == null) {
- // Maps field name to the serializer that loaded the property; public
+ // Maps field name to the serializer that loaded the field; public
// and protected serializers are retained for sub-types, but private
// serializers are removed at the end of the block
HashMap<String, WTKXSerializer> wtkxSerializers = new HashMap<String, WTKXSerializer>();
@@ -318,7 +318,7 @@
WTKXSerializer wtkxSerializer = new WTKXSerializer(resources);
wtkxSerializers.put(fieldName, wtkxSerializer);
- URL location = type.getResource(loadAnnotation.name());
+ URL location = type.getResource(loadAnnotation.resourceName());
Object resource;
try {
resource = wtkxSerializer.readObject(location);
@@ -356,19 +356,19 @@
}
}
- // Bind to the value loaded by the property's serializer
- String property = bindAnnotation.property();
- WTKXSerializer wtkxSerializer = wtkxSerializers.get(property);
+ // Bind to the value loaded by the field's serializer
+ String loadFieldName = bindAnnotation.fieldName();
+ WTKXSerializer wtkxSerializer = wtkxSerializers.get(loadFieldName);
if (wtkxSerializer == null) {
- throw new BindException("Property \"" + property + "\" has not been loaded.");
+ throw new BindException("Field \"" + loadFieldName + "\" has not been loaded.");
}
- String id = bindAnnotation.name();
+ String id = bindAnnotation.id();
if (id.equals("\0")) {
id = field.getName();
}
- Object value = wtkxSerializer.getObjectByName(id);
+ Object value = wtkxSerializer.getObjectByID(id);
if (value == null) {
throw new BindException("\"" + id + "\" does not exist.");
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtkx/WTKXSerializer.java Thu May 14 15:32:51 2009
@@ -140,7 +140,20 @@
}
if (serializer != null) {
- object = serializer.getObjectByID(namespacePath[i]);
+ String id = namespacePath[i];
+
+ if (namedObjects.containsKey(id)) {
+ object = namedObjects.get(id);
+ } else {
+ if (scriptEngineManager != null) {
+ try {
+ Method getMethod = scriptEngineManagerClass.getMethod("get", new Class<?>[] {String.class});
+ object = getMethod.invoke(scriptEngineManager, new Object[] {id});
+ } catch(Exception exception) {
+ throw new RuntimeException(exception);
+ }
+ }
+ }
}
return object;
@@ -663,7 +676,7 @@
listenerID = listenerID.substring(1);
if (listenerID.length() > 0) {
- listenerList.add(getObjectByID(listenerID));
+ listenerList.add(namedObjectDictionary.get(listenerID));
}
}
}
@@ -957,7 +970,7 @@
listenerID = listenerID.substring(1);
if (listenerID.length() > 0) {
- listenerList.add(getObjectByID(listenerID));
+ listenerList.add(namedObjectDictionary.get(listenerID));
}
}
}
@@ -1046,7 +1059,7 @@
* @param <T>
* The type of the object to return.
*
- * @param name
+ * @param id
* The name of the object, relative to this loader. The values's name is the
* concatentation of its parent namespaces and its ID, separated by periods
* (e.g. "foo.bar.baz").
@@ -1055,8 +1068,8 @@
* name does not exist.
*/
@SuppressWarnings("unchecked")
- public <T> T getObjectByName(String name) {
- Object object = namedObjectDictionary.get(name);
+ public <T> T getObjectByID(String id) {
+ Object object = namedObjectDictionary.get(id);
return (T)object;
}
@@ -1072,25 +1085,6 @@
return namedObjectDictionary;
}
- private Object getObjectByID(String id) {
- Object object = null;
-
- if (namedObjects.containsKey(id)) {
- object = namedObjects.get(id);
- } else {
- if (scriptEngineManager != null) {
- try {
- Method getMethod = scriptEngineManagerClass.getMethod("get", new Class<?>[] {String.class});
- object = getMethod.invoke(scriptEngineManager, new Object[] {id});
- } catch(Exception exception) {
- throw new RuntimeException(exception);
- }
- }
- }
-
- return object;
- }
-
/**
* Resolves an attribute value. If the property type is a primitive or
* primitive wrapper, converts the string value to the primitive type.
@@ -1197,7 +1191,7 @@
if (attributeValue.charAt(1) == OBJECT_REFERENCE_PREFIX) {
resolvedValue = attributeValue.substring(1);
} else {
- resolvedValue = getObjectByID(attributeValue.substring(1));
+ resolvedValue = namedObjectDictionary.get(attributeValue.substring(1));
}
}
} else {
Modified: incubator/pivot/trunk/wtk/test/pivot/wtk/test/CardPaneTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/pivot/wtk/test/CardPaneTest.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/pivot/wtk/test/CardPaneTest.java (original)
+++ incubator/pivot/trunk/wtk/test/pivot/wtk/test/CardPaneTest.java Thu May 14 15:32:51 2009
@@ -46,7 +46,7 @@
WTKXSerializer wtkxSerializer = new WTKXSerializer();
sheet = new Sheet((Component)wtkxSerializer.readObject(getClass().getResource("card_pane_test.wtkx")));
- cardPane = (CardPane)wtkxSerializer.getObjectByName("cardPane");
+ cardPane = (CardPane)wtkxSerializer.getObjectByID("cardPane");
Button.Group sizeGroup = Button.getGroup("sizeGroup");
sizeGroup.getGroupListeners().add(new Button.GroupListener() {
Modified: incubator/pivot/trunk/wtk/test/pivot/wtk/test/FileBrowserTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/pivot/wtk/test/FileBrowserTest.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/pivot/wtk/test/FileBrowserTest.java (original)
+++ incubator/pivot/trunk/wtk/test/pivot/wtk/test/FileBrowserTest.java Thu May 14 15:32:51 2009
@@ -36,7 +36,7 @@
WTKXSerializer wtkxSerializer = new WTKXSerializer();
frame = new Frame((Component)wtkxSerializer.readObject(getClass().getResource("file_browser_test.wtkx")));
- TreeView folderTreeView = (TreeView)wtkxSerializer.getObjectByName("folderTreeView");
+ TreeView folderTreeView = (TreeView)wtkxSerializer.getObjectByID("folderTreeView");
String pathname = "/";
final Folder rootFolder = new Folder(pathname);
Modified: incubator/pivot/trunk/wtk/test/pivot/wtk/test/SliderTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/pivot/wtk/test/SliderTest.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/pivot/wtk/test/SliderTest.java (original)
+++ incubator/pivot/trunk/wtk/test/pivot/wtk/test/SliderTest.java Thu May 14 15:32:51 2009
@@ -35,14 +35,14 @@
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = new Window((Component)wtkxSerializer.readObject(getClass().getResource("slider_test.wtkx")));
- slider = (Slider)wtkxSerializer.getObjectByName("slider");
+ slider = (Slider)wtkxSerializer.getObjectByID("slider");
slider.getSliderValueListeners().add(new SliderValueListener() {
public void valueChanged(Slider slider, int previousValue) {
valueLabel.setText(Integer.toString(slider.getValue()));
}
});
- valueLabel = (Label)wtkxSerializer.getObjectByName("valueLabel");
+ valueLabel = (Label)wtkxSerializer.getObjectByID("valueLabel");
window.setTitle("Slider Test");
window.setMaximized(true);
Modified: incubator/pivot/trunk/wtk/test/pivot/wtk/test/SpinnerFocusTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/pivot/wtk/test/SpinnerFocusTest.java?rev=774824&r1=774823&r2=774824&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/pivot/wtk/test/SpinnerFocusTest.java (original)
+++ incubator/pivot/trunk/wtk/test/pivot/wtk/test/SpinnerFocusTest.java Thu May 14 15:32:51 2009
@@ -46,7 +46,7 @@
frame.setTitle("Spinner Focus Test");
frame.open(display);
- Spinner spinner = (Spinner)wtkxSerializer.getObjectByName("spinner");
+ Spinner spinner = (Spinner)wtkxSerializer.getObjectByID("spinner");
spinner.requestFocus();
action.setEnabled(false);