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 2010/01/28 16:41:44 UTC
svn commit: r904137 - in /pivot/trunk: tests/src/org/apache/pivot/tests/
wtk/src/org/apache/pivot/wtk/ wtk/src/org/apache/pivot/wtkx/
Author: gbrown
Date: Thu Jan 28 15:41:44 2010
New Revision: 904137
URL: http://svn.apache.org/viewvc?rev=904137&view=rev
Log:
Add Resources argument to Bindable#initialize(); add additional convenience Alert.alert() and Prompt.prompt() signatures.
Added:
pivot/trunk/tests/src/org/apache/pivot/tests/BindableWindow.json
Modified:
pivot/trunk/tests/src/org/apache/pivot/tests/BindableTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/BindableWindow.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java
pivot/trunk/wtk/src/org/apache/pivot/wtkx/Bindable.java
pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/BindableTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/BindableTest.java?rev=904137&r1=904136&r2=904137&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/BindableTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/BindableTest.java Thu Jan 28 15:41:44 2010
@@ -17,6 +17,7 @@
package org.apache.pivot.tests;
import org.apache.pivot.collections.Map;
+import org.apache.pivot.util.Resources;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
@@ -27,7 +28,7 @@
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ WTKXSerializer wtkxSerializer = new WTKXSerializer(new Resources(BindableWindow.class.getName()));
window = (BindableWindow)wtkxSerializer.readObject(this, "bindable_test.wtkx");
window.open(display);
}
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/BindableWindow.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/BindableWindow.java?rev=904137&r1=904136&r2=904137&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/BindableWindow.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/BindableWindow.java Thu Jan 28 15:41:44 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tests;
+import org.apache.pivot.util.Resources;
import org.apache.pivot.wtk.Label;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtkx.Bindable;
@@ -25,7 +26,7 @@
@WTKX private Label label = null;
@Override
- public void initialize() {
- label.setText("Hello Bindable!");
+ public void initialize(Resources resources) {
+ label.setText(resources.getString("message"));
}
}
Added: pivot/trunk/tests/src/org/apache/pivot/tests/BindableWindow.json
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/BindableWindow.json?rev=904137&view=auto
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/BindableWindow.json (added)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/BindableWindow.json Thu Jan 28 15:41:44 2010
@@ -0,0 +1,2 @@
+{ message:"Hello Bindable!"
+}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java?rev=904137&r1=904136&r2=904137&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java Thu Jan 28 15:41:44 2010
@@ -146,6 +146,11 @@
alert(messageType, message, null, owner, null);
}
+ public static void alert(MessageType messageType, String message, Window owner,
+ DialogCloseListener dialogCloseListener) {
+ alert(messageType, message, null, owner, dialogCloseListener);
+ }
+
public static void alert(MessageType messageType, String message, Component body, Window owner) {
alert(messageType, message, body, owner, null);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java?rev=904137&r1=904136&r2=904137&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/Prompt.java Thu Jan 28 15:41:44 2010
@@ -133,6 +133,11 @@
prompt(messageType, message, null, owner, null);
}
+ public static void prompt(MessageType messageType, String message, Window owner,
+ SheetCloseListener sheetCloseListener) {
+ prompt(messageType, message, null, owner, sheetCloseListener);
+ }
+
public static void prompt(MessageType messageType, String message, Component body, Window owner) {
prompt(messageType, message, body, owner, null);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtkx/Bindable.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtkx/Bindable.java?rev=904137&r1=904136&r2=904137&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtkx/Bindable.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtkx/Bindable.java Thu Jan 28 15:41:44 2010
@@ -16,6 +16,8 @@
*/
package org.apache.pivot.wtkx;
+import org.apache.pivot.util.Resources;
+
/**
* Allows WTKX serializer to automatically bind to an instance of a
* deserialized class.
@@ -25,5 +27,5 @@
* Called to initialize the class after it has been completely
* processed and bound by the serializer.
*/
- public void initialize();
+ public void initialize(Resources resources);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java?rev=904137&r1=904136&r2=904137&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java Thu Jan 28 15:41:44 2010
@@ -454,7 +454,7 @@
bind(root);
Bindable bindable = (Bindable)root;
- bindable.initialize();
+ bindable.initialize(resources);
}
// Clear the location