You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/06/26 20:18:56 UTC
svn commit: r788803 - in /incubator/pivot/trunk: demos/www/
tutorials/src/org/apache/pivot/tutorials/
tutorials/src/org/apache/pivot/tutorials/buttons/
tutorials/src/org/apache/pivot/tutorials/databinding/
tutorials/src/org/apache/pivot/tutorials/drawi...
Author: gbrown
Date: Fri Jun 26 18:18:55 2009
New Revision: 788803
URL: http://svn.apache.org/viewvc?rev=788803&view=rev
Log:
Remove use of @WTKX from unsigned tutorials.
Modified:
incubator/pivot/trunk/demos/www/kitchen_sink.template.html
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/Checkboxes.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/LinkButtons.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/PushButtons.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/RadioButtons.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/drawing/RotateLine.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/FlowPanes.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Forms.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListButtons.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Accordions.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Expanders.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/ActivityIndicators.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/Meters.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/Text.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/transition/Transitions.java
Modified: incubator/pivot/trunk/demos/www/kitchen_sink.template.html
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/kitchen_sink.template.html?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/kitchen_sink.template.html (original)
+++ incubator/pivot/trunk/demos/www/kitchen_sink.template.html Fri Jun 26 18:18:55 2009
@@ -26,8 +26,8 @@
<script>
var attributes = {code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet",
archive:"lib/@project_name@-core-@version@.jar,lib/@project_name@-wtk-@version@.jar,lib/@project_name@-wtk-@version@.terra.jar,lib/@project_name@-tutorials-@version@.jar",
- width:1024,
- height:768
+ width:720,
+ height:480
};
var parameters = {application_class_name:"org.apache.pivot.tutorials.KitchenSink",
codebase_lookup:false
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java Fri Jun 26 18:18:55 2009
@@ -317,7 +317,6 @@
helpAboutMenuItem = (Menu.Item)wtkxSerializer.get("menuBar.helpAboutMenuItem");
rollup.setContent(component);
- wtkxSerializer.bind(this, MenusRollupStateHandler.class);
try {
menuPopup = (MenuPopup)wtkxSerializer.readObject(this, "menu_popup.wtkx");
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/Checkboxes.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/Checkboxes.java?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/Checkboxes.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/Checkboxes.java Fri Jun 26 18:18:55 2009
@@ -25,23 +25,26 @@
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.ImageView;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
public class Checkboxes implements Application {
private Window window = null;
-
- @WTKX private Checkbox bellCheckbox;
- @WTKX private Checkbox clockCheckbox;
- @WTKX private Checkbox houseCheckbox;
- @WTKX private ImageView bellImageView;
- @WTKX private ImageView clockImageView;
- @WTKX private ImageView houseImageView;
+ private Checkbox bellCheckbox = null;
+ private Checkbox clockCheckbox = null;
+ private Checkbox houseCheckbox = null;
+ private ImageView bellImageView = null;
+ private ImageView clockImageView = null;
+ private ImageView houseImageView = null;
public void startup(Display display, Map<String, String> properties) throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "checkboxes.wtkx");
- wtkxSerializer.bind(this, Checkboxes.class);
+ bellCheckbox = (Checkbox)wtkxSerializer.get("bellCheckbox");
+ clockCheckbox = (Checkbox)wtkxSerializer.get("clockCheckbox");
+ houseCheckbox = (Checkbox)wtkxSerializer.get("houseCheckbox");
+ bellImageView = (ImageView)wtkxSerializer.get("bellImageView");
+ clockImageView = (ImageView)wtkxSerializer.get("clockImageView");
+ houseImageView = (ImageView)wtkxSerializer.get("houseImageView");
// Wire up event listeners
bellCheckbox.getButtonPressListeners().add(new ButtonPressListener() {
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/LinkButtons.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/LinkButtons.java?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/LinkButtons.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/LinkButtons.java Fri Jun 26 18:18:55 2009
@@ -25,20 +25,20 @@
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.LinkButton;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
public class LinkButtons implements Application {
private Window window = null;
-
- @WTKX private CardPane cardPane;
- @WTKX private LinkButton nextButton;
- @WTKX private LinkButton previousButton;
+ private CardPane cardPane = null;
+ private LinkButton nextButton = null;
+ private LinkButton previousButton = null;
public void startup(Display display, Map<String, String> properties) throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "link_buttons.wtkx");
- wtkxSerializer.bind(this, LinkButtons.class);
+ cardPane = (CardPane)wtkxSerializer.get("cardPane");
+ nextButton = (LinkButton)wtkxSerializer.get("nextButton");
+ previousButton = (LinkButton)wtkxSerializer.get("previousButton");
nextButton.getButtonPressListeners().add(new ButtonPressListener() {
public void buttonPressed(Button button) {
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/PushButtons.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/PushButtons.java?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/PushButtons.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/PushButtons.java Fri Jun 26 18:18:55 2009
@@ -26,18 +26,16 @@
import org.apache.pivot.wtk.MessageType;
import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
public class PushButtons implements Application {
private Window window = null;
-
- @WTKX private PushButton pushButton;
+ private PushButton pushButton = null;
public void startup(Display display, Map<String, String> properties) throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "push_buttons.wtkx");
- wtkxSerializer.bind(this, PushButtons.class);
+ pushButton = (PushButton)wtkxSerializer.get("pushButton");
// Add a button press listener
pushButton.getButtonPressListeners().add(new ButtonPressListener() {
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/RadioButtons.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/RadioButtons.java?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/RadioButtons.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/RadioButtons.java Fri Jun 26 18:18:55 2009
@@ -25,25 +25,21 @@
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.MessageType;
import org.apache.pivot.wtk.PushButton;
-import org.apache.pivot.wtk.RadioButton;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
public class RadioButtons implements Application {
private Window window = null;
-
- @WTKX private RadioButton oneButton;
- @WTKX private PushButton selectButton;
+ private PushButton selectButton = null;
public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "radio_buttons.wtkx");
- wtkxSerializer.bind(this, RadioButtons.class);
+ selectButton = (PushButton)wtkxSerializer.get("selectButton");
// Get a reference to the button group
- final Button.Group numbersGroup = oneButton.getGroup();
+ final Button.Group numbersGroup = Button.getGroup("numbers");
// Add a button press listener
selectButton.getButtonPressListeners().add(new ButtonPressListener() {
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java Fri Jun 26 18:18:55 2009
@@ -29,17 +29,15 @@
import org.apache.pivot.wtk.Label;
import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
public class DataBinding implements Application {
private Window window = null;
-
- @WTKX private Form form;
- @WTKX private PushButton loadJavaButton;
- @WTKX private PushButton loadJSONButton;
- @WTKX private PushButton clearButton;
- @WTKX private Label sourceLabel;
+ private Form form = null;
+ private PushButton loadJavaButton = null;
+ private PushButton loadJSONButton = null;
+ private PushButton clearButton = null;
+ private Label sourceLabel = null;
private static final Contact CONTACT = new Contact("101", "Joe Smith",
new Address("123 Main St.", "Cambridge", "MA", "02142"),
@@ -50,7 +48,11 @@
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "data_binding.wtkx");
- wtkxSerializer.bind(this, DataBinding.class);
+ form = (Form)wtkxSerializer.get("form");
+ loadJavaButton = (PushButton)wtkxSerializer.get("loadJavaButton");
+ loadJSONButton = (PushButton)wtkxSerializer.get("loadJSONButton");
+ clearButton = (PushButton)wtkxSerializer.get("clearButton");
+ sourceLabel = (Label)wtkxSerializer.get("sourceLabel");
loadJavaButton.getButtonPressListeners().add(new ButtonPressListener() {
public void buttonPressed(Button button) {
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/drawing/RotateLine.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/drawing/RotateLine.java?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/drawing/RotateLine.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/drawing/RotateLine.java Fri Jun 26 18:18:55 2009
@@ -25,13 +25,11 @@
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.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
public class RotateLine implements Application {
private Drawing drawing = null;
-
- @WTKX private Shape.Rotate rotation;
+ private Shape.Rotate rotation = null;
private Window window = null;
@@ -39,7 +37,7 @@
throws Exception{
WTKXSerializer wtkxSerializer = new WTKXSerializer();
drawing = (Drawing)wtkxSerializer.readObject(this, "rotate_line.wtkd");
- wtkxSerializer.bind(this, RotateLine.class);
+ rotation = (Shape.Rotate)wtkxSerializer.get("rotation");
ApplicationContext.scheduleRecurringCallback(new Runnable() {
public void run() {
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/FlowPanes.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/FlowPanes.java?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/FlowPanes.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/FlowPanes.java Fri Jun 26 18:18:55 2009
@@ -28,28 +28,36 @@
import org.apache.pivot.wtk.RadioButton;
import org.apache.pivot.wtk.VerticalAlignment;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
public class FlowPanes implements Application {
private Window window = null;
-
- @WTKX private FlowPane flowPane;
- @WTKX private RadioButton horizontalOrientationButton;
- @WTKX private RadioButton verticalOrientationButton;
- @WTKX private RadioButton horizontalAlignmentRightButton;
- @WTKX private RadioButton horizontalAlignmentLeftButton;
- @WTKX private RadioButton horizontalAlignmentCenterButton;
- @WTKX private RadioButton horizontalAlignmentJustifyButton;
- @WTKX private RadioButton verticalAlignmentTopButton;
- @WTKX private RadioButton verticalAlignmentBottomButton;
- @WTKX private RadioButton verticalAlignmentCenterButton;
- @WTKX private RadioButton verticalAlignmentJustifyButton;
+ private FlowPane flowPane = null;
+ private RadioButton horizontalOrientationButton = null;
+ private RadioButton verticalOrientationButton = null;
+ private RadioButton horizontalAlignmentRightButton = null;
+ private RadioButton horizontalAlignmentLeftButton = null;
+ private RadioButton horizontalAlignmentCenterButton = null;
+ private RadioButton horizontalAlignmentJustifyButton = null;
+ private RadioButton verticalAlignmentTopButton = null;
+ private RadioButton verticalAlignmentBottomButton = null;
+ private RadioButton verticalAlignmentCenterButton = null;
+ private RadioButton verticalAlignmentJustifyButton = null;
public void startup(Display display, Map<String, String> properties) throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "flow_panes.wtkx");
- wtkxSerializer.bind(this, FlowPanes.class);
+ flowPane = (FlowPane)wtkxSerializer.get("flowPane");
+ horizontalOrientationButton = (RadioButton)wtkxSerializer.get("horizontalOrientationButton");
+ verticalOrientationButton = (RadioButton)wtkxSerializer.get("verticalOrientationButton");
+ horizontalAlignmentRightButton = (RadioButton)wtkxSerializer.get("horizontalAlignmentRightButton");
+ horizontalAlignmentLeftButton = (RadioButton)wtkxSerializer.get("horizontalAlignmentLeftButton");
+ horizontalAlignmentCenterButton = (RadioButton)wtkxSerializer.get("horizontalAlignmentCenterButton");
+ horizontalAlignmentJustifyButton = (RadioButton)wtkxSerializer.get("horizontalAlignmentJustifyButton");
+ verticalAlignmentTopButton = (RadioButton)wtkxSerializer.get("verticalAlignmentTopButton");
+ verticalAlignmentBottomButton = (RadioButton)wtkxSerializer.get("verticalAlignmentBottomButton");
+ verticalAlignmentCenterButton = (RadioButton)wtkxSerializer.get("verticalAlignmentCenterButton");
+ verticalAlignmentJustifyButton = (RadioButton)wtkxSerializer.get("verticalAlignmentJustifyButton");
ButtonStateListener radioButtonStateListener = new ButtonStateListener() {
public void stateChanged(Button button, Button.State previousState) {
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Forms.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Forms.java?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Forms.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Forms.java Fri Jun 26 18:18:55 2009
@@ -30,22 +30,24 @@
import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.TextInput;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
public class Forms implements Application {
private Window window = null;
-
- @WTKX private FlowPane nameFlowPane;
- @WTKX private TextInput lastNameTextInput;
- @WTKX private TextInput firstNameTextInput;
- @WTKX private PushButton submitButton;
- @WTKX private Label errorLabel;
+ private FlowPane nameFlowPane = null;
+ private TextInput lastNameTextInput = null;
+ private TextInput firstNameTextInput = null;
+ private PushButton submitButton = null;
+ private Label errorLabel = null;
public void startup(Display display, Map<String, String> properties) throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "forms.wtkx");
- wtkxSerializer.bind(this, Forms.class);
+ nameFlowPane = (FlowPane)wtkxSerializer.get("nameFlowPane");
+ lastNameTextInput = (TextInput)wtkxSerializer.get("lastNameTextInput");
+ firstNameTextInput = (TextInput)wtkxSerializer.get("firstNameTextInput");
+ submitButton = (PushButton)wtkxSerializer.get("submitButton");
+ errorLabel = (Label)wtkxSerializer.get("errorLabel");
submitButton.getButtonPressListeners().add(new ButtonPressListener() {
public void buttonPressed(Button button) {
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListButtons.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListButtons.java?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListButtons.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListButtons.java Fri Jun 26 18:18:55 2009
@@ -29,14 +29,12 @@
import org.apache.pivot.wtk.ListButtonSelectionListener;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.media.Image;
-import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
public class ListButtons implements Application {
private Window window = null;
-
- @WTKX private ListButton listButton;
- @WTKX private ImageView imageView;
+ private ListButton listButton = null;
+ private ImageView imageView = null;
private ListButtonSelectionListener listButtonSelectionListener =
new ListButtonSelectionListener() {
@@ -73,7 +71,8 @@
public void startup(Display display, Map<String, String> properties) throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "list_buttons.wtkx");
- wtkxSerializer.bind(this, ListButtons.class);
+ listButton = (ListButton)wtkxSerializer.get("listButton");
+ imageView = (ImageView)wtkxSerializer.get("imageView");
listButton.getListButtonSelectionListeners().add(listButtonSelectionListener);
listButton.setSelectedIndex(0);
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java Fri Jun 26 18:18:55 2009
@@ -26,14 +26,12 @@
import org.apache.pivot.wtk.ListViewSelectionListener;
import org.apache.pivot.wtk.Span;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
public class ListViews implements Application {
private Window window = null;
-
- @WTKX private Label selectionLabel;
- @WTKX private ListView listView;
+ private Label selectionLabel = null;
+ private ListView listView = null;
private ListViewSelectionListener listViewSelectionListener =
new ListViewSelectionListener() {
@@ -76,7 +74,8 @@
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "list_views.wtkx");
- wtkxSerializer.bind(this, ListViews.class);
+ selectionLabel = (Label)wtkxSerializer.get("selectionLabel");
+ listView = (ListView)wtkxSerializer.get("listView");
listView.getListViewSelectionListeners().add(listViewSelectionListener);
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Accordions.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Accordions.java?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Accordions.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Accordions.java Fri Jun 26 18:18:55 2009
@@ -31,18 +31,16 @@
import org.apache.pivot.wtk.Label;
import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
public class Accordions implements Application {
private Window window = null;
-
- @WTKX private Accordion accordion;
- @WTKX(id="shippingPanel.nextButton") private PushButton shippingNextButton;
- @WTKX(id="paymentPanel.nextButton") private PushButton paymentNextButton;
- @WTKX(id="summaryPanel.confirmOrderButton") private PushButton confirmOrderButton;
- @WTKX(id="summaryPanel.activityIndicator") private ActivityIndicator activityIndicator;
- @WTKX(id="summaryPanel.processingOrderLabel") private Label processingOrderLabel;
+ private Accordion accordion = null;
+ private PushButton shippingNextButton = null;
+ private PushButton paymentNextButton = null;
+ private PushButton confirmOrderButton = null;
+ private ActivityIndicator activityIndicator = null;
+ private Label processingOrderLabel = null;
private AccordionSelectionListener accordionSelectionListener = new AccordionSelectionListener() {
private int selectedIndex = -1;
@@ -82,7 +80,7 @@
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "accordions.wtkx");
- wtkxSerializer.bind(this, Accordions.class);
+ accordion = (Accordion)wtkxSerializer.get("accordion");
accordion.getAccordionSelectionListeners().add(accordionSelectionListener);
@@ -92,9 +90,13 @@
}
};
+ shippingNextButton = (PushButton)wtkxSerializer.get("shippingPanel.nextButton");
shippingNextButton.getButtonPressListeners().add(nextButtonPressListener);
+
+ paymentNextButton = (PushButton)wtkxSerializer.get("paymentPanel.nextButton");
paymentNextButton.getButtonPressListeners().add(nextButtonPressListener);
+ confirmOrderButton = (PushButton)wtkxSerializer.get("summaryPanel.confirmOrderButton");
confirmOrderButton.getButtonPressListeners().add(new ButtonPressListener() {
public void buttonPressed(Button button) {
// Pretend to submit or cancel the order
@@ -104,6 +106,9 @@
}
});
+ activityIndicator = (ActivityIndicator)wtkxSerializer.get("summaryPanel.activityIndicator");
+ processingOrderLabel = (Label)wtkxSerializer.get("summaryPanel.processingOrderLabel");
+
updateAccordion();
updateConfirmOrderButton();
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java Fri Jun 26 18:18:55 2009
@@ -30,26 +30,31 @@
import org.apache.pivot.wtk.RadioButton;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.skin.CardPaneSkin;
-import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
public class CardPanes implements Application {
private Window window = null;
-
- @WTKX private CardPane cardPane;
- @WTKX private LinkButton previousButton;
- @WTKX private LinkButton nextButton;
- @WTKX private Checkbox sizeToSelectionCheckbox;
- @WTKX private RadioButton crossfadeRadioButton;
- @WTKX private RadioButton horizontalSlideRadioButton;
- @WTKX private RadioButton verticalSlideRadioButton;
- @WTKX private RadioButton noneRadioButton;
+ private CardPane cardPane = null;
+ private LinkButton previousButton = null;
+ private LinkButton nextButton = null;
+ private Checkbox sizeToSelectionCheckbox = null;
+ private RadioButton crossfadeRadioButton = null;
+ private RadioButton horizontalSlideRadioButton = null;
+ private RadioButton verticalSlideRadioButton = null;
+ private RadioButton noneRadioButton = null;
public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "card_panes.wtkx");
- wtkxSerializer.bind(this, CardPanes.class);
+ cardPane = (CardPane)wtkxSerializer.get("cardPane");
+ previousButton = (LinkButton)wtkxSerializer.get("previousButton");
+ nextButton = (LinkButton)wtkxSerializer.get("nextButton");
+ sizeToSelectionCheckbox = (Checkbox)wtkxSerializer.get("sizeToSelectionCheckbox");
+ crossfadeRadioButton = (RadioButton)wtkxSerializer.get("crossfadeRadioButton");
+ horizontalSlideRadioButton = (RadioButton)wtkxSerializer.get("horizontalSlideRadioButton");
+ verticalSlideRadioButton = (RadioButton)wtkxSerializer.get("verticalSlideRadioButton");
+ noneRadioButton = (RadioButton)wtkxSerializer.get("noneRadioButton");
cardPane.getCardPaneListeners().add(new CardPaneListener.Adapter() {
public void selectedIndexChanged(CardPane cardPane, int previousSelectedIndex) {
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Expanders.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Expanders.java?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Expanders.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Expanders.java Fri Jun 26 18:18:55 2009
@@ -23,21 +23,21 @@
import org.apache.pivot.wtk.Expander;
import org.apache.pivot.wtk.ExpanderListener;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
public class Expanders implements Application {
private Window window = null;
-
- @WTKX private Expander stocksExpander;
- @WTKX private Expander weatherExpander;
- @WTKX private Expander calendarExpander;
+ private Expander stocksExpander = null;
+ private Expander weatherExpander = null;
+ private Expander calendarExpander = null;
public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "expanders.wtkx");
- wtkxSerializer.bind(this, Expanders.class);
+ stocksExpander = (Expander)wtkxSerializer.get("stocksExpander");
+ weatherExpander = (Expander)wtkxSerializer.get("weatherExpander");
+ calendarExpander = (Expander)wtkxSerializer.get("calendarExpander");
ExpanderListener expanderListener = new ExpanderListener.Adapter() {
public void expandedChanged(Expander expander) {
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java Fri Jun 26 18:18:55 2009
@@ -28,23 +28,25 @@
import org.apache.pivot.wtk.RadioButton;
import org.apache.pivot.wtk.TabPane;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
public class TabPanes implements Application {
private Window window = null;
-
- @WTKX private TabPane tabPane;
- @WTKX private Checkbox collapsibleCheckbox;
- @WTKX private RadioButton horizontalRadioButton;
- @WTKX private RadioButton verticalRadioButton;
- @WTKX private FlowPane cornerFlowPane;
+ private TabPane tabPane = null;
+ private Checkbox collapsibleCheckbox = null;
+ private RadioButton horizontalRadioButton = null;
+ private RadioButton verticalRadioButton = null;
+ private FlowPane cornerFlowPane = null;
public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "tab_panes.wtkx");
- wtkxSerializer.bind(this, TabPanes.class);
+ tabPane = (TabPane)wtkxSerializer.get("tabPane");
+ collapsibleCheckbox = (Checkbox)wtkxSerializer.get("collapsibleCheckbox");
+ horizontalRadioButton = (RadioButton)wtkxSerializer.get("horizontalRadioButton");
+ verticalRadioButton = (RadioButton)wtkxSerializer.get("verticalRadioButton");
+ cornerFlowPane = (FlowPane)wtkxSerializer.get("cornerFlowPane");
ButtonStateListener checkboxStateListener = new ButtonStateListener() {
public void stateChanged(Button button, Button.State previousState) {
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/ActivityIndicators.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/ActivityIndicators.java?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/ActivityIndicators.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/ActivityIndicators.java Fri Jun 26 18:18:55 2009
@@ -25,22 +25,23 @@
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
public class ActivityIndicators implements Application {
private Window window = null;
-
- @WTKX private ActivityIndicator activityIndicator1;
- @WTKX private ActivityIndicator activityIndicator2;
- @WTKX private ActivityIndicator activityIndicator3;
- @WTKX private PushButton activityButton;
+ private ActivityIndicator activityIndicator1 = null;
+ private ActivityIndicator activityIndicator2 = null;
+ private ActivityIndicator activityIndicator3 = null;
+ private PushButton activityButton = null;
public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "activity_indicators.wtkx");
- wtkxSerializer.bind(this, ActivityIndicators.class);
+ activityIndicator1 = (ActivityIndicator)wtkxSerializer.get("activityIndicator1");
+ activityIndicator2 = (ActivityIndicator)wtkxSerializer.get("activityIndicator2");
+ activityIndicator3 = (ActivityIndicator)wtkxSerializer.get("activityIndicator3");
+ activityButton = (PushButton)wtkxSerializer.get("activityButton");
activityButton.getButtonPressListeners().add(new ButtonPressListener() {
public void buttonPressed(Button button) {
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/Meters.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/Meters.java?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/Meters.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/Meters.java Fri Jun 26 18:18:55 2009
@@ -30,7 +30,6 @@
import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.TaskAdapter;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
public class Meters implements Application {
@@ -63,8 +62,8 @@
}
private Window window = null;
- @WTKX private Meter meter;
- @WTKX private PushButton progressButton;
+ private Meter meter = null;
+ private PushButton progressButton = null;
private SampleTask sampleTask = null;
@@ -72,7 +71,8 @@
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "meters.wtkx");
- wtkxSerializer.bind(this, Meters.class);
+ meter = (Meter)wtkxSerializer.get("meter");
+ progressButton = (PushButton)wtkxSerializer.get("progressButton");
progressButton.getButtonPressListeners().add(new ButtonPressListener() {
public void buttonPressed(Button button) {
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/Text.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/Text.java?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/Text.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/Text.java Fri Jun 26 18:18:55 2009
@@ -24,13 +24,11 @@
import org.apache.pivot.wtk.TextInput;
import org.apache.pivot.wtk.TextInputCharacterListener;
import org.apache.pivot.wtk.Window;
-import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
public class Text implements Application {
private Window window = null;
-
- @WTKX private TextInput stateTextInput;
+ private TextInput stateTextInput = null;
private ArrayList<String> states;
@@ -126,11 +124,12 @@
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "text.wtkx");
- wtkxSerializer.bind(this, Text.class);
+ stateTextInput = (TextInput)wtkxSerializer.get("stateTextInput");
stateTextInput.getTextInputCharacterListeners().add(textInputCharacterListener);
window.open(display);
+ stateTextInput.requestFocus();
}
public boolean shutdown(boolean optional) {
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/transition/Transitions.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/transition/Transitions.java?rev=788803&r1=788802&r2=788803&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/transition/Transitions.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/transition/Transitions.java Fri Jun 26 18:18:55 2009
@@ -23,30 +23,32 @@
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
+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.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
public class Transitions implements Application {
private Window window = null;
-
- @WTKX private Button button1;
- @WTKX private Button button2;
- @WTKX private Button button3;
- @WTKX private Button button4;
+ private PushButton button1 = null;
+ private PushButton button2 = null;
+ private PushButton button3 = null;
+ private PushButton button4 = null;
private CollapseTransition collapseTransition = null;
- public static int TRANSITION_DURATION = 2000;
+ public static int TRANSITION_DURATION = 250;
public static int TRANSITION_RATE = 30;
public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "transitions.wtkx");
- wtkxSerializer.bind(this, Transitions.class);
+ button1 = (PushButton)wtkxSerializer.get("button1");
+ button2 = (PushButton)wtkxSerializer.get("button2");
+ button3 = (PushButton)wtkxSerializer.get("button3");
+ button4 = (PushButton)wtkxSerializer.get("button4");
ButtonPressListener buttonPressListener = new ButtonPressListener() {
public void buttonPressed(final Button button) {