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:14:06 UTC
svn commit: r960388 [1/2] - in /pivot/trunk: ./
demos/src/org/apache/pivot/demos/clock/
demos/src/org/apache/pivot/demos/decorator/
demos/src/org/apache/pivot/demos/itunes/
demos/src/org/apache/pivot/demos/json/
demos/src/org/apache/pivot/demos/million...
Author: gbrown
Date: Sun Jul 4 20:14:04 2010
New Revision: 960388
URL: http://svn.apache.org/viewvc?rev=960388&view=rev
Log:
Update Java files to use bxmlSerializer variable name instead of beanSerializer; delete bxml_upgrade.xml script (we're preserving WTKXSerializer compatibility for now, so the need for this file is not as urgent).
Removed:
pivot/trunk/bxml_upgrade.xml
Modified:
pivot/trunk/demos/src/org/apache/pivot/demos/clock/Clock.java
pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java
pivot/trunk/demos/src/org/apache/pivot/demos/itunes/SearchDemo.java
pivot/trunk/demos/src/org/apache/pivot/demos/json/JSONViewer.java
pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java
pivot/trunk/demos/src/org/apache/pivot/demos/richtexteditor/RichTextEditorDemo.java
pivot/trunk/demos/src/org/apache/pivot/demos/richtexteditor/richtexteditor.bxml
pivot/trunk/demos/src/org/apache/pivot/demos/swing/SwingDemo.java
pivot/trunk/demos/src/org/apache/pivot/demos/xml/XMLViewer.java
pivot/trunk/tests/src/org/apache/pivot/tests/AccordionTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/ActionMappingTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/ApplicationHandlerTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/BXMLDictionaryTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/BaselineTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/BorderTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/CalendarTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/CardPaneTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/ColorListButtonTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/ContextMenuTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/DataBindingTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/DrawingTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/ExpanderTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/FormTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/GridPaneTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/ListViewTest2.java
pivot/trunk/tests/src/org/apache/pivot/tests/MenuBarTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/PanoramaTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/ResolveTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/SliderTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/SpinnerFocusTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/SplitPaneTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/SuggestionPopupTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/TablePaneTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/TableViewTest2.java
pivot/trunk/tests/src/org/apache/pivot/tests/TextInputValidatorTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/WatermarkDecoratorTest.java
pivot/trunk/tests/src/org/apache/pivot/tests/text/TextAreaTest.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloBXML.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloJavaScript.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorer.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/TablePanes.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/localization/Localization.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/menus/MenuBars.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/scripting/Scripting.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/ExpensesWindow.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/WebQueries.java
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/windows/Windows.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraAlertSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraPromptSkin.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkinParagraphView.java
pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/TextAreaSkinTextNodeView.java
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/clock/Clock.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/clock/Clock.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/clock/Clock.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/clock/Clock.java Sun Jul 4 20:14:04 2010
@@ -31,13 +31,13 @@ import org.apache.pivot.wtk.media.drawin
*/
public class Clock extends Movie {
private Calendar calendar = Calendar.getInstance();
- private BXMLSerializer beanSerializer;
+ private BXMLSerializer bxmlSerializer;
private Image image = null;
public Clock() {
- beanSerializer = new BXMLSerializer();
+ bxmlSerializer = new BXMLSerializer();
try {
- image = (Image)beanSerializer.readObject(getClass().getResource("clock.bxml"));
+ image = (Image)bxmlSerializer.readObject(getClass().getResource("clock.bxml"));
} catch (Exception ex) {
throw new RuntimeException(ex);
}
@@ -65,9 +65,9 @@ public class Clock extends Movie {
@Override
public void setCurrentFrame(int currentFrame) {
- Shape.Rotate secondsRotation = (Shape.Rotate)beanSerializer.getNamespace().get("secondsRotation");
- Shape.Rotate minutesRotation = (Shape.Rotate)beanSerializer.getNamespace().get("minutesRotation");
- Shape.Rotate hoursRotation = (Shape.Rotate)beanSerializer.getNamespace().get("hoursRotation");
+ Shape.Rotate secondsRotation = (Shape.Rotate)bxmlSerializer.getNamespace().get("secondsRotation");
+ Shape.Rotate minutesRotation = (Shape.Rotate)bxmlSerializer.getNamespace().get("minutesRotation");
+ Shape.Rotate hoursRotation = (Shape.Rotate)bxmlSerializer.getNamespace().get("hoursRotation");
calendar.setTimeInMillis(System.currentTimeMillis());
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java Sun Jul 4 20:14:04 2010
@@ -33,9 +33,9 @@ public class DecoratorDemo implements Ap
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- reflectionWindow = (Window)beanSerializer.readObject(this, "reflection_window.bxml");
- translucentFrame = (Frame)beanSerializer.readObject(this, "translucent_frame.bxml");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ reflectionWindow = (Window)bxmlSerializer.readObject(this, "reflection_window.bxml");
+ translucentFrame = (Frame)bxmlSerializer.readObject(this, "translucent_frame.bxml");
final FadeDecorator fadeDecorator = new FadeDecorator();
translucentFrame.getDecorators().insert(fadeDecorator, 0);
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/itunes/SearchDemo.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/itunes/SearchDemo.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/itunes/SearchDemo.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/itunes/SearchDemo.java Sun Jul 4 20:14:04 2010
@@ -72,11 +72,11 @@ public class SearchDemo implements Appli
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- beanSerializer.getNamespace().put(APPLICATION_KEY, this);
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ bxmlSerializer.getNamespace().put(APPLICATION_KEY, this);
- window = (Window)beanSerializer.readObject(this, "search_demo.bxml");
- beanSerializer.bind(this, SearchDemo.class);
+ window = (Window)bxmlSerializer.readObject(this, "search_demo.bxml");
+ bxmlSerializer.bind(this, SearchDemo.class);
searchButton.setButtonData(searchImage);
window.open(display);
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/json/JSONViewer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/json/JSONViewer.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/json/JSONViewer.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/json/JSONViewer.java Sun Jul 4 20:14:04 2010
@@ -62,11 +62,11 @@ public class JSONViewer implements Appli
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- beanSerializer.getNamespace().put(APPLICATION_KEY, this);
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ bxmlSerializer.getNamespace().put(APPLICATION_KEY, this);
- window = (Window)beanSerializer.readObject(this, "json_viewer.bxml");
- beanSerializer.bind(this);
+ window = (Window)bxmlSerializer.readObject(this, "json_viewer.bxml");
+ bxmlSerializer.bind(this);
Label prompt = new Label("Drag or paste JSON here");
prompt.getStyles().put("horizontalAlignment", HorizontalAlignment.CENTER);
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java Sun Jul 4 20:14:04 2010
@@ -167,13 +167,13 @@ public class LargeData implements Applic
throw new IllegalArgumentException(BASE_PATH_KEY + " is required.");
}
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = (Window)beanSerializer.readObject(this, "large_data.bxml");
- fileListButton = (ListButton)beanSerializer.getNamespace().get("fileListButton");
- loadDataButton = (PushButton)beanSerializer.getNamespace().get("loadDataButton");
- cancelButton = (PushButton)beanSerializer.getNamespace().get("cancelButton");
- statusLabel = (Label)beanSerializer.getNamespace().get("statusLabel");
- tableView = (TableView)beanSerializer.getNamespace().get("tableView");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = (Window)bxmlSerializer.readObject(this, "large_data.bxml");
+ fileListButton = (ListButton)bxmlSerializer.getNamespace().get("fileListButton");
+ loadDataButton = (PushButton)bxmlSerializer.getNamespace().get("loadDataButton");
+ cancelButton = (PushButton)bxmlSerializer.getNamespace().get("cancelButton");
+ statusLabel = (Label)bxmlSerializer.getNamespace().get("statusLabel");
+ tableView = (TableView)bxmlSerializer.getNamespace().get("tableView");
loadDataButton.getButtonPressListeners().add(new ButtonPressListener() {
@Override
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/richtexteditor/RichTextEditorDemo.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/richtexteditor/RichTextEditorDemo.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/richtexteditor/RichTextEditorDemo.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/richtexteditor/RichTextEditorDemo.java Sun Jul 4 20:14:04 2010
@@ -83,9 +83,9 @@ public class RichTextEditorDemo implemen
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = (Window)beanSerializer.readObject(this, "richtexteditor.bxml");
- beanSerializer.bind(this, RichTextEditorDemo.class);
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = (Window)bxmlSerializer.readObject(this, "richtexteditor.bxml");
+ bxmlSerializer.bind(this, RichTextEditorDemo.class);
window.setTitle("Apache Pivot Rich Text Editor Demo");
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/richtexteditor/richtexteditor.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/richtexteditor/richtexteditor.bxml?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/richtexteditor/richtexteditor.bxml (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/richtexteditor/richtexteditor.bxml Sun Jul 4 20:14:04 2010
@@ -25,7 +25,7 @@ limitations under the License.
<TablePane.Column width="1*"/>
</columns>
<TablePane.Row height="-1">
- <FlowPane styles="{padding:1, horizontalSpacing:10, alignToBaseline:true}">
+ <FlowPane styles="{padding:1, horizontalSpacing:10, alignToBaseline:true}">
<PushButton bxml:id="openFileButton" buttonData="Open File"/>
<PushButton bxml:id="saveFileButton" buttonData="Save File"/>
<Label text=" "/> <!-- spacer -->
@@ -33,7 +33,7 @@ limitations under the License.
<PushButton bxml:id="italicButton" buttonData="Italic"/>
<ListButton bxml:id="fontFamilyListButton"/>
<ListButton bxml:id="fontSizeListButton"/>
- <Checkbox bxml:id="wrapTextCheckbox" buttonData="Wrap Text" selected="false"/>
+ <Checkbox bxml:id="wrapTextCheckbox" buttonData="Wrap Text" selected="false"/>
</FlowPane>
</TablePane.Row>
<TablePane.Row height="-1">
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/swing/SwingDemo.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/swing/SwingDemo.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/swing/SwingDemo.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/swing/SwingDemo.java Sun Jul 4 20:14:04 2010
@@ -121,10 +121,10 @@ public class SwingDemo extends Applicati
displays.add(displayHost.getDisplay());
// Load the Pivot window
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
Window window;
try {
- window = (Window)beanSerializer.readObject(SwingDemo.class.getResource("pivot_window.bxml"));
+ window = (Window)bxmlSerializer.readObject(SwingDemo.class.getResource("pivot_window.bxml"));
} catch (IOException exception) {
throw new RuntimeException(exception);
} catch (SerializationException exception) {
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/xml/XMLViewer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/xml/XMLViewer.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/xml/XMLViewer.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/xml/XMLViewer.java Sun Jul 4 20:14:04 2010
@@ -70,11 +70,11 @@ public class XMLViewer implements Applic
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- beanSerializer.getNamespace().put(APPLICATION_KEY, this);
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ bxmlSerializer.getNamespace().put(APPLICATION_KEY, this);
- window = (Window)beanSerializer.readObject(this, "xml_viewer.bxml");
- beanSerializer.bind(this);
+ window = (Window)bxmlSerializer.readObject(this, "xml_viewer.bxml");
+ bxmlSerializer.bind(this);
Label prompt = new Label("Drag or paste XML here");
prompt.getStyles().put("horizontalAlignment", HorizontalAlignment.CENTER);
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/AccordionTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/AccordionTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/AccordionTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/AccordionTest.java Sun Jul 4 20:14:04 2010
@@ -30,8 +30,8 @@ public class AccordionTest implements Ap
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- frame = (Frame)beanSerializer.readObject(this, "accordion_test.bxml");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ frame = (Frame)bxmlSerializer.readObject(this, "accordion_test.bxml");
frame.open(display);
}
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/ActionMappingTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/ActionMappingTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/ActionMappingTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/ActionMappingTest.java Sun Jul 4 20:14:04 2010
@@ -46,8 +46,8 @@ public class ActionMappingTest implement
}
});
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = (Window)beanSerializer.readObject(this, "action_mapping_test.bxml");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = (Window)bxmlSerializer.readObject(this, "action_mapping_test.bxml");
window.getActionMappings().add(new Window.ActionMapping(new Keyboard.KeyStroke(Keyboard.KeyCode.B,
Keyboard.Modifier.SHIFT.getMask()), "action2"));
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/ApplicationHandlerTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/ApplicationHandlerTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/ApplicationHandlerTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/ApplicationHandlerTest.java Sun Jul 4 20:14:04 2010
@@ -30,8 +30,8 @@ public class ApplicationHandlerTest impl
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = (Window)beanSerializer.readObject(this, "application_handler_test.bxml");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = (Window)bxmlSerializer.readObject(this, "application_handler_test.bxml");
window.open(display);
}
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/BXMLDictionaryTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/BXMLDictionaryTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/BXMLDictionaryTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/BXMLDictionaryTest.java Sun Jul 4 20:14:04 2010
@@ -23,9 +23,9 @@ import org.apache.pivot.json.JSONSeriali
public class BXMLDictionaryTest {
@SuppressWarnings("unchecked")
public static void main(String[] args) throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
HashMap<String, Object> hashMap =
- (HashMap<String, Object>)beanSerializer.readObject(BXMLDictionaryTest.class.getResource("bxml_dictionary_test.bxml"));
+ (HashMap<String, Object>)bxmlSerializer.readObject(BXMLDictionaryTest.class.getResource("bxml_dictionary_test.bxml"));
System.out.println(JSONSerializer.toString(hashMap));
}
}
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/BaselineTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/BaselineTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/BaselineTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/BaselineTest.java Sun Jul 4 20:14:04 2010
@@ -29,8 +29,8 @@ public class BaselineTest implements App
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = new Window((Component)beanSerializer.readObject(getClass().getResource("baseline_test.bxml")));
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = new Window((Component)bxmlSerializer.readObject(getClass().getResource("baseline_test.bxml")));
window.setTitle("Baseline Test");
window.setMaximized(true);
window.open(display);
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/BorderTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/BorderTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/BorderTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/BorderTest.java Sun Jul 4 20:14:04 2010
@@ -31,8 +31,8 @@ public class BorderTest implements Appli
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- frame = new Frame((Component)beanSerializer.readObject(getClass().getResource("border_test.bxml")));
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ frame = new Frame((Component)bxmlSerializer.readObject(getClass().getResource("border_test.bxml")));
frame.setTitle("Border Test");
frame.setPreferredSize(480, 360);
frame.open(display);
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/CalendarTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/CalendarTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/CalendarTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/CalendarTest.java Sun Jul 4 20:14:04 2010
@@ -40,10 +40,10 @@ public class CalendarTest implements App
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
- window = (Window)beanSerializer.readObject(this, "calendar_test.bxml");
- beanSerializer.bind(this, CalendarTest.class);
+ window = (Window)bxmlSerializer.readObject(this, "calendar_test.bxml");
+ bxmlSerializer.bind(this, CalendarTest.class);
Filter<CalendarDate> todayFilter = new Filter<CalendarDate>() {
@Override
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/CardPaneTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/CardPaneTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/CardPaneTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/CardPaneTest.java Sun Jul 4 20:14:04 2010
@@ -48,10 +48,10 @@ public class CardPaneTest implements App
frame.setPreferredSize(800, 600);
frame.setLocation(20, 20);
- BXMLSerializer beanSerializer = new BXMLSerializer();
- sheet = (Sheet)beanSerializer.readObject(this, "card_pane_test.bxml");
- cardPane = (CardPane)beanSerializer.getNamespace().get("cardPane");
- sizeGroup = (ButtonGroup)beanSerializer.getNamespace().get("sizeGroup");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ sheet = (Sheet)bxmlSerializer.readObject(this, "card_pane_test.bxml");
+ cardPane = (CardPane)bxmlSerializer.getNamespace().get("cardPane");
+ sizeGroup = (ButtonGroup)bxmlSerializer.getNamespace().get("sizeGroup");
sizeGroup.getButtonGroupListeners().add(new ButtonGroupListener.Adapter() {
@Override
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/ColorListButtonTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/ColorListButtonTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/ColorListButtonTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/ColorListButtonTest.java Sun Jul 4 20:14:04 2010
@@ -33,9 +33,9 @@ public class ColorListButtonTest impleme
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- BoxPane boxPane = (BoxPane) beanSerializer.readObject(this, "color_list_button_test.bxml");
- listButton = (ListButton)beanSerializer.getNamespace().get("listButton");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ BoxPane boxPane = (BoxPane) bxmlSerializer.readObject(this, "color_list_button_test.bxml");
+ listButton = (ListButton)bxmlSerializer.getNamespace().get("listButton");
// test the getListPopup() method
listButton.getListPopup().getDecorators().add(new ReflectionDecorator());
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/ContextMenuTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/ContextMenuTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/ContextMenuTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/ContextMenuTest.java Sun Jul 4 20:14:04 2010
@@ -36,9 +36,9 @@ public class ContextMenuTest implements
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = (Window)beanSerializer.readObject(this, "context_menu_test.bxml");
- beanSerializer.bind(this, ContextMenuTest.class);
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = (Window)bxmlSerializer.readObject(this, "context_menu_test.bxml");
+ bxmlSerializer.bind(this, ContextMenuTest.class);
window.setMenuHandler(new MenuHandler.Adapter() {
@Override
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/DataBindingTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/DataBindingTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/DataBindingTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/DataBindingTest.java Sun Jul 4 20:14:04 2010
@@ -115,8 +115,8 @@ public class DataBindingTest implements
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = (Window)beanSerializer.readObject(this, "data_binding_test.bxml");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = (Window)bxmlSerializer.readObject(this, "data_binding_test.bxml");
window.open(display);
HashMap<String, Object> context = new HashMap<String, Object>();
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/DrawingTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/DrawingTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/DrawingTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/DrawingTest.java Sun Jul 4 20:14:04 2010
@@ -48,9 +48,9 @@ public class DrawingTest implements Appl
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = (Window)beanSerializer.readObject(this, "drawing_test.bxml");
- imageView = (ImageView)beanSerializer.getNamespace().get("imageView");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = (Window)bxmlSerializer.readObject(this, "drawing_test.bxml");
+ imageView = (ImageView)bxmlSerializer.getNamespace().get("imageView");
imageView.getComponentMouseButtonListeners().add(imageViewMouseButtonListener);
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/ExpanderTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/ExpanderTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/ExpanderTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/ExpanderTest.java Sun Jul 4 20:14:04 2010
@@ -30,8 +30,8 @@ public class ExpanderTest implements App
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = (Window)beanSerializer.readObject(this, "expander_test.bxml");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = (Window)bxmlSerializer.readObject(this, "expander_test.bxml");
window.open(display);
}
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/FormTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/FormTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/FormTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/FormTest.java Sun Jul 4 20:14:04 2010
@@ -30,8 +30,8 @@ public class FormTest implements Applica
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- frame = new Frame((Component)beanSerializer.readObject(getClass().getResource("form_test.bxml")));
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ frame = new Frame((Component)bxmlSerializer.readObject(getClass().getResource("form_test.bxml")));
frame.setTitle("Form Test");
frame.setPreferredSize(480, 360);
frame.open(display);
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/GridPaneTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/GridPaneTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/GridPaneTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/GridPaneTest.java Sun Jul 4 20:14:04 2010
@@ -29,8 +29,8 @@ public class GridPaneTest implements App
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = (Window)beanSerializer.readObject(this, "gridpane_test.bxml");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = (Window)bxmlSerializer.readObject(this, "gridpane_test.bxml");
window.open(display);
}
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/ListViewTest2.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/ListViewTest2.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/ListViewTest2.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/ListViewTest2.java Sun Jul 4 20:14:04 2010
@@ -30,8 +30,8 @@ public class ListViewTest2 implements Ap
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = new Window((Component)beanSerializer.readObject(getClass().getResource("listview_test2.bxml")));
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = new Window((Component)bxmlSerializer.readObject(getClass().getResource("listview_test2.bxml")));
window.setTitle("ListView Test2");
window.setMaximized(true);
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/MenuBarTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/MenuBarTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/MenuBarTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/MenuBarTest.java Sun Jul 4 20:14:04 2010
@@ -49,9 +49,9 @@ public class MenuBarTest implements Appl
frame1.setPreferredSize(320, 240);
frame1.open(display);
- BXMLSerializer beanSerializer = new BXMLSerializer();
- frame2 = (Frame)beanSerializer.readObject(this, "menu_bar_test.bxml");
- beanSerializer.bind(this, MenuBarTest.class);
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ frame2 = (Frame)bxmlSerializer.readObject(this, "menu_bar_test.bxml");
+ bxmlSerializer.bind(this, MenuBarTest.class);
MenuHandler menuHandler = new MenuHandler.Adapter() {
@Override
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/PanoramaTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/PanoramaTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/PanoramaTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/PanoramaTest.java Sun Jul 4 20:14:04 2010
@@ -45,8 +45,8 @@ public class PanoramaTest implements App
panorama.setView(imageView);
frame1.open(display);
- BXMLSerializer beanSerializer = new BXMLSerializer();
- frame2 = new Frame((Component)beanSerializer.readObject(getClass().getResource("panorama_test.bxml")));
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ frame2 = new Frame((Component)bxmlSerializer.readObject(getClass().getResource("panorama_test.bxml")));
frame2.setTitle("Panorama Test 2");
frame2.setPreferredSize(480, 360);
frame2.open(display);
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/ResolveTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/ResolveTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/ResolveTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/ResolveTest.java Sun Jul 4 20:14:04 2010
@@ -30,8 +30,8 @@ public class ResolveTest implements Appl
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
Resources resources = new Resources(getClass().getName());
- BXMLSerializer beanSerializer = new BXMLSerializer(resources);
- window = (Window)beanSerializer.readObject(this, "resolve_test.bxml");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer(resources);
+ window = (Window)bxmlSerializer.readObject(this, "resolve_test.bxml");
window.open(display);
}
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/SliderTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/SliderTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/SliderTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/SliderTest.java Sun Jul 4 20:14:04 2010
@@ -37,16 +37,16 @@ public class SliderTest implements Appli
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = new Window((Component)beanSerializer.readObject(getClass().getResource("slider_test.bxml")));
- slider1 = (Slider)beanSerializer.getNamespace().get("slider1");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = new Window((Component)bxmlSerializer.readObject(getClass().getResource("slider_test.bxml")));
+ slider1 = (Slider)bxmlSerializer.getNamespace().get("slider1");
slider1.getSliderValueListeners().add(new SliderValueListener() {
@Override
public void valueChanged(Slider slider, int previousValue) {
valueLabel1.setText(Integer.toString(slider.getValue()));
}
});
- slider2 = (Slider)beanSerializer.getNamespace().get("slider2");
+ slider2 = (Slider)bxmlSerializer.getNamespace().get("slider2");
slider2.getSliderValueListeners().add(new SliderValueListener() {
@Override
public void valueChanged(Slider slider, int previousValue) {
@@ -54,8 +54,8 @@ public class SliderTest implements Appli
}
});
- valueLabel1 = (Label)beanSerializer.getNamespace().get("valueLabel1");
- valueLabel2 = (Label)beanSerializer.getNamespace().get("valueLabel2");
+ valueLabel1 = (Label)bxmlSerializer.getNamespace().get("valueLabel1");
+ valueLabel2 = (Label)bxmlSerializer.getNamespace().get("valueLabel2");
window.setTitle("Slider Test");
window.setMaximized(true);
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/SpinnerFocusTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/SpinnerFocusTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/SpinnerFocusTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/SpinnerFocusTest.java Sun Jul 4 20:14:04 2010
@@ -47,12 +47,12 @@ public class SpinnerFocusTest implements
Action.getNamedActions().put("buttonAction", action);
- BXMLSerializer beanSerializer = new BXMLSerializer();
- frame = new Frame((Component)beanSerializer.readObject(getClass().getResource("spinner_focus_test.bxml")));
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ frame = new Frame((Component)bxmlSerializer.readObject(getClass().getResource("spinner_focus_test.bxml")));
frame.setTitle("Spinner Focus Test");
frame.open(display);
- Spinner spinner = (Spinner)beanSerializer.getNamespace().get("spinner");
+ Spinner spinner = (Spinner)bxmlSerializer.getNamespace().get("spinner");
spinner.requestFocus();
action.setEnabled(false);
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/SplitPaneTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/SplitPaneTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/SplitPaneTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/SplitPaneTest.java Sun Jul 4 20:14:04 2010
@@ -29,8 +29,8 @@ public class SplitPaneTest implements Ap
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = new Window((Component)beanSerializer.readObject(getClass().getResource("splitpane_test.bxml")));
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = new Window((Component)bxmlSerializer.readObject(getClass().getResource("splitpane_test.bxml")));
window.setTitle("SplitPane Test");
window.setMaximized(true);
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/SuggestionPopupTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/SuggestionPopupTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/SuggestionPopupTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/SuggestionPopupTest.java Sun Jul 4 20:14:04 2010
@@ -40,9 +40,9 @@ public class SuggestionPopupTest impleme
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = (Window)beanSerializer.readObject(this, "suggestion_popup_test.bxml");
- beanSerializer.bind(this);
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = (Window)bxmlSerializer.readObject(this, "suggestion_popup_test.bxml");
+ bxmlSerializer.bind(this);
textInput.getTextInputTextListeners().add(new TextInputTextListener.Adapter() {
@Override
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/TablePaneTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/TablePaneTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/TablePaneTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/TablePaneTest.java Sun Jul 4 20:14:04 2010
@@ -29,8 +29,8 @@ public class TablePaneTest implements Ap
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = (Window)beanSerializer.readObject(this, "table_pane_test.bxml");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = (Window)bxmlSerializer.readObject(this, "table_pane_test.bxml");
window.open(display);
}
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/TableViewTest2.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/TableViewTest2.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/TableViewTest2.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/TableViewTest2.java Sun Jul 4 20:14:04 2010
@@ -34,9 +34,9 @@ public class TableViewTest2 implements A
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = (Window)beanSerializer.readObject(this, "table_view_test2.bxml");
- tableView = (TableView)beanSerializer.getNamespace().get("tableView");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = (Window)bxmlSerializer.readObject(this, "table_view_test2.bxml");
+ tableView = (TableView)bxmlSerializer.getNamespace().get("tableView");
TableViewRowEditor tableViewRowEditor = new TableViewRowEditor();
tableViewRowEditor.setEditEffect(CardPaneSkin.SelectionChangeEffect.HORIZONTAL_SLIDE);
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/TextInputValidatorTest.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/TextInputValidatorTest.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/TextInputValidatorTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/TextInputValidatorTest.java Sun Jul 4 20:14:04 2010
@@ -41,13 +41,13 @@ public class TextInputValidatorTest impl
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = new Window((Component)beanSerializer.readObject(
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = new Window((Component)bxmlSerializer.readObject(
getClass().getResource("textInputValidator_test.bxml")));
- textinputFloatRange = (TextInput)beanSerializer.getNamespace().get("textinputFloatRange");
- textinputIntRange = (TextInput)beanSerializer.getNamespace().get("textinputIntRange");
- textinputDateRegex = (TextInput)beanSerializer.getNamespace().get("textinputDateRegex");
- textinputCustomBoolean = (TextInput)beanSerializer.getNamespace().get("textinputCustomBoolean");
+ textinputFloatRange = (TextInput)bxmlSerializer.getNamespace().get("textinputFloatRange");
+ textinputIntRange = (TextInput)bxmlSerializer.getNamespace().get("textinputIntRange");
+ textinputDateRegex = (TextInput)bxmlSerializer.getNamespace().get("textinputDateRegex");
+ textinputCustomBoolean = (TextInput)bxmlSerializer.getNamespace().get("textinputCustomBoolean");
// standard float range model
textinputFloatRange.setText("0.5");
@@ -61,7 +61,7 @@ public class TextInputValidatorTest impl
}
});
- invalidLabel = (Label)beanSerializer.getNamespace().get("invalidLabel");
+ invalidLabel = (Label)bxmlSerializer.getNamespace().get("invalidLabel");
// standard int range model
textinputIntRange.setText("0");
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=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/WatermarkDecoratorTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/WatermarkDecoratorTest.java Sun Jul 4 20:14:04 2010
@@ -28,8 +28,8 @@ public class WatermarkDecoratorTest impl
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = (Window)beanSerializer.readObject(this, "watermark_decorator_test.bxml");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = (Window)bxmlSerializer.readObject(this, "watermark_decorator_test.bxml");
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=960388&r1=960387&r2=960388&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 Sun Jul 4 20:14:04 2010
@@ -68,14 +68,14 @@ public class TextAreaTest implements App
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- frame = new Frame((Component)beanSerializer.readObject(getClass().getResource("text_area_test.bxml")));
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ frame = new Frame((Component)bxmlSerializer.readObject(getClass().getResource("text_area_test.bxml")));
frame.setTitle("TextArea Test");
frame.setPreferredSize(640, 480);
frame.setLocation(80, 40);
frame.open(display);
- textArea = (TextArea)beanSerializer.getNamespace().get("textArea");
+ textArea = (TextArea)bxmlSerializer.getNamespace().get("textArea");
textArea.getTextAreaSelectionListeners().add(new TextAreaSelectionListener() {
@Override
public void selectionChanged(TextArea textArea,
@@ -96,10 +96,10 @@ public class TextAreaTest implements App
}
});
- selectionStartLabel = (Label)beanSerializer.getNamespace().get("selectionStartLabel");
- selectionLengthLabel = (Label)beanSerializer.getNamespace().get("selectionLengthLabel");
+ selectionStartLabel = (Label)bxmlSerializer.getNamespace().get("selectionStartLabel");
+ selectionLengthLabel = (Label)bxmlSerializer.getNamespace().get("selectionLengthLabel");
- treeView = (TreeView)beanSerializer.getNamespace().get("treeView");
+ treeView = (TreeView)bxmlSerializer.getNamespace().get("treeView");
treeView.getTreeViewSelectionListeners().add(new TreeViewSelectionListener() {
@Override
public void selectedPathAdded(TreeView treeView, Path path) {
@@ -135,8 +135,8 @@ public class TextAreaTest implements App
}
});
- offsetLabel = (Label)beanSerializer.getNamespace().get("offsetLabel");
- charactersLabel = (Label)beanSerializer.getNamespace().get("charactersLabel");
+ offsetLabel = (Label)bxmlSerializer.getNamespace().get("offsetLabel");
+ charactersLabel = (Label)bxmlSerializer.getNamespace().get("charactersLabel");
documentAdapter = new DocumentAdapter(textArea.getDocument());
treeView.setTreeData(documentAdapter);
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloBXML.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloBXML.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloBXML.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloBXML.java Sun Jul 4 20:14:04 2010
@@ -29,8 +29,8 @@ public class HelloBXML implements Applic
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = (Window)beanSerializer.readObject(this, "hello.bxml");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = (Window)bxmlSerializer.readObject(this, "hello.bxml");
window.open(display);
}
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=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloJavaScript.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloJavaScript.java Sun Jul 4 20:14:04 2010
@@ -29,8 +29,8 @@ public class HelloJavaScript implements
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = (Window)beanSerializer.readObject(this, "hello_javascript.bxml");
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = (Window)bxmlSerializer.readObject(this, "hello_javascript.bxml");
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=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java Sun Jul 4 20:14:04 2010
@@ -101,9 +101,9 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
try {
- component = (Component)beanSerializer.readObject(this, "buttons.bxml");
+ component = (Component)bxmlSerializer.readObject(this, "buttons.bxml");
} catch(IOException exception) {
throw new RuntimeException(exception);
} catch(SerializationException exception) {
@@ -128,19 +128,19 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
try {
- component = (Component)beanSerializer.readObject(this, "lists.bxml");
+ component = (Component)bxmlSerializer.readObject(this, "lists.bxml");
} catch(IOException exception) {
throw new RuntimeException(exception);
} catch(SerializationException exception) {
throw new RuntimeException(exception);
}
- editableListView = (ListView)beanSerializer.getNamespace().get("editableListView");
- iconListView = (ListView)beanSerializer.getNamespace().get("iconListView");
- checkedListView = (ListView)beanSerializer.getNamespace().get("checkedListView");
- iconListButton = (ListButton)beanSerializer.getNamespace().get("iconListButton");
+ editableListView = (ListView)bxmlSerializer.getNamespace().get("editableListView");
+ iconListView = (ListView)bxmlSerializer.getNamespace().get("iconListView");
+ checkedListView = (ListView)bxmlSerializer.getNamespace().get("checkedListView");
+ iconListButton = (ListButton)bxmlSerializer.getNamespace().get("iconListButton");
rollup.setContent(component);
@@ -180,9 +180,9 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
try {
- component = (Component)beanSerializer.readObject(this, "text.bxml");
+ component = (Component)bxmlSerializer.readObject(this, "text.bxml");
} catch(IOException exception) {
throw new RuntimeException(exception);
} catch(SerializationException exception) {
@@ -202,9 +202,9 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
try {
- component = (Component)beanSerializer.readObject(this, "calendars.bxml");
+ component = (Component)bxmlSerializer.readObject(this, "calendars.bxml");
} catch(IOException exception) {
throw new RuntimeException(exception);
} catch(SerializationException exception) {
@@ -224,9 +224,9 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
try {
- component = (Component)beanSerializer.readObject(this, "color_choosers.bxml");
+ component = (Component)bxmlSerializer.readObject(this, "color_choosers.bxml");
} catch(IOException exception) {
throw new RuntimeException(exception);
} catch(SerializationException exception) {
@@ -246,9 +246,9 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
try {
- component = (Component)beanSerializer.readObject(this, "navigation.bxml");
+ component = (Component)bxmlSerializer.readObject(this, "navigation.bxml");
} catch(IOException exception) {
throw new RuntimeException(exception);
} catch(SerializationException exception) {
@@ -268,9 +268,9 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
try {
- component = (Component)beanSerializer.readObject(this, "splitters.bxml");
+ component = (Component)bxmlSerializer.readObject(this, "splitters.bxml");
} catch(IOException exception) {
throw new RuntimeException(exception);
} catch(SerializationException exception) {
@@ -327,23 +327,23 @@ public class KitchenSink implements Appl
}
});
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
try {
- component = (Component)beanSerializer.readObject(this, "menus.bxml");
+ component = (Component)bxmlSerializer.readObject(this, "menus.bxml");
} catch(IOException exception) {
throw new RuntimeException(exception);
} catch(SerializationException exception) {
throw new RuntimeException(exception);
}
- menuImageView = (ImageView)beanSerializer.getNamespace().get("menuImageView");
- helpAboutMenuItem = (Menu.Item)beanSerializer.getNamespace().get("menuBar.helpAboutMenuItem");
+ menuImageView = (ImageView)bxmlSerializer.getNamespace().get("menuImageView");
+ helpAboutMenuItem = (Menu.Item)bxmlSerializer.getNamespace().get("menuBar.helpAboutMenuItem");
rollup.setContent(component);
try {
- menuSection = (Menu.Section)beanSerializer.readObject(this, "menu_section.bxml");
- imageMenuGroup = (ButtonGroup)beanSerializer.getNamespace().get("imageMenuGroup");
+ menuSection = (Menu.Section)bxmlSerializer.readObject(this, "menu_section.bxml");
+ imageMenuGroup = (ButtonGroup)bxmlSerializer.getNamespace().get("imageMenuGroup");
} catch(IOException exception) {
throw new RuntimeException(exception);
} catch(SerializationException exception) {
@@ -379,18 +379,18 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
try {
- component = (Component)beanSerializer.readObject(this, "meters.bxml");
+ component = (Component)bxmlSerializer.readObject(this, "meters.bxml");
} catch(IOException exception) {
throw new RuntimeException(exception);
} catch(SerializationException exception) {
throw new RuntimeException(exception);
}
- activityIndicator1 = (ActivityIndicator)beanSerializer.getNamespace().get("activityIndicator1");
- activityIndicator2 = (ActivityIndicator)beanSerializer.getNamespace().get("activityIndicator2");
- activityIndicator3 = (ActivityIndicator)beanSerializer.getNamespace().get("activityIndicator3");
+ activityIndicator1 = (ActivityIndicator)bxmlSerializer.getNamespace().get("activityIndicator1");
+ activityIndicator2 = (ActivityIndicator)bxmlSerializer.getNamespace().get("activityIndicator2");
+ activityIndicator3 = (ActivityIndicator)bxmlSerializer.getNamespace().get("activityIndicator3");
rollup.setContent(component);
@@ -432,22 +432,22 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
try {
- component = (Component)beanSerializer.readObject(this, "spinners.bxml");
+ component = (Component)bxmlSerializer.readObject(this, "spinners.bxml");
} catch(IOException exception) {
throw new RuntimeException(exception);
} catch(SerializationException exception) {
throw new RuntimeException(exception);
}
- numericSpinner = (Spinner)beanSerializer.getNamespace().get("numericSpinner");
- dateSpinner = (Spinner)beanSerializer.getNamespace().get("dateSpinner");
+ numericSpinner = (Spinner)bxmlSerializer.getNamespace().get("numericSpinner");
+ dateSpinner = (Spinner)bxmlSerializer.getNamespace().get("dateSpinner");
- redSlider = (Slider)beanSerializer.getNamespace().get("redSlider");
- greenSlider = (Slider)beanSerializer.getNamespace().get("greenSlider");
- blueSlider = (Slider)beanSerializer.getNamespace().get("blueSlider");
- colorBorder = (Border)beanSerializer.getNamespace().get("colorBorder");
+ redSlider = (Slider)bxmlSerializer.getNamespace().get("redSlider");
+ greenSlider = (Slider)bxmlSerializer.getNamespace().get("greenSlider");
+ blueSlider = (Slider)bxmlSerializer.getNamespace().get("blueSlider");
+ colorBorder = (Border)bxmlSerializer.getNamespace().get("colorBorder");
rollup.setContent(component);
@@ -500,17 +500,17 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
try {
- component = (Component)beanSerializer.readObject(this, "tables.bxml");
+ component = (Component)bxmlSerializer.readObject(this, "tables.bxml");
} catch(IOException exception) {
throw new RuntimeException(exception);
} catch(SerializationException exception) {
throw new RuntimeException(exception);
}
- sortableTableView = (TableView)beanSerializer.getNamespace().get("sortableTableView");
- customTableView = (TableView)beanSerializer.getNamespace().get("customTableView");
+ sortableTableView = (TableView)bxmlSerializer.getNamespace().get("sortableTableView");
+ customTableView = (TableView)bxmlSerializer.getNamespace().get("customTableView");
rollup.setContent(component);
@@ -603,17 +603,17 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
try {
- component = (Component)beanSerializer.readObject(this, "trees.bxml");
+ component = (Component)bxmlSerializer.readObject(this, "trees.bxml");
} catch(IOException exception) {
throw new RuntimeException(exception);
} catch(SerializationException exception) {
throw new RuntimeException(exception);
}
- editableTreeView = (TreeView)beanSerializer.getNamespace().get("editableTreeView");
- checkTreeView = (TreeView)beanSerializer.getNamespace().get("checkTreeView");
+ editableTreeView = (TreeView)bxmlSerializer.getNamespace().get("editableTreeView");
+ checkTreeView = (TreeView)bxmlSerializer.getNamespace().get("checkTreeView");
rollup.setContent(component);
@@ -659,18 +659,18 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
try {
- component = (Component)beanSerializer.readObject(this, "dragdrop.bxml");
+ component = (Component)bxmlSerializer.readObject(this, "dragdrop.bxml");
} catch(IOException exception) {
throw new RuntimeException(exception);
} catch(SerializationException exception) {
throw new RuntimeException(exception);
}
- imageView1 = (ImageView)beanSerializer.getNamespace().get("imageView1");
- imageView2 = (ImageView)beanSerializer.getNamespace().get("imageView2");
- imageView3 = (ImageView)beanSerializer.getNamespace().get("imageView3");
+ imageView1 = (ImageView)bxmlSerializer.getNamespace().get("imageView1");
+ imageView2 = (ImageView)bxmlSerializer.getNamespace().get("imageView2");
+ imageView3 = (ImageView)bxmlSerializer.getNamespace().get("imageView3");
rollup.setContent(component);
@@ -816,18 +816,18 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
try {
- component = (Component)beanSerializer.readObject(this, "alerts.bxml");
+ component = (Component)bxmlSerializer.readObject(this, "alerts.bxml");
} catch(IOException exception) {
throw new RuntimeException(exception);
} catch(SerializationException exception) {
throw new RuntimeException(exception);
}
- alertButton = (PushButton)beanSerializer.getNamespace().get("alertButton");
- promptButton = (PushButton)beanSerializer.getNamespace().get("promptButton");
- messageTypeGroup = (ButtonGroup)beanSerializer.getNamespace().get("messageTypeGroup");
+ alertButton = (PushButton)bxmlSerializer.getNamespace().get("alertButton");
+ promptButton = (PushButton)bxmlSerializer.getNamespace().get("promptButton");
+ messageTypeGroup = (ButtonGroup)bxmlSerializer.getNamespace().get("messageTypeGroup");
rollup.setContent(component);
@@ -851,9 +851,9 @@ public class KitchenSink implements Appl
options.add("Cancel");
Component body = null;
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
try {
- body = (Component)beanSerializer.readObject(this, "alert.bxml");
+ body = (Component)bxmlSerializer.readObject(this, "alert.bxml");
} catch(Exception exception) {
System.err.println(exception);
}
@@ -891,9 +891,9 @@ public class KitchenSink implements Appl
options.add("Cancel");
Component body = null;
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
try {
- body = (Component)beanSerializer.readObject(this, "alert.bxml");
+ body = (Component)bxmlSerializer.readObject(this, "alert.bxml");
} catch(Exception exception) {
System.err.println(exception);
}
@@ -938,50 +938,50 @@ public class KitchenSink implements Appl
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer();
- window = (Window)beanSerializer.readObject(this, "kitchen_sink.bxml");
- beanSerializer.bind(this, KitchenSink.class);
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
+ window = (Window)bxmlSerializer.readObject(this, "kitchen_sink.bxml");
+ bxmlSerializer.bind(this, KitchenSink.class);
- buttonsRollup = (Rollup)beanSerializer.getNamespace().get("buttonsRollup");
+ buttonsRollup = (Rollup)bxmlSerializer.getNamespace().get("buttonsRollup");
buttonsRollup.getRollupStateListeners().add(new ButtonsRollupStateHandler());
- listsRollup = (Rollup)beanSerializer.getNamespace().get("listsRollup");
+ listsRollup = (Rollup)bxmlSerializer.getNamespace().get("listsRollup");
listsRollup.getRollupStateListeners().add(new ListsRollupStateHandler());
- textRollup = (Rollup)beanSerializer.getNamespace().get("textRollup");
+ textRollup = (Rollup)bxmlSerializer.getNamespace().get("textRollup");
textRollup.getRollupStateListeners().add(new TextRollupStateHandler());
- calendarsRollup = (Rollup)beanSerializer.getNamespace().get("calendarsRollup");
+ calendarsRollup = (Rollup)bxmlSerializer.getNamespace().get("calendarsRollup");
calendarsRollup.getRollupStateListeners().add(new CalendarsRollupStateHandler());
- colorChoosersRollup = (Rollup)beanSerializer.getNamespace().get("colorChoosersRollup");
+ colorChoosersRollup = (Rollup)bxmlSerializer.getNamespace().get("colorChoosersRollup");
colorChoosersRollup.getRollupStateListeners().add(new ColorChoosersRollupStateHandler());
- navigationRollup = (Rollup)beanSerializer.getNamespace().get("navigationRollup");
+ navigationRollup = (Rollup)bxmlSerializer.getNamespace().get("navigationRollup");
navigationRollup.getRollupStateListeners().add(new NavigationRollupStateHandler());
- splittersRollup = (Rollup)beanSerializer.getNamespace().get("splittersRollup");
+ splittersRollup = (Rollup)bxmlSerializer.getNamespace().get("splittersRollup");
splittersRollup.getRollupStateListeners().add(new SplittersRollupStateHandler());
- menusRollup = (Rollup)beanSerializer.getNamespace().get("menusRollup");
+ menusRollup = (Rollup)bxmlSerializer.getNamespace().get("menusRollup");
menusRollup.getRollupStateListeners().add(new MenusRollupStateHandler());
- metersRollup = (Rollup)beanSerializer.getNamespace().get("metersRollup");
+ metersRollup = (Rollup)bxmlSerializer.getNamespace().get("metersRollup");
metersRollup.getRollupStateListeners().add(new MetersRollupStateHandler());
- spinnersRollup = (Rollup)beanSerializer.getNamespace().get("spinnersRollup");
+ spinnersRollup = (Rollup)bxmlSerializer.getNamespace().get("spinnersRollup");
spinnersRollup.getRollupStateListeners().add(new SpinnersRollupStateHandler());
- tablesRollup = (Rollup)beanSerializer.getNamespace().get("tablesRollup");
+ tablesRollup = (Rollup)bxmlSerializer.getNamespace().get("tablesRollup");
tablesRollup.getRollupStateListeners().add(new TablesRollupStateHandler());
- treesRollup = (Rollup)beanSerializer.getNamespace().get("treesRollup");
+ treesRollup = (Rollup)bxmlSerializer.getNamespace().get("treesRollup");
treesRollup.getRollupStateListeners().add(new TreesRollupStateHandler());
- dragDropRollup = (Rollup)beanSerializer.getNamespace().get("dragDropRollup");
+ dragDropRollup = (Rollup)bxmlSerializer.getNamespace().get("dragDropRollup");
dragDropRollup.getRollupStateListeners().add(new DragDropRollupStateHandler());
- alertsRollup = (Rollup)beanSerializer.getNamespace().get("alertsRollup");
+ alertsRollup = (Rollup)bxmlSerializer.getNamespace().get("alertsRollup");
alertsRollup.getRollupStateListeners().add(new AlertsRollupStateHandler());
window.open(display);
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=960388&r1=960387&r2=960388&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 Sun Jul 4 20:14:04 2010
@@ -30,8 +30,8 @@ public class ComponentExplorer implement
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BXMLSerializer beanSerializer = new BXMLSerializer(new Resources(getClass().getName()));
- window = (ComponentExplorerWindow)beanSerializer.readObject(getClass().getResource("component_explorer_window.bxml"));
+ BXMLSerializer bxmlSerializer = new BXMLSerializer(new Resources(getClass().getName()));
+ window = (ComponentExplorerWindow)bxmlSerializer.readObject(getClass().getResource("component_explorer_window.bxml"));
window.setClassProperty(properties.get(CLASS_PROPERTY));
window.open(display);
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/ComponentExplorerWindow.java Sun Jul 4 20:14:04 2010
@@ -132,9 +132,9 @@ public class ComponentExplorerWindow ext
sourceTextArea.setDocument(document);
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
try {
- component = (Component)beanSerializer.readObject(url);
+ component = (Component)bxmlSerializer.readObject(url);
} catch (IOException exception) {
throw new RuntimeException(exception);
} catch (SerializationException exception) {
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.java?rev=960388&r1=960387&r2=960388&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/explorer/tools/EventLoggerSkin.java Sun Jul 4 20:14:04 2010
@@ -86,9 +86,9 @@ class EventLoggerSkin extends ContainerS
throw new RuntimeException(exception);
}
- BXMLSerializer beanSerializer = new BXMLSerializer(resources);
+ BXMLSerializer bxmlSerializer = new BXMLSerializer(resources);
try {
- content = (Component)beanSerializer.readObject(this, "event_logger_skin.bxml");
+ content = (Component)bxmlSerializer.readObject(this, "event_logger_skin.bxml");
} catch (IOException exception) {
throw new RuntimeException(exception);
} catch (SerializationException exception) {
@@ -97,8 +97,8 @@ class EventLoggerSkin extends ContainerS
eventLogger.add(content);
- declaredEventsTreeView = (TreeView)beanSerializer.getNamespace().get("declaredEventsTreeView");
- firedEventsTableView = (TableView)beanSerializer.getNamespace().get("firedEventsTableView");
+ declaredEventsTreeView = (TreeView)bxmlSerializer.getNamespace().get("declaredEventsTreeView");
+ firedEventsTableView = (TableView)bxmlSerializer.getNamespace().get("firedEventsTableView");
// Propagate check state upwards or downwards as necessary
declaredEventsTreeView.getTreeViewNodeStateListeners().add(new TreeViewNodeStateListener() {
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=960388&r1=960387&r2=960388&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:14:04 2010
@@ -93,17 +93,17 @@ public class TablePanes extends Window i
namedActions.put("configureCell", new Action() {
@Override
public void perform() {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
Sheet sheet;
// Make the cell component available to script blocks
int rowIndex = tablePane.getRowAt(contextMenuHandler.getY());
int columnIndex = tablePane.getColumnAt(contextMenuHandler.getX());
Component component = tablePane.getCellComponent(rowIndex, columnIndex);
- beanSerializer.getNamespace().put("component", component);
+ bxmlSerializer.getNamespace().put("component", component);
try {
- sheet = (Sheet)beanSerializer.readObject(this, "table_panes_configure_cell.bxml");
+ sheet = (Sheet)bxmlSerializer.readObject(this, "table_panes_configure_cell.bxml");
} catch (SerializationException exception) {
throw new RuntimeException(exception);
} catch (IOException exception) {
@@ -117,16 +117,16 @@ public class TablePanes extends Window i
namedActions.put("configureRow", new Action() {
@Override
public void perform() {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
Sheet sheet;
// Make the selected row available to script blocks
int rowIndex = tablePane.getRowAt(contextMenuHandler.getY());
TablePane.Row row = tablePane.getRows().get(rowIndex);
- beanSerializer.getNamespace().put("row", row);
+ bxmlSerializer.getNamespace().put("row", row);
try {
- sheet = (Sheet)beanSerializer.readObject(this, "table_panes_configure_row.bxml");
+ sheet = (Sheet)bxmlSerializer.readObject(this, "table_panes_configure_row.bxml");
} catch (SerializationException exception) {
throw new RuntimeException(exception);
} catch (IOException exception) {
@@ -140,7 +140,7 @@ public class TablePanes extends Window i
namedActions.put("insertRow", new Action() {
@Override
public void perform() {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
Sheet sheet;
// Create and insert a new row
@@ -157,10 +157,10 @@ public class TablePanes extends Window i
}
// Make the new row available to script blocks
- beanSerializer.getNamespace().put("row", row);
+ bxmlSerializer.getNamespace().put("row", row);
try {
- sheet = (Sheet)beanSerializer.readObject(this, "table_panes_configure_row.bxml");
+ sheet = (Sheet)bxmlSerializer.readObject(this, "table_panes_configure_row.bxml");
} catch (SerializationException exception) {
throw new RuntimeException(exception);
} catch (IOException exception) {
@@ -197,16 +197,16 @@ public class TablePanes extends Window i
namedActions.put("configureColumn", new Action() {
@Override
public void perform() {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
Sheet sheet;
// Make the selected column available to script blocks
int columnIndex = tablePane.getColumnAt(contextMenuHandler.getX());
TablePane.Column column = tablePane.getColumns().get(columnIndex);
- beanSerializer.getNamespace().put("column", column);
+ bxmlSerializer.getNamespace().put("column", column);
try {
- sheet = (Sheet)beanSerializer.readObject(this, "table_panes_configure_column.bxml");
+ sheet = (Sheet)bxmlSerializer.readObject(this, "table_panes_configure_column.bxml");
} catch (SerializationException exception) {
throw new RuntimeException(exception);
} catch (IOException exception) {
@@ -220,7 +220,7 @@ public class TablePanes extends Window i
namedActions.put("insertColumn", new Action() {
@Override
public void perform() {
- BXMLSerializer beanSerializer = new BXMLSerializer();
+ BXMLSerializer bxmlSerializer = new BXMLSerializer();
Sheet sheet;
// Create and insert a new column
@@ -238,10 +238,10 @@ public class TablePanes extends Window i
}
// Make the new column available to script blocks
- beanSerializer.getNamespace().put("column", column);
+ bxmlSerializer.getNamespace().put("column", column);
try {
- sheet = (Sheet)beanSerializer.readObject(this, "table_panes_configure_column.bxml");
+ sheet = (Sheet)bxmlSerializer.readObject(this, "table_panes_configure_column.bxml");
} catch (SerializationException exception) {
throw new RuntimeException(exception);
} catch (IOException exception) {
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=960388&r1=960387&r2=960388&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:14:04 2010
@@ -56,9 +56,9 @@ public class Localization implements App
}
}
- BXMLSerializer beanSerializer = new BXMLSerializer(resources);
+ BXMLSerializer bxmlSerializer = new BXMLSerializer(resources);
- window = (Window)beanSerializer.readObject(this, "localization.bxml");
+ window = (Window)bxmlSerializer.readObject(this, "localization.bxml");
window.open(display);
}