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/07/04 22:09:05 UTC
svn commit: r960387 [2/2] - in /pivot/trunk:
core/src/org/apache/pivot/beans/ core/src/org/apache/pivot/util/
core/test/org/apache/pivot/beans/ core/test/org/apache/pivot/util/test/
demos/src/org/apache/pivot/demos/clock/ demos/src/org/apache/pivot/dem...
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -17,6 +17,7 @@
package org.apache.pivot.tutorials.filebrowsing;
import java.io.File;
+import java.net.URL;
import org.apache.pivot.beans.BXML;
import org.apache.pivot.beans.Bindable;
@@ -41,7 +42,7 @@ public class FileBrowsing extends Window
@BXML private PushButton openSheetButton = null;
@Override
- public void initialize(Dictionary<String, Object> context, Resources resources) {
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
openSheetButton.getButtonPressListeners().add(new ButtonPressListener() {
@Override
public void buttonPressed(Button button) {
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -16,6 +16,8 @@
*/
package org.apache.pivot.tutorials.layout;
+import java.net.URL;
+
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.util.Resources;
@@ -42,17 +44,17 @@ public class BoxPanes extends Window imp
private Checkbox fillCheckbox = null;
@Override
- public void initialize(Dictionary<String, Object> context, Resources resources) {
- boxPane = (BoxPane)context.get("boxPane");
- horizontalOrientationButton = (RadioButton)context.get("horizontalOrientationButton");
- verticalOrientationButton = (RadioButton)context.get("verticalOrientationButton");
- horizontalAlignmentRightButton = (RadioButton)context.get("horizontalAlignmentRightButton");
- horizontalAlignmentLeftButton = (RadioButton)context.get("horizontalAlignmentLeftButton");
- horizontalAlignmentCenterButton = (RadioButton)context.get("horizontalAlignmentCenterButton");
- verticalAlignmentTopButton = (RadioButton)context.get("verticalAlignmentTopButton");
- verticalAlignmentBottomButton = (RadioButton)context.get("verticalAlignmentBottomButton");
- verticalAlignmentCenterButton = (RadioButton)context.get("verticalAlignmentCenterButton");
- fillCheckbox = (Checkbox)context.get("fillCheckbox");
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
+ boxPane = (BoxPane)namespace.get("boxPane");
+ horizontalOrientationButton = (RadioButton)namespace.get("horizontalOrientationButton");
+ verticalOrientationButton = (RadioButton)namespace.get("verticalOrientationButton");
+ horizontalAlignmentRightButton = (RadioButton)namespace.get("horizontalAlignmentRightButton");
+ horizontalAlignmentLeftButton = (RadioButton)namespace.get("horizontalAlignmentLeftButton");
+ horizontalAlignmentCenterButton = (RadioButton)namespace.get("horizontalAlignmentCenterButton");
+ verticalAlignmentTopButton = (RadioButton)namespace.get("verticalAlignmentTopButton");
+ verticalAlignmentBottomButton = (RadioButton)namespace.get("verticalAlignmentBottomButton");
+ verticalAlignmentCenterButton = (RadioButton)namespace.get("verticalAlignmentCenterButton");
+ fillCheckbox = (Checkbox)namespace.get("fillCheckbox");
ButtonStateListener buttonStateListener = new ButtonStateListener() {
@Override
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -16,6 +16,8 @@
*/
package org.apache.pivot.tutorials.layout;
+import java.net.URL;
+
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.util.Resources;
@@ -35,12 +37,12 @@ public class FlowPanes extends Window im
private Checkbox alignToBaselineCheckbox = null;
@Override
- public void initialize(Dictionary<String, Object> context, Resources resources) {
- flowPane = (FlowPane)context.get("flowPane");
- leftRadioButton = (RadioButton)context.get("leftRadioButton");
- rightRadioButton = (RadioButton)context.get("rightRadioButton");
- centerRadioButton = (RadioButton)context.get("centerRadioButton");
- alignToBaselineCheckbox = (Checkbox)context.get("alignToBaselineCheckbox");
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
+ flowPane = (FlowPane)namespace.get("flowPane");
+ leftRadioButton = (RadioButton)namespace.get("leftRadioButton");
+ rightRadioButton = (RadioButton)namespace.get("rightRadioButton");
+ centerRadioButton = (RadioButton)namespace.get("centerRadioButton");
+ alignToBaselineCheckbox = (Checkbox)namespace.get("alignToBaselineCheckbox");
ButtonStateListener buttonStateListener = new ButtonStateListener() {
@Override
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -16,6 +16,8 @@
*/
package org.apache.pivot.tutorials.layout;
+import java.net.URL;
+
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.util.Resources;
@@ -38,12 +40,12 @@ public class Forms extends Window implem
private Label errorLabel = null;
@Override
- public void initialize(Dictionary<String, Object> context, Resources resources) {
- nameBoxPane = (BoxPane)context.get("nameBoxPane");
- lastNameTextInput = (TextInput)context.get("lastNameTextInput");
- firstNameTextInput = (TextInput)context.get("firstNameTextInput");
- submitButton = (PushButton)context.get("submitButton");
- errorLabel = (Label)context.get("errorLabel");
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
+ nameBoxPane = (BoxPane)namespace.get("nameBoxPane");
+ lastNameTextInput = (TextInput)namespace.get("lastNameTextInput");
+ firstNameTextInput = (TextInput)namespace.get("firstNameTextInput");
+ submitButton = (PushButton)namespace.get("submitButton");
+ errorLabel = (Label)namespace.get("errorLabel");
submitButton.getButtonPressListeners().add(new ButtonPressListener() {
@Override
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -16,6 +16,8 @@
*/
package org.apache.pivot.tutorials.layout;
+import java.net.URL;
+
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.util.Resources;
@@ -34,8 +36,8 @@ public class SimpleTablePanes extends Wi
private TablePane tablePane = null;
@Override
- public void initialize(Dictionary<String, Object> context, Resources resources) {
- tablePane = (TablePane)context.get("tablePane");
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
+ tablePane = (TablePane)namespace.get("tablePane");
tablePane.getComponentMouseButtonListeners().add(new ComponentMouseButtonListener.Adapter() {
@Override
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -17,6 +17,7 @@
package org.apache.pivot.tutorials.layout;
import java.io.IOException;
+import java.net.URL;
import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.beans.Bindable;
@@ -99,7 +100,7 @@ public class TablePanes extends Window i
int rowIndex = tablePane.getRowAt(contextMenuHandler.getY());
int columnIndex = tablePane.getColumnAt(contextMenuHandler.getX());
Component component = tablePane.getCellComponent(rowIndex, columnIndex);
- beanSerializer.put("component", component);
+ beanSerializer.getNamespace().put("component", component);
try {
sheet = (Sheet)beanSerializer.readObject(this, "table_panes_configure_cell.bxml");
@@ -122,7 +123,7 @@ public class TablePanes extends Window i
// Make the selected row available to script blocks
int rowIndex = tablePane.getRowAt(contextMenuHandler.getY());
TablePane.Row row = tablePane.getRows().get(rowIndex);
- beanSerializer.put("row", row);
+ beanSerializer.getNamespace().put("row", row);
try {
sheet = (Sheet)beanSerializer.readObject(this, "table_panes_configure_row.bxml");
@@ -156,7 +157,7 @@ public class TablePanes extends Window i
}
// Make the new row available to script blocks
- beanSerializer.put("row", row);
+ beanSerializer.getNamespace().put("row", row);
try {
sheet = (Sheet)beanSerializer.readObject(this, "table_panes_configure_row.bxml");
@@ -202,7 +203,7 @@ public class TablePanes extends Window i
// Make the selected column available to script blocks
int columnIndex = tablePane.getColumnAt(contextMenuHandler.getX());
TablePane.Column column = tablePane.getColumns().get(columnIndex);
- beanSerializer.put("column", column);
+ beanSerializer.getNamespace().put("column", column);
try {
sheet = (Sheet)beanSerializer.readObject(this, "table_panes_configure_column.bxml");
@@ -237,7 +238,7 @@ public class TablePanes extends Window i
}
// Make the new column available to script blocks
- beanSerializer.put("column", column);
+ beanSerializer.getNamespace().put("column", column);
try {
sheet = (Sheet)beanSerializer.readObject(this, "table_panes_configure_column.bxml");
@@ -282,11 +283,11 @@ public class TablePanes extends Window i
}
@Override
- public void initialize(Dictionary<String, Object> context, Resources resources) {
- tablePane = (TablePane)context.get("tablePane");
- cellSection = (Menu.Section)context.get("cellSection");
- rowSection = (Menu.Section)context.get("rowSection");
- columnSection = (Menu.Section)context.get("columnSection");
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
+ tablePane = (TablePane)namespace.get("tablePane");
+ cellSection = (Menu.Section)namespace.get("cellSection");
+ rowSection = (Menu.Section)namespace.get("rowSection");
+ columnSection = (Menu.Section)namespace.get("columnSection");
tablePane.setMenuHandler(contextMenuHandler);
}
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -34,9 +34,9 @@ public class ListButtons extends Window
private ImageView imageView = null;
@Override
- public void initialize(Dictionary<String, Object> context, Resources resources) {
- listButton = (ListButton)context.get("listButton");
- imageView = (ImageView)context.get("imageView");
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
+ listButton = (ListButton)namespace.get("listButton");
+ imageView = (ImageView)namespace.get("imageView");
listButton.getListButtonSelectionListeners().add( new ListButtonSelectionListener() {
@Override
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -16,6 +16,8 @@
*/
package org.apache.pivot.tutorials.lists;
+import java.net.URL;
+
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.Sequence;
@@ -31,9 +33,9 @@ public class ListViews extends Window im
private ListView listView = null;
@Override
- public void initialize(Dictionary<String, Object> context, Resources resources) {
- selectionLabel = (Label)context.get("selectionLabel");
- listView = (ListView)context.get("listView");
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
+ selectionLabel = (Label)namespace.get("selectionLabel");
+ listView = (ListView)namespace.get("listView");
listView.getListViewSelectionListeners().add( new ListViewSelectionListener() {
@Override
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -44,7 +44,7 @@ public class Localization implements App
Font font = theme.getFont();
// Search for a font that can support the sample string
- String sampleResource = resources.getString("firstName");
+ String sampleResource = (String)resources.get("firstName");
if (font.canDisplayUpTo(sampleResource) != -1) {
Font[] fonts = GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts();
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -16,6 +16,8 @@
*/
package org.apache.pivot.tutorials.menus;
+import java.net.URL;
+
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.util.Resources;
@@ -53,7 +55,7 @@ public class ContextMenus extends Window
};
@Override
- public void initialize(Dictionary<String, Object> context, Resources resources) {
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -17,6 +17,7 @@
package org.apache.pivot.tutorials.menus;
import java.io.IOException;
+import java.net.URL;
import org.apache.pivot.beans.BXML;
import org.apache.pivot.beans.BXMLSerializer;
@@ -93,7 +94,7 @@ public class MenuBars extends Frame impl
@Override
public void perform() {
BXMLSerializer beanSerializer = new BXMLSerializer();
- beanSerializer.put("menuHandler", menuHandler);
+ beanSerializer.getNamespace().put("menuHandler", menuHandler);
Component tab;
try {
@@ -143,6 +144,6 @@ public class MenuBars extends Frame impl
}
@Override
- public void initialize(Dictionary<String, Object> context, Resources resources) {
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
}
}
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -18,6 +18,7 @@ package org.apache.pivot.tutorials.menus
import java.awt.Color;
import java.awt.Paint;
+import java.net.URL;
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.Dictionary;
@@ -84,10 +85,10 @@ public class MenuButtons extends Window
}
@Override
- public void initialize(Dictionary<String, Object> context, Resources resources) {
- colorListButton = (ListButton)context.get("colorListButton");
- drawing = (Drawing)context.get("drawing");
- border = (Rectangle)context.get("border");
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
+ colorListButton = (ListButton)namespace.get("colorListButton");
+ drawing = (Drawing)namespace.get("drawing");
+ border = (Rectangle)namespace.get("border");
}
public Color getSelectedColor() {
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -16,6 +16,8 @@
*/
package org.apache.pivot.tutorials.navigation;
+import java.net.URL;
+
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.Sequence;
@@ -77,13 +79,13 @@ public class Accordions extends Window i
};
@Override
- public void initialize(Dictionary<String, Object> context, Resources resources) {
- accordion = (Accordion)context.get("accordion");
- shippingNextButton = (PushButton)context.get("shippingPanel.nextButton");
- paymentNextButton = (PushButton)context.get("paymentPanel.nextButton");
- confirmOrderButton = (PushButton)context.get("summaryPanel.confirmOrderButton");
- activityIndicator = (ActivityIndicator)context.get("summaryPanel.activityIndicator");
- processingOrderLabel = (Label)context.get("summaryPanel.processingOrderLabel");
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
+ accordion = (Accordion)namespace.get("accordion");
+ shippingNextButton = (PushButton)namespace.get("shippingPanel.nextButton");
+ paymentNextButton = (PushButton)namespace.get("paymentPanel.nextButton");
+ confirmOrderButton = (PushButton)namespace.get("summaryPanel.confirmOrderButton");
+ activityIndicator = (ActivityIndicator)namespace.get("summaryPanel.activityIndicator");
+ processingOrderLabel = (Label)namespace.get("summaryPanel.processingOrderLabel");
accordion.getAccordionSelectionListeners().add(accordionSelectionListener);
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -16,6 +16,8 @@
*/
package org.apache.pivot.tutorials.navigation;
+import java.net.URL;
+
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.util.Resources;
@@ -44,19 +46,19 @@ public class CardPanes extends Window im
private RadioButton noneRadioButton = null;
@Override
- public void initialize(Dictionary<String, Object> context, Resources resources) {
- cardPane = (CardPane)context.get("cardPane");
- previousButton = (LinkButton)context.get("previousButton");
- nextButton = (LinkButton)context.get("nextButton");
- sizeToSelectionCheckbox = (Checkbox)context.get("sizeToSelectionCheckbox");
-
- crossfadeRadioButton = (RadioButton)context.get("crossfadeRadioButton");
- horizontalSlideRadioButton = (RadioButton)context.get("horizontalSlideRadioButton");
- verticalSlideRadioButton = (RadioButton)context.get("verticalSlideRadioButton");
- horizontalFlipRadioButton = (RadioButton)context.get("horizontalFlipRadioButton");
- verticalFlipRadioButton = (RadioButton)context.get("verticalFlipRadioButton");
- zoomRadioButton = (RadioButton)context.get("zoomRadioButton");
- noneRadioButton = (RadioButton)context.get("noneRadioButton");
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
+ cardPane = (CardPane)namespace.get("cardPane");
+ previousButton = (LinkButton)namespace.get("previousButton");
+ nextButton = (LinkButton)namespace.get("nextButton");
+ sizeToSelectionCheckbox = (Checkbox)namespace.get("sizeToSelectionCheckbox");
+
+ crossfadeRadioButton = (RadioButton)namespace.get("crossfadeRadioButton");
+ horizontalSlideRadioButton = (RadioButton)namespace.get("horizontalSlideRadioButton");
+ verticalSlideRadioButton = (RadioButton)namespace.get("verticalSlideRadioButton");
+ horizontalFlipRadioButton = (RadioButton)namespace.get("horizontalFlipRadioButton");
+ verticalFlipRadioButton = (RadioButton)namespace.get("verticalFlipRadioButton");
+ zoomRadioButton = (RadioButton)namespace.get("zoomRadioButton");
+ noneRadioButton = (RadioButton)namespace.get("noneRadioButton");
cardPane.getCardPaneListeners().add(new CardPaneListener.Adapter() {
@Override
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -16,6 +16,8 @@
*/
package org.apache.pivot.tutorials.navigation;
+import java.net.URL;
+
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.util.Resources;
@@ -36,12 +38,12 @@ public class TabPanes extends Window imp
private BoxPane cornerBoxPane = null;
@Override
- public void initialize(Dictionary<String, Object> context, Resources resources) {
- tabPane = (TabPane)context.get("tabPane");
- collapsibleCheckbox = (Checkbox)context.get("collapsibleCheckbox");
- horizontalRadioButton = (RadioButton)context.get("horizontalRadioButton");
- verticalRadioButton = (RadioButton)context.get("verticalRadioButton");
- cornerBoxPane = (BoxPane)context.get("cornerBoxPane");
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
+ tabPane = (TabPane)namespace.get("tabPane");
+ collapsibleCheckbox = (Checkbox)namespace.get("collapsibleCheckbox");
+ horizontalRadioButton = (RadioButton)namespace.get("horizontalRadioButton");
+ verticalRadioButton = (RadioButton)namespace.get("verticalRadioButton");
+ cornerBoxPane = (BoxPane)namespace.get("cornerBoxPane");
ButtonStateListener checkboxStateListener = new ButtonStateListener() {
@Override
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -16,6 +16,8 @@
*/
package org.apache.pivot.tutorials.progress;
+import java.net.URL;
+
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.util.Resources;
@@ -32,11 +34,11 @@ public class ActivityIndicators extends
private PushButton activityButton = null;
@Override
- public void initialize(Dictionary<String, Object> context, Resources resources) {
- activityIndicator1 = (ActivityIndicator)context.get("activityIndicator1");
- activityIndicator2 = (ActivityIndicator)context.get("activityIndicator2");
- activityIndicator3 = (ActivityIndicator)context.get("activityIndicator3");
- activityButton = (PushButton)context.get("activityButton");
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
+ activityIndicator1 = (ActivityIndicator)namespace.get("activityIndicator1");
+ activityIndicator2 = (ActivityIndicator)namespace.get("activityIndicator2");
+ activityIndicator3 = (ActivityIndicator)namespace.get("activityIndicator3");
+ activityButton = (PushButton)namespace.get("activityButton");
activityButton.getButtonPressListeners().add(new ButtonPressListener() {
@Override
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -16,6 +16,8 @@
*/
package org.apache.pivot.tutorials.progress;
+import java.net.URL;
+
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.util.Resources;
@@ -67,9 +69,9 @@ public class Meters extends Window imple
private SampleTask sampleTask = null;
@Override
- public void initialize(Dictionary<String, Object> context, Resources resources) {
- meter = (Meter)context.get("meter");
- progressButton = (PushButton)context.get("progressButton");
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
+ meter = (Meter)namespace.get("meter");
+ progressButton = (PushButton)namespace.get("progressButton");
progressButton.getButtonPressListeners().add(new ButtonPressListener() {
@Override
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -43,11 +43,11 @@ public class Scripting implements Applic
public void startup(Display display, Map<String, String> properties)
throws Exception {
BXMLSerializer beanSerializer = new BXMLSerializer();
- beanSerializer.put("bar", "12345");
+ beanSerializer.getNamespace().put("bar", "12345");
window = (Window)beanSerializer.readObject(this, "scripting.bxml");
- foo = (String)beanSerializer.get("foo");
- listData = (List<?>)beanSerializer.get("listData");
+ foo = (String)beanSerializer.getNamespace().get("foo");
+ listData = (List<?>)beanSerializer.getNamespace().get("listData");
System.out.println("foo = " + foo);
System.out.println("listData.getLength() = " + listData.getLength());
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -162,7 +162,7 @@ public class StockTrackerWindow extends
}
@Override
- public void initialize(Dictionary<String, Object> context, Resources resources) {
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
// Add stocks table view event handlers
stocksTableView.getTableViewRowListeners().add(new TableViewRowListener.Adapter() {
@Override
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -16,6 +16,8 @@
*/
package org.apache.pivot.tutorials.text;
+import java.net.URL;
+
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.Dictionary;
@@ -91,8 +93,8 @@ public class SuggestionPopups extends Wi
}
@Override
- public void initialize(Dictionary<String, Object> context, Resources resources) {
- stateTextInput = (TextInput)context.get("stateTextInput");
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
+ stateTextInput = (TextInput)namespace.get("stateTextInput");
stateTextInput.getTextInputTextListeners().add(new TextInputTextListener.Adapter() {
@Override
public void charactersInserted(TextInput textInput, int index, int count) {
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -16,6 +16,8 @@
*/
package org.apache.pivot.tutorials.text;
+import java.net.URL;
+
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.Dictionary;
@@ -89,8 +91,8 @@ public class TextInputs extends Window i
}
@Override
- public void initialize(Dictionary<String, Object> context, Resources resources) {
- stateTextInput = (TextInput)context.get("stateTextInput");
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
+ stateTextInput = (TextInput)namespace.get("stateTextInput");
stateTextInput.getTextInputTextListeners().add(new TextInputTextListener.Adapter() {
@Override
public void charactersInserted(final TextInput textInput, int index, int count) {
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=960387&r1=960386&r2=960387&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 Sun Jul 4 20:09:03 2010
@@ -16,6 +16,8 @@
*/
package org.apache.pivot.tutorials.webqueries;
+import java.net.URL;
+
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.util.CalendarDate;
@@ -44,15 +46,15 @@ public class ExpenseSheet extends Sheet
private Resources resources = null;
@Override
- public void initialize(Dictionary<String, Object> context, Resources resource) {
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resource) {
this.resources = resource;
- dateSpinner = (Spinner)context.get("dateSpinner");
- typeListButton = (ListButton)context.get("typeListButton");
- amountTextInput = (TextInput)context.get("amountTextInput");
+ dateSpinner = (Spinner)namespace.get("dateSpinner");
+ typeListButton = (ListButton)namespace.get("typeListButton");
+ amountTextInput = (TextInput)namespace.get("amountTextInput");
- cancelButton = (PushButton)context.get("cancelButton");
- okButton = (PushButton)context.get("okButton");
+ cancelButton = (PushButton)namespace.get("cancelButton");
+ okButton = (PushButton)namespace.get("okButton");
cancelButton.getButtonPressListeners().add(new ButtonPressListener() {
@Override
@@ -77,7 +79,7 @@ public class ExpenseSheet extends Sheet
// Validate the form contents
if (typeListButton.getSelectedIndex() == -1) {
Form.setFlag(typeListButton, new Form.Flag(MessageType.ERROR,
- resources.getString("typeRequired")));
+ (String)resources.get("typeRequired")));
errorCount++;
} else {
Form.setFlag(typeListButton, (Form.Flag)null);
@@ -85,7 +87,7 @@ public class ExpenseSheet extends Sheet
if (amountTextInput.getTextLength() == 0) {
Form.setFlag(amountTextInput, new Form.Flag(MessageType.ERROR,
- resources.getString("amountRequired")));
+ (String)resources.get("amountRequired")));
errorCount++;
} else {
Form.setFlag(amountTextInput, (Form.Flag)null);
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java?rev=960387&r1=960386&r2=960387&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java Sun Jul 4 20:09:03 2010
@@ -116,10 +116,10 @@ public class ExpensesWindow extends Wind
@Override
@SuppressWarnings("unchecked")
- public void initialize(Dictionary<String, Object> context, Resources resources) {
- expenseTableView = (TableView)context.get("expenseTableView");
- activityIndicator = (ActivityIndicator)context.get("activityIndicator");
- activityIndicatorBoxPane = (BoxPane)context.get("activityIndicatorBoxPane");
+ public void initialize(Dictionary<String, Object> namespace, URL location, Resources resources) {
+ expenseTableView = (TableView)namespace.get("expenseTableView");
+ activityIndicator = (ActivityIndicator)namespace.get("activityIndicator");
+ activityIndicatorBoxPane = (BoxPane)namespace.get("activityIndicatorBoxPane");
// Load the add/edit sheet
try {
@@ -132,9 +132,9 @@ public class ExpensesWindow extends Wind
}
// Create the delete confirmation prompt
- ArrayList<String> options = new ArrayList(resources.getString("cancel"),
- resources.getString("ok"));
- deleteConfirmationPrompt = new Prompt(MessageType.QUESTION, resources.getString("confirmDelete"),
+ ArrayList<String> options = new ArrayList((String)resources.get("cancel"),
+ (String)resources.get("ok"));
+ deleteConfirmationPrompt = new Prompt(MessageType.QUESTION, (String)resources.get("confirmDelete"),
options);
// Attach event listeners
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/WebQueries.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/WebQueries.java?rev=960387&r1=960386&r2=960387&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/WebQueries.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/WebQueries.java Sun Jul 4 20:09:03 2010
@@ -44,8 +44,8 @@ public class WebQueries implements Appli
BXMLSerializer beanSerializer = new BXMLSerializer();
window = (Window)beanSerializer.readObject(this, "web_queries.bxml");
- listView = (ListView)beanSerializer.get("listView");
- loadingLabel = (Label)beanSerializer.get("loadingLabel");
+ listView = (ListView)beanSerializer.getNamespace().get("listView");
+ loadingLabel = (Label)beanSerializer.getNamespace().get("loadingLabel");
// Execute the query:
// http://pipes.yahoo.com/pipes/pipe.run?_id=43115761f2da5af5341ae2e56a93d646&_render=json
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/windows/Windows.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/windows/Windows.java?rev=960387&r1=960386&r2=960387&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/windows/Windows.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/windows/Windows.java Sun Jul 4 20:09:03 2010
@@ -39,7 +39,7 @@ public class Windows implements Applicat
for (int i = 0; i < 3; i++) {
BXMLSerializer beanSerializer = new BXMLSerializer();
- beanSerializer.put("application", this);
+ beanSerializer.getNamespace().put("application", this);
Frame frame;
try {
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java?rev=960387&r1=960386&r2=960387&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java Sun Jul 4 20:09:03 2010
@@ -109,10 +109,10 @@ public class TerraAlertSkin extends Terr
alert.setContent(content);
- typeImageView = (ImageView)beanSerializer.get("typeImageView");
- messageLabel = (Label)beanSerializer.get("messageLabel");
- messageBoxPane = (BoxPane)beanSerializer.get("messageBoxPane");
- optionButtonBoxPane = (BoxPane)beanSerializer.get("optionButtonBoxPane");
+ typeImageView = (ImageView)beanSerializer.getNamespace().get("typeImageView");
+ messageLabel = (Label)beanSerializer.getNamespace().get("messageLabel");
+ messageBoxPane = (BoxPane)beanSerializer.getNamespace().get("messageBoxPane");
+ optionButtonBoxPane = (BoxPane)beanSerializer.getNamespace().get("optionButtonBoxPane");
for (Object option : alert.getOptions()) {
PushButton optionButton = new PushButton(option);
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java?rev=960387&r1=960386&r2=960387&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java Sun Jul 4 20:09:03 2010
@@ -102,10 +102,10 @@ public class TerraPromptSkin extends Ter
prompt.setContent(content);
- typeImageView = (ImageView)beanSerializer.get("typeImageView");
- messageLabel = (Label)beanSerializer.get("messageLabel");
- messageBoxPane = (BoxPane)beanSerializer.get("messageBoxPane");
- optionButtonBoxPane = (BoxPane)beanSerializer.get("optionButtonBoxPane");
+ typeImageView = (ImageView)beanSerializer.getNamespace().get("typeImageView");
+ messageLabel = (Label)beanSerializer.getNamespace().get("messageLabel");
+ messageBoxPane = (BoxPane)beanSerializer.getNamespace().get("messageBoxPane");
+ optionButtonBoxPane = (BoxPane)beanSerializer.getNamespace().get("optionButtonBoxPane");
for (Object option : prompt.getOptions()) {
PushButton optionButton = new PushButton(option);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java?rev=960387&r1=960386&r2=960387&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java Sun Jul 4 20:09:03 2010
@@ -61,7 +61,7 @@ public class ScriptApplication implement
throw new IllegalArgumentException("Cannot find source file \"" + src + "\".");
}
- beanSerializer.put("location", location);
+ beanSerializer.getNamespace().put("location", location);
window = (Window)beanSerializer.readObject(location);
window.open(display);
}
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java?rev=960387&r1=960386&r2=960387&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java Sun Jul 4 20:09:03 2010
@@ -96,7 +96,7 @@ public abstract class Image implements V
// operation
inputStream = new MonitoredInputStream(new BufferedInputStream(location.openStream()));
- if (location.getFile().endsWith("wtkd")) {
+ if (location.getFile().endsWith("bxml")) {
BXMLSerializer serializer = new BXMLSerializer();
image = (Drawing)serializer.readObject(inputStream);
} else {