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/06/15 20:17:19 UTC
svn commit: r954994 [2/3] - in /pivot/trunk:
core/src/org/apache/pivot/beans/ demos/src/org/apache/pivot/demos/clock/
demos/src/org/apache/pivot/demos/decorator/
demos/src/org/apache/pivot/demos/dnd/
demos/src/org/apache/pivot/demos/itunes/ demos/src/o...
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/WatermarkDecoratorTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/WatermarkDecoratorTest.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/WatermarkDecoratorTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/WatermarkDecoratorTest.java Tue Jun 15 18:17:15 2010
@@ -16,19 +16,19 @@
*/
package org.apache.pivot.tests;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class WatermarkDecoratorTest implements Application {
private Window window = null;
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "watermark_decorator_test.wtkx");
window.open(display);
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/text/TextAreaTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/text/TextAreaTest.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/text/TextAreaTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/text/TextAreaTest.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tests.text;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.collections.Sequence.Tree.Path;
@@ -32,7 +33,6 @@ import org.apache.pivot.wtk.TreeView;
import org.apache.pivot.wtk.TreeViewSelectionListener;
import org.apache.pivot.wtk.text.Node;
import org.apache.pivot.wtk.text.NodeListener;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class TextAreaTest implements Application {
private Frame frame = null;
@@ -68,7 +68,7 @@ public class TextAreaTest implements App
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
frame = new Frame((Component)wtkxSerializer.readObject(getClass().getResource("text_area_test.wtkx")));
frame.setTitle("TextArea Test");
frame.setPreferredSize(640, 480);
Modified: pivot/trunk/tools/src/org/apache/pivot/tools/json/JSONViewer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tools/src/org/apache/pivot/tools/json/JSONViewer.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tools/src/org/apache/pivot/tools/json/JSONViewer.java (original)
+++ pivot/trunk/tools/src/org/apache/pivot/tools/json/JSONViewer.java Tue Jun 15 18:17:15 2010
@@ -22,6 +22,8 @@ import java.io.IOException;
import java.io.StringReader;
import java.util.Comparator;
+import org.apache.pivot.beans.BXML;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.List;
import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.Sequence.Tree.Path;
@@ -42,8 +44,6 @@ import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.content.TreeBranch;
import org.apache.pivot.wtk.content.TreeNode;
import org.apache.pivot.wtk.effects.OverlayDecorator;
-import org.apache.pivot.wtkx.WTKX;
-import org.apache.pivot.wtkx.WTKXSerializer;
/**
* Utility application that allows the user to browse a JSON structure
@@ -52,7 +52,7 @@ import org.apache.pivot.wtkx.WTKXSeriali
public class JSONViewer implements Application {
private Window window = null;
- @WTKX private TreeView treeView = null;
+ @BXML private TreeView treeView = null;
private OverlayDecorator promptDecorator = new OverlayDecorator();
@@ -62,7 +62,7 @@ public class JSONViewer implements Appli
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
wtkxSerializer.put(APPLICATION_KEY, this);
window = (Window)wtkxSerializer.readObject(this, "json_viewer.wtkx");
Modified: pivot/trunk/tools/src/org/apache/pivot/tools/wtk/EventLoggerSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tools/src/org/apache/pivot/tools/wtk/EventLoggerSkin.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tools/src/org/apache/pivot/tools/wtk/EventLoggerSkin.java (original)
+++ pivot/trunk/tools/src/org/apache/pivot/tools/wtk/EventLoggerSkin.java Tue Jun 15 18:17:15 2010
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.Comparator;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.HashMap;
import org.apache.pivot.collections.List;
@@ -38,7 +39,6 @@ import org.apache.pivot.wtk.TreeViewNode
import org.apache.pivot.wtk.content.TreeBranch;
import org.apache.pivot.wtk.content.TreeNode;
import org.apache.pivot.wtk.skin.ContainerSkin;
-import org.apache.pivot.wtkx.WTKXSerializer;
class EventLoggerSkin extends ContainerSkin implements EventLogger.Skin, EventLoggerListener {
private static class TreeNodeComparator implements Comparator<TreeNode> {
@@ -86,7 +86,7 @@ class EventLoggerSkin extends ContainerS
throw new RuntimeException(exception);
}
- WTKXSerializer wtkxSerializer = new WTKXSerializer(resources);
+ BeanSerializer wtkxSerializer = new BeanSerializer(resources);
try {
content = (Component)wtkxSerializer.readObject(this, "event_logger_skin.wtkx");
} catch (IOException exception) {
Modified: pivot/trunk/tools/src/org/apache/pivot/tools/xml/XMLViewer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tools/src/org/apache/pivot/tools/xml/XMLViewer.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tools/src/org/apache/pivot/tools/xml/XMLViewer.java (original)
+++ pivot/trunk/tools/src/org/apache/pivot/tools/xml/XMLViewer.java Tue Jun 15 18:17:15 2010
@@ -21,6 +21,8 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.StringReader;
+import org.apache.pivot.beans.BXML;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.HashMap;
import org.apache.pivot.collections.Map;
@@ -42,8 +44,6 @@ import org.apache.pivot.wtk.TreeView;
import org.apache.pivot.wtk.VerticalAlignment;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.effects.OverlayDecorator;
-import org.apache.pivot.wtkx.WTKX;
-import org.apache.pivot.wtkx.WTKXSerializer;
import org.apache.pivot.xml.Element;
import org.apache.pivot.xml.Node;
import org.apache.pivot.xml.TextNode;
@@ -56,11 +56,11 @@ import org.apache.pivot.xml.XMLSerialize
public class XMLViewer implements Application {
private Window window = null;
- @WTKX private TreeView treeView = null;
- @WTKX private CardPane propertiesCardPane = null;
- @WTKX private TableView namespacesTableView = null;
- @WTKX private TableView attributesTableView = null;
- @WTKX private TextArea textArea = null;
+ @BXML private TreeView treeView = null;
+ @BXML private CardPane propertiesCardPane = null;
+ @BXML private TableView namespacesTableView = null;
+ @BXML private TableView attributesTableView = null;
+ @BXML private TextArea textArea = null;
private OverlayDecorator promptDecorator = new OverlayDecorator();
@@ -70,7 +70,7 @@ public class XMLViewer implements Applic
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
wtkxSerializer.put(APPLICATION_KEY, this);
window = (Window)wtkxSerializer.readObject(this, "xml_viewer.wtkx");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloJavaScript.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloJavaScript.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloJavaScript.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloJavaScript.java Tue Jun 15 18:17:15 2010
@@ -16,12 +16,12 @@
*/
package org.apache.pivot.tutorials;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class HelloJavaScript implements Application {
private Window window = null;
@@ -29,7 +29,7 @@ public class HelloJavaScript implements
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "hello_javascript.wtkx");
window.open(display);
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloWTKX.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloWTKX.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloWTKX.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloWTKX.java Tue Jun 15 18:17:15 2010
@@ -16,12 +16,12 @@
*/
package org.apache.pivot.tutorials;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class HelloWTKX implements Application {
private Window window = null;
@@ -29,7 +29,7 @@ public class HelloWTKX implements Applic
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "hello.wtkx");
window.open(display);
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java Tue Jun 15 18:17:15 2010
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.net.URL;
import java.util.Comparator;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.HashMap;
import org.apache.pivot.collections.List;
@@ -79,7 +80,6 @@ import org.apache.pivot.wtk.content.Tree
import org.apache.pivot.wtk.content.TreeNode;
import org.apache.pivot.wtk.effects.ReflectionDecorator;
import org.apache.pivot.wtk.media.Image;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class KitchenSink implements Application, Application.AboutHandler {
private abstract class RollupStateHandler
@@ -101,7 +101,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
try {
component = (Component)wtkxSerializer.readObject(this, "buttons.wtkx");
} catch(IOException exception) {
@@ -128,7 +128,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
try {
component = (Component)wtkxSerializer.readObject(this, "lists.wtkx");
} catch(IOException exception) {
@@ -180,7 +180,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
try {
component = (Component)wtkxSerializer.readObject(this, "text.wtkx");
} catch(IOException exception) {
@@ -202,7 +202,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
try {
component = (Component)wtkxSerializer.readObject(this, "calendars.wtkx");
} catch(IOException exception) {
@@ -224,7 +224,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
try {
component = (Component)wtkxSerializer.readObject(this, "color_choosers.wtkx");
} catch(IOException exception) {
@@ -246,7 +246,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
try {
component = (Component)wtkxSerializer.readObject(this, "navigation.wtkx");
} catch(IOException exception) {
@@ -268,7 +268,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
try {
component = (Component)wtkxSerializer.readObject(this, "splitters.wtkx");
} catch(IOException exception) {
@@ -327,7 +327,7 @@ public class KitchenSink implements Appl
}
});
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
try {
component = (Component)wtkxSerializer.readObject(this, "menus.wtkx");
} catch(IOException exception) {
@@ -379,7 +379,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
try {
component = (Component)wtkxSerializer.readObject(this, "meters.wtkx");
} catch(IOException exception) {
@@ -432,7 +432,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
try {
component = (Component)wtkxSerializer.readObject(this, "spinners.wtkx");
} catch(IOException exception) {
@@ -500,7 +500,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
try {
component = (Component)wtkxSerializer.readObject(this, "tables.wtkx");
} catch(IOException exception) {
@@ -603,7 +603,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
try {
component = (Component)wtkxSerializer.readObject(this, "trees.wtkx");
} catch(IOException exception) {
@@ -659,7 +659,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
try {
component = (Component)wtkxSerializer.readObject(this, "dragdrop.wtkx");
} catch(IOException exception) {
@@ -816,7 +816,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
try {
component = (Component)wtkxSerializer.readObject(this, "alerts.wtkx");
} catch(IOException exception) {
@@ -851,7 +851,7 @@ public class KitchenSink implements Appl
options.add("Cancel");
Component body = null;
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
try {
body = (Component)wtkxSerializer.readObject(this, "alert.wtkx");
} catch(Exception exception) {
@@ -891,7 +891,7 @@ public class KitchenSink implements Appl
options.add("Cancel");
Component body = null;
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
try {
body = (Component)wtkxSerializer.readObject(this, "alert.wtkx");
} catch(Exception exception) {
@@ -938,7 +938,7 @@ public class KitchenSink implements Appl
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "kitchen_sink.wtkx");
wtkxSerializer.bind(this, KitchenSink.class);
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/backgroundtasks/BackgroundTasks.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/backgroundtasks/BackgroundTasks.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/backgroundtasks/BackgroundTasks.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/backgroundtasks/BackgroundTasks.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.backgroundtasks;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.util.concurrent.Task;
import org.apache.pivot.util.concurrent.TaskExecutionException;
@@ -29,7 +30,6 @@ import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.TaskAdapter;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class BackgroundTasks implements Application {
private Window window = null;
@@ -40,7 +40,7 @@ public class BackgroundTasks implements
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "background_tasks.wtkx");
activityIndicator = (ActivityIndicator)wtkxSerializer.get("activityIndicator");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/boundedrange/Sliders.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/boundedrange/Sliders.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/boundedrange/Sliders.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/boundedrange/Sliders.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.boundedrange;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
@@ -24,7 +25,6 @@ import org.apache.pivot.wtk.Label;
import org.apache.pivot.wtk.Slider;
import org.apache.pivot.wtk.SliderValueListener;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class Sliders implements Application {
private Window window = null;
@@ -33,7 +33,7 @@ public class Sliders implements Applicat
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "sliders.wtkx");
slider = (Slider)wtkxSerializer.get("slider");
label = (Label)wtkxSerializer.get("label");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/PushButtons.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/PushButtons.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/PushButtons.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/PushButtons.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.buttons;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Alert;
import org.apache.pivot.wtk.Application;
@@ -26,7 +27,6 @@ import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.MessageType;
import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class PushButtons implements Application {
private Window window = null;
@@ -34,7 +34,7 @@ public class PushButtons implements Appl
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "push_buttons.wtkx");
pushButton = (PushButton)wtkxSerializer.get("pushButton");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/RadioButtons.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/RadioButtons.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/RadioButtons.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/RadioButtons.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.buttons;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Alert;
import org.apache.pivot.wtk.Application;
@@ -27,7 +28,6 @@ import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.MessageType;
import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class RadioButtons implements Application {
private Window window = null;
@@ -36,7 +36,7 @@ public class RadioButtons implements App
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "radio_buttons.wtkx");
selectButton = (PushButton)wtkxSerializer.get("selectButton");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/calendars/Calendars.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/calendars/Calendars.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/calendars/Calendars.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/calendars/Calendars.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.calendars;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.util.CalendarDate;
import org.apache.pivot.wtk.Application;
@@ -27,7 +28,6 @@ import org.apache.pivot.wtk.DesktopAppli
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Label;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class Calendars implements Application {
private Window window = null;
@@ -40,7 +40,7 @@ public class Calendars implements Applic
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "calendars.wtkx");
calendar = (Calendar)wtkxSerializer.get("calendar");
calendarButton = (CalendarButton)wtkxSerializer.get("calendarButton");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java Tue Jun 15 18:17:15 2010
@@ -19,6 +19,7 @@ package org.apache.pivot.tutorials.datab
import java.io.InputStream;
import org.apache.pivot.beans.BeanAdapter;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.json.JSONSerializer;
import org.apache.pivot.wtk.Application;
@@ -30,7 +31,6 @@ import org.apache.pivot.wtk.Form;
import org.apache.pivot.wtk.Label;
import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class DataBinding implements Application {
private Window window = null;
@@ -48,7 +48,7 @@ public class DataBinding implements Appl
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "data_binding.wtkx");
form = (Form)wtkxSerializer.get("form");
loadJavaButton = (PushButton)wtkxSerializer.get("loadJavaButton");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/drawing/RotateLine.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/drawing/RotateLine.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/drawing/RotateLine.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/drawing/RotateLine.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.drawing;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.ApplicationContext;
@@ -25,7 +26,6 @@ import org.apache.pivot.wtk.ImageView;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.media.Drawing;
import org.apache.pivot.wtk.media.drawing.Shape;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class RotateLine implements Application {
private Drawing drawing = null;
@@ -36,7 +36,7 @@ public class RotateLine implements Appli
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception{
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
drawing = (Drawing)wtkxSerializer.readObject(this, "rotate_line.wtkd");
rotation = (Shape.Rotate)wtkxSerializer.get("rotation");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/effects/Transitions.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/effects/Transitions.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/effects/Transitions.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/effects/Transitions.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.effects;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Button;
@@ -27,7 +28,6 @@ import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.effects.Transition;
import org.apache.pivot.wtk.effects.TransitionListener;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class Transitions implements Application {
private Window window = null;
@@ -44,7 +44,7 @@ public class Transitions implements Appl
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "transitions.wtkx");
button1 = (PushButton)wtkxSerializer.get("button1");
button2 = (PushButton)wtkxSerializer.get("button2");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.java Tue Jun 15 18:17:15 2010
@@ -21,6 +21,7 @@ import java.io.InputStream;
import java.io.IOException;
import java.net.URL;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.List;
import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.Sequence;
@@ -51,7 +52,6 @@ import org.apache.pivot.wtk.TreeViewSele
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.text.Document;
import org.apache.pivot.wtk.text.PlainTextSerializer;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class ComponentExplorer implements Application {
private Window window = null;
@@ -83,7 +83,7 @@ public class ComponentExplorer implement
public void startup(Display display, Map<String, String> properties)
throws Exception {
Resources resources = new Resources(getClass().getName());
- WTKXSerializer wtkxSerializer = new WTKXSerializer(resources);
+ BeanSerializer wtkxSerializer = new BeanSerializer(resources);
window = (Window)wtkxSerializer.readObject(this, "component_explorer.wtkx");
splitPane = wtkxSerializer.getValue("splitPane");
@@ -138,7 +138,7 @@ public class ComponentExplorer implement
sourceTextArea.setDocument(document);
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
try {
component = (Component)wtkxSerializer.readObject(url);
} catch (IOException exception) {
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowsing/FileBrowsing.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowsing/FileBrowsing.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowsing/FileBrowsing.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowsing/FileBrowsing.java Tue Jun 15 18:17:15 2010
@@ -18,6 +18,8 @@ package org.apache.pivot.tutorials.fileb
import java.io.File;
+import org.apache.pivot.beans.BXML;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.Sequence;
@@ -35,19 +37,17 @@ import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.Sheet;
import org.apache.pivot.wtk.SheetCloseListener;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKX;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class FileBrowsing implements Application {
private Window window = null;
- @WTKX private ButtonGroup fileBrowserSheetModeGroup = null;
- @WTKX private PushButton openSheetButton = null;
+ @BXML private ButtonGroup fileBrowserSheetModeGroup = null;
+ @BXML private PushButton openSheetButton = null;
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(getClass().getResource("file_browsing.wtkx"));
wtkxSerializer.bind(this, FileBrowsing.class);
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/labels/Labels.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/labels/Labels.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/labels/Labels.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/labels/Labels.java Tue Jun 15 18:17:15 2010
@@ -16,19 +16,19 @@
*/
package org.apache.pivot.tutorials.labels;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class Labels implements Application {
private Window window = null;
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "labels.wtkx");
window.open(display);
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/BoxPanes.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/BoxPanes.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/BoxPanes.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/BoxPanes.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.layout;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Button;
@@ -29,7 +30,6 @@ import org.apache.pivot.wtk.Orientation;
import org.apache.pivot.wtk.RadioButton;
import org.apache.pivot.wtk.VerticalAlignment;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class BoxPanes implements Application {
private Window window = null;
@@ -46,7 +46,7 @@ public class BoxPanes implements Applica
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "box_panes.wtkx");
boxPane = (BoxPane)wtkxSerializer.get("boxPane");
horizontalOrientationButton = (RadioButton)wtkxSerializer.get("horizontalOrientationButton");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/FlowPanes.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/FlowPanes.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/FlowPanes.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/FlowPanes.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.layout;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Button;
@@ -27,7 +28,6 @@ import org.apache.pivot.wtk.FlowPane;
import org.apache.pivot.wtk.HorizontalAlignment;
import org.apache.pivot.wtk.RadioButton;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class FlowPanes implements Application {
private Window window = null;
@@ -39,7 +39,7 @@ public class FlowPanes implements Applic
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "flow_panes.wtkx");
flowPane = (FlowPane)wtkxSerializer.get("flowPane");
leftRadioButton = (RadioButton)wtkxSerializer.get("leftRadioButton");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Forms.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Forms.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Forms.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Forms.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.layout;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Button;
@@ -30,7 +31,6 @@ import org.apache.pivot.wtk.Prompt;
import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.TextInput;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class Forms implements Application {
private Window window = null;
@@ -42,7 +42,7 @@ public class Forms implements Applicatio
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "forms.wtkx");
nameBoxPane = (BoxPane)wtkxSerializer.get("nameBoxPane");
lastNameTextInput = (TextInput)wtkxSerializer.get("lastNameTextInput");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/SimpleTablePanes.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/SimpleTablePanes.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/SimpleTablePanes.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/SimpleTablePanes.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.layout;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.BoxPane;
import org.apache.pivot.wtk.Component;
@@ -30,7 +31,6 @@ import org.apache.pivot.wtk.Orientation;
import org.apache.pivot.wtk.Prompt;
import org.apache.pivot.wtk.TablePane;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class SimpleTablePanes implements Application {
private Window window = null;
@@ -38,7 +38,7 @@ public class SimpleTablePanes implements
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "simple_table_panes.wtkx");
tablePane = (TablePane)wtkxSerializer.get("tablePane");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/TablePanes.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/TablePanes.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/TablePanes.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/TablePanes.java Tue Jun 15 18:17:15 2010
@@ -18,6 +18,7 @@ package org.apache.pivot.tutorials.layou
import java.io.IOException;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.Map;
import org.apache.pivot.serialization.SerializationException;
@@ -36,7 +37,6 @@ import org.apache.pivot.wtk.Sheet;
import org.apache.pivot.wtk.SheetCloseListener;
import org.apache.pivot.wtk.TablePane;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class TablePanes implements Application {
private class ContextMenuHandler extends MenuHandler.Adapter {
@@ -94,7 +94,7 @@ public class TablePanes implements Appli
namedActions.put("configureCell", new Action() {
@Override
public void perform() {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
Sheet sheet;
// Make the cell component available to script blocks
@@ -118,7 +118,7 @@ public class TablePanes implements Appli
namedActions.put("configureRow", new Action() {
@Override
public void perform() {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
Sheet sheet;
// Make the selected row available to script blocks
@@ -141,7 +141,7 @@ public class TablePanes implements Appli
namedActions.put("insertRow", new Action() {
@Override
public void perform() {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
Sheet sheet;
// Create and insert a new row
@@ -198,7 +198,7 @@ public class TablePanes implements Appli
namedActions.put("configureColumn", new Action() {
@Override
public void perform() {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
Sheet sheet;
// Make the selected column available to script blocks
@@ -221,7 +221,7 @@ public class TablePanes implements Appli
namedActions.put("insertColumn", new Action() {
@Override
public void perform() {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
Sheet sheet;
// Create and insert a new column
@@ -285,7 +285,7 @@ public class TablePanes implements Appli
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "table_panes.wtkx");
tablePane = (TablePane)wtkxSerializer.get("tablePane");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListButtons.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListButtons.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListButtons.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListButtons.java Tue Jun 15 18:17:15 2010
@@ -17,6 +17,8 @@
package org.apache.pivot.tutorials.lists;
import java.net.URL;
+
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.util.ThreadUtilities;
import org.apache.pivot.util.concurrent.TaskExecutionException;
@@ -29,7 +31,6 @@ import org.apache.pivot.wtk.ListButton;
import org.apache.pivot.wtk.ListButtonSelectionListener;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.media.Image;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class ListButtons implements Application {
private Window window = null;
@@ -71,7 +72,7 @@ public class ListButtons implements Appl
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "list_buttons.wtkx");
listButton = (ListButton)wtkxSerializer.get("listButton");
imageView = (ImageView)wtkxSerializer.get("imageView");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.lists;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.wtk.Application;
@@ -26,7 +27,6 @@ import org.apache.pivot.wtk.ListView;
import org.apache.pivot.wtk.ListViewSelectionListener;
import org.apache.pivot.wtk.Span;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class ListViews implements Application {
private Window window = null;
@@ -76,7 +76,7 @@ public class ListViews implements Applic
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "list_views.wtkx");
selectionLabel = (Label)wtkxSerializer.get("selectionLabel");
listView = (ListView)wtkxSerializer.get("listView");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization.java Tue Jun 15 18:17:15 2010
@@ -20,6 +20,7 @@ import java.awt.Font;
import java.awt.GraphicsEnvironment;
import java.util.Locale;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.util.Resources;
import org.apache.pivot.wtk.Application;
@@ -27,7 +28,6 @@ import org.apache.pivot.wtk.DesktopAppli
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Theme;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class Localization implements Application {
private Window window = null;
@@ -56,7 +56,7 @@ public class Localization implements App
}
}
- WTKXSerializer wtkxSerializer = new WTKXSerializer(resources);
+ BeanSerializer wtkxSerializer = new BeanSerializer(resources);
window = (Window)wtkxSerializer.readObject(this, "localization.wtkx");
window.open(display);
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/ContextMenus.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/ContextMenus.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/ContextMenus.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/ContextMenus.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.menus;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Action;
import org.apache.pivot.wtk.Application;
@@ -26,7 +27,6 @@ import org.apache.pivot.wtk.Menu;
import org.apache.pivot.wtk.MenuHandler;
import org.apache.pivot.wtk.Prompt;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class ContextMenus implements Application {
private Window window = null;
@@ -57,7 +57,7 @@ public class ContextMenus implements App
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "context_menus.wtkx");
window.setMenuHandler(menuHandler);
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java Tue Jun 15 18:17:15 2010
@@ -18,6 +18,7 @@ package org.apache.pivot.tutorials.menus
import java.io.IOException;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.serialization.SerializationException;
import org.apache.pivot.wtk.Action;
@@ -35,7 +36,6 @@ import org.apache.pivot.wtk.TextInput;
import org.apache.pivot.wtk.TextInputSelectionListener;
import org.apache.pivot.wtk.TextInputTextListener;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class MenuBars implements Application {
private Window window = null;
@@ -94,7 +94,7 @@ public class MenuBars implements Applica
Action.getNamedActions().put("fileNew", new Action() {
@Override
public void perform() {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
Component tab;
try {
tab = new Border((Component)wtkxSerializer.readObject(this, "document.wtkx"));
@@ -154,7 +154,7 @@ public class MenuBars implements Applica
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "menu_bars.wtkx");
tabPane = (TabPane)wtkxSerializer.get("tabPane");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/MenuButtons.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/MenuButtons.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/MenuButtons.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/MenuButtons.java Tue Jun 15 18:17:15 2010
@@ -19,6 +19,7 @@ package org.apache.pivot.tutorials.menus
import java.awt.Color;
import java.awt.Paint;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Action;
import org.apache.pivot.wtk.Application;
@@ -35,7 +36,6 @@ import org.apache.pivot.wtk.media.drawin
import org.apache.pivot.wtk.media.drawing.Rectangle;
import org.apache.pivot.wtk.media.drawing.Shape;
import org.apache.pivot.wtk.media.drawing.Text;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class MenuButtons implements Application {
private Window window = null;
@@ -93,7 +93,7 @@ public class MenuButtons implements Appl
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "menu_buttons.wtkx");
colorListButton = (ListButton)wtkxSerializer.get("colorListButton");
imageView = (ImageView)wtkxSerializer.get("imageView");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Accordions.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Accordions.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Accordions.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Accordions.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.navigation;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.util.Vote;
@@ -31,7 +32,6 @@ import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Label;
import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class Accordions implements Application {
private Window window = null;
@@ -82,7 +82,7 @@ public class Accordions implements Appli
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "accordions.wtkx");
accordion = (Accordion)wtkxSerializer.get("accordion");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.navigation;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Button;
@@ -30,7 +31,6 @@ import org.apache.pivot.wtk.LinkButton;
import org.apache.pivot.wtk.RadioButton;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.skin.CardPaneSkin;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class CardPanes implements Application {
private Window window = null;
@@ -49,7 +49,7 @@ public class CardPanes implements Applic
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "card_panes.wtkx");
cardPane = (CardPane)wtkxSerializer.get("cardPane");
previousButton = (LinkButton)wtkxSerializer.get("previousButton");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Expanders.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Expanders.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Expanders.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Expanders.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.navigation;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
@@ -23,7 +24,6 @@ import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Expander;
import org.apache.pivot.wtk.ExpanderListener;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class Expanders implements Application {
private Window window = null;
@@ -34,7 +34,7 @@ public class Expanders implements Applic
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "expanders.wtkx");
stocksExpander = (Expander)wtkxSerializer.get("stocksExpander");
weatherExpander = (Expander)wtkxSerializer.get("weatherExpander");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Rollups.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Rollups.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Rollups.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Rollups.java Tue Jun 15 18:17:15 2010
@@ -16,19 +16,19 @@
*/
package org.apache.pivot.tutorials.navigation;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class Rollups implements Application {
private Window window = null;
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "rollups.wtkx");
window.open(display);
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/ScrollPanes.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/ScrollPanes.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/ScrollPanes.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/ScrollPanes.java Tue Jun 15 18:17:15 2010
@@ -16,19 +16,19 @@
*/
package org.apache.pivot.tutorials.navigation;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class ScrollPanes implements Application {
private Window window = null;
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "scroll_panes.wtkx");
window.open(display);
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.navigation;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Button;
@@ -28,7 +29,6 @@ import org.apache.pivot.wtk.Orientation;
import org.apache.pivot.wtk.RadioButton;
import org.apache.pivot.wtk.TabPane;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class TabPanes implements Application {
private Window window = null;
@@ -41,7 +41,7 @@ public class TabPanes implements Applica
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "tab_panes.wtkx");
tabPane = (TabPane)wtkxSerializer.get("tabPane");
collapsibleCheckbox = (Checkbox)wtkxSerializer.get("collapsibleCheckbox");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/ActivityIndicators.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/ActivityIndicators.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/ActivityIndicators.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/ActivityIndicators.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.progress;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.ActivityIndicator;
import org.apache.pivot.wtk.Application;
@@ -25,7 +26,6 @@ import org.apache.pivot.wtk.DesktopAppli
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class ActivityIndicators implements Application {
private Window window = null;
@@ -37,7 +37,7 @@ public class ActivityIndicators implemen
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "activity_indicators.wtkx");
activityIndicator1 = (ActivityIndicator)wtkxSerializer.get("activityIndicator1");
activityIndicator2 = (ActivityIndicator)wtkxSerializer.get("activityIndicator2");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/Meters.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/Meters.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/Meters.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/Meters.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.progress;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.util.concurrent.Task;
import org.apache.pivot.util.concurrent.TaskExecutionException;
@@ -30,7 +31,6 @@ import org.apache.pivot.wtk.Meter;
import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.TaskAdapter;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class Meters implements Application {
public class SampleTask extends Task<Void> {
@@ -72,7 +72,7 @@ public class Meters implements Applicati
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "meters.wtkx");
meter = (Meter)wtkxSerializer.get("meter");
progressButton = (PushButton)wtkxSerializer.get("progressButton");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/scripting/Scripting.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/scripting/Scripting.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/scripting/Scripting.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/scripting/Scripting.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.scripting;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.List;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
@@ -24,7 +25,6 @@ import org.apache.pivot.wtk.ButtonPressL
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class Scripting implements Application {
public static class MyButtonPressListener implements ButtonPressListener {
@@ -42,7 +42,7 @@ public class Scripting implements Applic
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
wtkxSerializer.put("bar", "12345");
window = (Window)wtkxSerializer.readObject(this, "scripting.wtkx");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java Tue Jun 15 18:17:15 2010
@@ -18,12 +18,12 @@ package org.apache.pivot.tutorials.stock
import java.util.Locale;
+import org.apache.pivot.beans.BeanSerializer;
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;
-import org.apache.pivot.wtkx.WTKXSerializer;
/**
* Stock Tracker application.
@@ -41,8 +41,8 @@ public class StockTracker implements App
}
Resources resources = new Resources(StockTrackerWindow.class.getName());
- WTKXSerializer wtkxSerializer = new WTKXSerializer(resources);
- window = (StockTrackerWindow)wtkxSerializer.readObject(this, "stock_tracker_window.wtkx");
+ BeanSerializer wtkxSerializer = new BeanSerializer(resources);
+ window = (StockTrackerWindow)wtkxSerializer.readObject(this, "stock_tracker_window.bxml");
window.open(display);
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTrackerWindow.java Tue Jun 15 18:17:15 2010
@@ -26,7 +26,9 @@ import java.util.Comparator;
import java.util.Date;
import java.util.Locale;
+import org.apache.pivot.beans.BXML;
import org.apache.pivot.beans.BeanAdapter;
+import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.List;
import org.apache.pivot.collections.Sequence;
@@ -57,20 +59,18 @@ import org.apache.pivot.wtk.TextInput;
import org.apache.pivot.wtk.TextInputTextListener;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.content.TableViewRowComparator;
-import org.apache.pivot.wtkx.Bindable;
-import org.apache.pivot.wtkx.WTKX;
/**
* Main Stock Tracker window.
*/
public class StockTrackerWindow extends Window implements Bindable {
- @WTKX private TableView stocksTableView = null;
- @WTKX private TextInput symbolTextInput = null;
- @WTKX private Button addSymbolButton = null;
- @WTKX private Button removeSymbolsButton = null;
- @WTKX private BoxPane detailPane = null;
- @WTKX private Label lastUpdateLabel = null;
- @WTKX private Button yahooFinanceButton = null;
+ @BXML private TableView stocksTableView = null;
+ @BXML private TextInput symbolTextInput = null;
+ @BXML private Button addSymbolButton = null;
+ @BXML private Button removeSymbolsButton = null;
+ @BXML private BoxPane detailPane = null;
+ @BXML private Label lastUpdateLabel = null;
+ @BXML private Button yahooFinanceButton = null;
private ArrayList<String> symbols;
private GetQuery getQuery = null;
Copied: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/detail_pane.bxml (from r954945, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/detail_pane.wtkx)
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/detail_pane.bxml?p2=pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/detail_pane.bxml&p1=pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/detail_pane.wtkx&r1=954945&r2=954994&rev=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/detail_pane.wtkx (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/detail_pane.bxml Tue Jun 15 18:17:15 2010
@@ -17,7 +17,7 @@ limitations under the License.
-->
<BoxPane orientation="vertical" styles="{fill:true}"
- xmlns:wtkx="http://pivot.apache.org/wtkx"
+ xmlns:bxml="http://pivot.apache.org/bxml"
xmlns:stocktracker="org.apache.pivot.tutorials.stocktracker"
xmlns="org.apache.pivot.wtk">
<Label textKey="companyName" styles="{font:{size:12, bold:true}}"/>
@@ -27,28 +27,28 @@ limitations under the License.
<Form styles="{padding:0, fill:true, showFlagIcons:false, showFlagHighlight:false,
leftAlignLabels:true}">
<Form.Section>
- <wtkx:define>
- <stocktracker:ValueMapping wtkx:id="valueMapping"/>
- <stocktracker:ChangeMapping wtkx:id="changeMapping"/>
- <stocktracker:VolumeMapping wtkx:id="volumeMapping"/>
- </wtkx:define>
+ <bxml:define>
+ <stocktracker:ValueMapping bxml:id="valueMapping"/>
+ <stocktracker:ChangeMapping bxml:id="changeMapping"/>
+ <stocktracker:VolumeMapping bxml:id="volumeMapping"/>
+ </bxml:define>
- <Label wtkx:id="valueLabel" Form.label="%value"
+ <Label bxml:id="valueLabel" Form.label="%value"
textKey="value" textBindMapping="$valueMapping"
styles="{horizontalAlignment:'right'}"/>
- <Label wtkx:id="changeLabel" Form.label="%change"
+ <Label bxml:id="changeLabel" Form.label="%change"
textKey="change" textBindMapping="$valueMapping"
styles="{horizontalAlignment:'right'}"/>
- <Label wtkx:id="openingValueLabel" Form.label="%openingValue"
+ <Label bxml:id="openingValueLabel" Form.label="%openingValue"
textKey="openingValue" textBindMapping="$valueMapping"
styles="{horizontalAlignment:'right'}"/>
- <Label wtkx:id="highValueLabel" Form.label="%highValue"
+ <Label bxml:id="highValueLabel" Form.label="%highValue"
textKey="highValue" textBindMapping="$valueMapping"
styles="{horizontalAlignment:'right'}"/>
- <Label wtkx:id="lowValueLabel" Form.label="%lowValue"
+ <Label bxml:id="lowValueLabel" Form.label="%lowValue"
textKey="lowValue" textBindMapping="$changeMapping"
styles="{horizontalAlignment:'right'}"/>
- <Label wtkx:id="volumeLabel" Form.label="%volume"
+ <Label bxml:id="volumeLabel" Form.label="%volume"
textKey="volume" textBindMapping="$volumeMapping"
styles="{horizontalAlignment:'right'}"/>
</Form.Section>
Copied: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/stock_tracker_window.bxml (from r954945, pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/stock_tracker_window.wtkx)
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/stock_tracker_window.bxml?p2=pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/stock_tracker_window.bxml&p1=pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/stock_tracker_window.wtkx&r1=954945&r2=954994&rev=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/stock_tracker_window.wtkx (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/stock_tracker_window.bxml Tue Jun 15 18:17:15 2010
@@ -17,7 +17,7 @@ limitations under the License.
-->
<stocktracker:StockTrackerWindow title="%stockTracker" maximized="true"
- xmlns:wtkx="http://pivot.apache.org/wtkx"
+ xmlns:bxml="http://pivot.apache.org/bxml"
xmlns:content="org.apache.pivot.wtk.content"
xmlns:stocktracker="org.apache.pivot.tutorials.stocktracker"
xmlns="org.apache.pivot.wtk">
@@ -38,7 +38,7 @@ limitations under the License.
<ScrollPane horizontalScrollBarPolicy="fill_to_capacity"
verticalScrollBarPolicy="fill_to_capacity">
<StackPane>
- <TableView wtkx:id="stocksTableView" selectMode="multi"
+ <TableView bxml:id="stocksTableView" selectMode="multi"
styles="{showHorizontalGridLines:false}">
<columns>
<TableView.Column name="symbol"
@@ -68,7 +68,7 @@ limitations under the License.
<right>
<Border styles="{padding:6, color:10}">
- <wtkx:include wtkx:id="detailPane" src="detail_pane.wtkx"/>
+ <bxml:include bxml:id="detailPane" src="detail_pane.bxml"/>
</Border>
</right>
</SplitPane>
@@ -77,13 +77,13 @@ limitations under the License.
<TablePane.Row height="-1">
<BoxPane styles="{horizontalAlignment:'left', verticalAlignment:'center'}">
<Label text="%symbol" styles="{font:{bold:true}}" />
- <TextInput wtkx:id="symbolTextInput" textSize="10"
+ <TextInput bxml:id="symbolTextInput" textSize="10"
maximumLength="8" />
- <LinkButton wtkx:id="addSymbolButton" enabled="false"
+ <LinkButton bxml:id="addSymbolButton" enabled="false"
tooltipText="%addSymbol">
<content:ButtonData icon="@add.png" />
</LinkButton>
- <LinkButton wtkx:id="removeSymbolsButton" enabled="false"
+ <LinkButton bxml:id="removeSymbolsButton" enabled="false"
tooltipText="%removeSymbol">
<content:ButtonData icon="@delete.png" />
</LinkButton>
@@ -100,11 +100,11 @@ limitations under the License.
<TablePane.Row>
<BoxPane>
<Label text="%lastUpdate"/>
- <Label wtkx:id="lastUpdateLabel"/>
+ <Label bxml:id="lastUpdateLabel"/>
</BoxPane>
<BoxPane styles="{horizontalAlignment:'right'}">
<Label text="%dataProvidedBy" />
- <LinkButton wtkx:id="yahooFinanceButton"
+ <LinkButton bxml:id="yahooFinanceButton"
buttonData="%yahooFinance" />
</BoxPane>
</TablePane.Row>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/SuggestionPopups.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/SuggestionPopups.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/SuggestionPopups.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/SuggestionPopups.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.text;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
@@ -25,7 +26,6 @@ import org.apache.pivot.wtk.SuggestionPo
import org.apache.pivot.wtk.TextInput;
import org.apache.pivot.wtk.TextInputCharacterListener;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class SuggestionPopups implements Application {
private Window window = null;
@@ -120,7 +120,7 @@ public class SuggestionPopups implements
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "suggestion_popups.wtkx");
stateTextInput = (TextInput)wtkxSerializer.get("stateTextInput");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/TextInputs.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/TextInputs.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/TextInputs.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/TextInputs.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,7 @@
*/
package org.apache.pivot.tutorials.text;
+import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
@@ -24,7 +25,6 @@ import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.TextInput;
import org.apache.pivot.wtk.TextInputCharacterListener;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKXSerializer;
public class TextInputs implements Application {
private Window window = null;
@@ -128,7 +128,7 @@ public class TextInputs implements Appli
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ BeanSerializer wtkxSerializer = new BeanSerializer();
window = (Window)wtkxSerializer.readObject(this, "text_inputs.wtkx");
stateTextInput = (TextInput)wtkxSerializer.get("stateTextInput");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpenseSheet.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpenseSheet.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpenseSheet.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpenseSheet.java Tue Jun 15 18:17:15 2010
@@ -16,6 +16,8 @@
*/
package org.apache.pivot.tutorials.webqueries;
+import org.apache.pivot.beans.BXML;
+import org.apache.pivot.beans.Bindable;
import org.apache.pivot.util.CalendarDate;
import org.apache.pivot.util.Resources;
import org.apache.pivot.wtk.Button;
@@ -27,19 +29,17 @@ import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.Sheet;
import org.apache.pivot.wtk.Spinner;
import org.apache.pivot.wtk.TextInput;
-import org.apache.pivot.wtkx.Bindable;
-import org.apache.pivot.wtkx.WTKX;
/**
* Sheet that allows a user to add or edit an expense record.
*/
public class ExpenseSheet extends Sheet implements Bindable {
- @WTKX private Spinner dateSpinner = null;
- @WTKX private ListButton typeListButton = null;
- @WTKX private TextInput amountTextInput = null;
+ @BXML private Spinner dateSpinner = null;
+ @BXML private ListButton typeListButton = null;
+ @BXML private TextInput amountTextInput = null;
- @WTKX private PushButton cancelButton = null;
- @WTKX private PushButton okButton = null;
+ @BXML private PushButton cancelButton = null;
+ @BXML private PushButton okButton = null;
private Resources resources = null;
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java?rev=954994&r1=954993&r2=954994&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java Tue Jun 15 18:17:15 2010
@@ -16,12 +16,12 @@
*/
package org.apache.pivot.tutorials.webqueries;
+import org.apache.pivot.beans.BeanSerializer;
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;
-import org.apache.pivot.wtkx.WTKXSerializer;
/**
* Query servlet tutorial client application.
@@ -63,7 +63,7 @@ public class Expenses implements Applica
secure = Boolean.parseBoolean(properties.get(SECURE_KEY));
}
- WTKXSerializer wtkxSerializer = new WTKXSerializer(new Resources(ExpensesWindow.class.getName()));
+ BeanSerializer wtkxSerializer = new BeanSerializer(new Resources(ExpensesWindow.class.getName()));
expensesWindow = (ExpensesWindow)wtkxSerializer.readObject(this, "expenses_window.wtkx");
expensesWindow.open(display);
}