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/01 14:24:36 UTC
svn commit: r959633 [1/2] - in /pivot/trunk:
core/src/org/apache/pivot/beans/ demos/src/org/apache/pivot/demos/clock/
demos/src/org/apache/pivot/demos/decorator/
demos/src/org/apache/pivot/demos/itunes/
demos/src/org/apache/pivot/demos/json/ demos/src/...
Author: gbrown
Date: Thu Jul 1 12:24:34 2010
New Revision: 959633
URL: http://svn.apache.org/viewvc?rev=959633&view=rev
Log:
Rename BeanSerializer to BXMLSerializer.
Added:
pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java
- copied, changed from r959631, pivot/trunk/core/src/org/apache/pivot/beans/BeanSerializer.java
Removed:
pivot/trunk/core/src/org/apache/pivot/beans/BeanSerializer.java
Modified:
pivot/trunk/core/src/org/apache/pivot/beans/Bindable.java
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/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/media/Image.java
pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java
Copied: pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java (from r959631, pivot/trunk/core/src/org/apache/pivot/beans/BeanSerializer.java)
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java?p2=pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java&p1=pivot/trunk/core/src/org/apache/pivot/beans/BeanSerializer.java&r1=959631&r2=959633&rev=959633&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/beans/BeanSerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/beans/BXMLSerializer.java Thu Jul 1 12:24:34 2010
@@ -63,7 +63,7 @@ import org.apache.pivot.util.Vote;
/**
* Loads an object hierarchy from an XML document.
*/
-public class BeanSerializer implements Serializer<Object>, Dictionary<String, Object> {
+public class BXMLSerializer implements Serializer<Object>, Dictionary<String, Object> {
private class NamedObjectBindings implements Bindings {
@Override
public Object get(Object key) {
@@ -282,7 +282,7 @@ public class BeanSerializer implements S
private Class<? extends Annotation> bindingAnnotationClass;
private HashMap<String, Object> namedObjects;
- private HashMap<String, BeanSerializer> namedSerializers;
+ private HashMap<String, BXMLSerializer> namedSerializers;
private XMLInputFactory xmlInputFactory;
private ScriptEngineManager scriptEngineManager;
@@ -319,15 +319,15 @@ public class BeanSerializer implements S
public static final String MIME_TYPE = "application/bxml";
- public BeanSerializer() {
+ public BXMLSerializer() {
this(null);
}
- public BeanSerializer(Resources resources) {
+ public BXMLSerializer(Resources resources) {
this(resources, null, BXML_PREFIX, BXML.class);
}
- protected BeanSerializer(Resources resources, BeanSerializer owner,
+ protected BXMLSerializer(Resources resources, BXMLSerializer owner,
String internalNamespacePrefix, Class<? extends Annotation> bindingAnnotationClass) {
this.resources = resources;
this.internalNamespacePrefix = internalNamespacePrefix;
@@ -336,7 +336,7 @@ public class BeanSerializer implements S
if (owner == null) {
inline = false;
namedObjects = new HashMap<String, Object>();
- namedSerializers = new HashMap<String, BeanSerializer>();
+ namedSerializers = new HashMap<String, BXMLSerializer>();
} else {
inline = true;
namedObjects = owner.namedObjects;
@@ -736,7 +736,7 @@ public class BeanSerializer implements S
}
// Read the object
- BeanSerializer serializer = createSerializer(resources, inline ? this : null);
+ BXMLSerializer serializer = createSerializer(resources, inline ? this : null);
if (element.id != null) {
if (namedSerializers.containsKey(element.id)) {
@@ -1118,8 +1118,8 @@ public class BeanSerializer implements S
* @param resources
* @param owner
*/
- protected BeanSerializer createSerializer(Resources resources, BeanSerializer owner) {
- return new BeanSerializer(resources, owner, internalNamespacePrefix, bindingAnnotationClass);
+ protected BXMLSerializer createSerializer(Resources resources, BXMLSerializer owner) {
+ return new BXMLSerializer(resources, owner, internalNamespacePrefix, bindingAnnotationClass);
}
/**
@@ -1189,7 +1189,7 @@ public class BeanSerializer implements S
} else {
String serializerName = name.substring(0, name.lastIndexOf('.'));
String id = name.substring(serializerName.length() + 1);
- BeanSerializer serializer = getSerializer(serializerName);
+ BXMLSerializer serializer = getSerializer(serializerName);
if (serializer != null) {
value = serializer.get(id);
@@ -1213,7 +1213,7 @@ public class BeanSerializer implements S
} else {
String serializerName = name.substring(0, name.lastIndexOf('.'));
String id = name.substring(serializerName.length() + 1);
- BeanSerializer serializer = getSerializer(serializerName);
+ BXMLSerializer serializer = getSerializer(serializerName);
previousValue = serializer.put(id, value);
}
@@ -1236,7 +1236,7 @@ public class BeanSerializer implements S
} else {
String serializerName = name.substring(0, name.lastIndexOf('.'));
String id = name.substring(serializerName.length() + 1);
- BeanSerializer serializer = getSerializer(serializerName);
+ BXMLSerializer serializer = getSerializer(serializerName);
previousValue = serializer.remove(id);
}
@@ -1257,7 +1257,7 @@ public class BeanSerializer implements S
} else {
String serializerName = name.substring(0, name.lastIndexOf('.'));
String id = name.substring(serializerName.length() + 1);
- BeanSerializer serializer = getSerializer(serializerName);
+ BXMLSerializer serializer = getSerializer(serializerName);
if (serializer != null) {
containsKey = serializer.containsKey(id);
@@ -1295,12 +1295,12 @@ public class BeanSerializer implements S
* @return The named serializer, or <tt>null</tt> if a serializer with the
* given name does not exist.
*/
- public BeanSerializer getSerializer(String name) {
+ public BXMLSerializer getSerializer(String name) {
if (name == null) {
throw new IllegalArgumentException("name is null.");
}
- BeanSerializer serializer = this;
+ BXMLSerializer serializer = this;
String[] path = name.split("\\.");
int i = 0;
Modified: pivot/trunk/core/src/org/apache/pivot/beans/Bindable.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/beans/Bindable.java?rev=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/beans/Bindable.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/beans/Bindable.java Thu Jul 1 12:24:34 2010
@@ -20,7 +20,7 @@ import org.apache.pivot.collections.Dict
import org.apache.pivot.util.Resources;
/**
- * Allows {@link BeanSerializer} to initialize an instance of a deserialized class.
+ * Allows {@link BXMLSerializer} to initialize an instance of a deserialized class.
*/
public interface Bindable {
/**
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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -19,7 +19,7 @@ package org.apache.pivot.demos.clock;
import java.awt.Graphics2D;
import java.util.Calendar;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.wtk.media.Image;
import org.apache.pivot.wtk.media.ImageListener;
import org.apache.pivot.wtk.media.Movie;
@@ -31,11 +31,11 @@ import org.apache.pivot.wtk.media.drawin
*/
public class Clock extends Movie {
private Calendar calendar = Calendar.getInstance();
- private BeanSerializer beanSerializer;
+ private BXMLSerializer beanSerializer;
private Image image = null;
public Clock() {
- beanSerializer = new BeanSerializer();
+ beanSerializer = new BXMLSerializer();
try {
image = (Image)beanSerializer.readObject(getClass().getResource("clock.bxml"));
} catch (Exception ex) {
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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.demos.decorator;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Component;
@@ -33,7 +33,7 @@ public class DecoratorDemo implements Ap
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
reflectionWindow = (Window)beanSerializer.readObject(this, "reflection_window.bxml");
translucentFrame = (Frame)beanSerializer.readObject(this, "translucent_frame.bxml");
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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -22,7 +22,7 @@ import java.util.Comparator;
import java.util.Locale;
import org.apache.pivot.beans.BXML;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.List;
import org.apache.pivot.collections.Map;
import org.apache.pivot.util.concurrent.Task;
@@ -72,7 +72,7 @@ public class SearchDemo implements Appli
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
beanSerializer.put(APPLICATION_KEY, this);
window = (Window)beanSerializer.readObject(this, "search_demo.bxml");
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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -23,7 +23,7 @@ import java.io.StringReader;
import java.util.Comparator;
import org.apache.pivot.beans.BXML;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.List;
import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.Sequence.Tree.Path;
@@ -62,7 +62,7 @@ public class JSONViewer implements Appli
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
beanSerializer.put(APPLICATION_KEY, this);
window = (Window)beanSerializer.readObject(this, "json_viewer.bxml");
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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -21,7 +21,7 @@ import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.List;
import org.apache.pivot.collections.Map;
@@ -167,7 +167,7 @@ public class LargeData implements Applic
throw new IllegalArgumentException(BASE_PATH_KEY + " is required.");
}
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = (Window)beanSerializer.readObject(this, "large_data.bxml");
fileListButton = (ListButton)beanSerializer.get("fileListButton");
loadDataButton = (PushButton)beanSerializer.get("loadDataButton");
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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -25,7 +25,7 @@ import java.io.FileWriter;
import java.io.IOException;
import org.apache.pivot.beans.BXML;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.List;
import org.apache.pivot.collections.Map;
@@ -79,7 +79,7 @@ public class RichTextEditorDemo implemen
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = (Window)beanSerializer.readObject(this, "richtexteditor.bxml");
beanSerializer.bind(this, RichTextEditorDemo.class);
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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -32,7 +32,7 @@ import javax.swing.JRadioButton;
import javax.swing.SwingUtilities;
import javax.swing.border.EmptyBorder;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.serialization.SerializationException;
import org.apache.pivot.wtk.ApplicationContext;
import org.apache.pivot.wtk.Window;
@@ -121,7 +121,7 @@ public class SwingDemo extends Applicati
displays.add(displayHost.getDisplay());
// Load the Pivot window
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
Window window;
try {
window = (Window)beanSerializer.readObject(SwingDemo.class.getResource("pivot_window.bxml"));
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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.io.StringReader;
import org.apache.pivot.beans.BXML;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.HashMap;
import org.apache.pivot.collections.Map;
@@ -70,7 +70,7 @@ public class XMLViewer implements Applic
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
beanSerializer.put(APPLICATION_KEY, this);
window = (Window)beanSerializer.readObject(this, "xml_viewer.bxml");
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/AccordionTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/AccordionTest.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
@@ -30,7 +30,7 @@ public class AccordionTest implements Ap
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
frame = (Frame)beanSerializer.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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/ActionMappingTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/ActionMappingTest.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Action;
import org.apache.pivot.wtk.Alert;
@@ -46,7 +46,7 @@ public class ActionMappingTest implement
}
});
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = (Window)beanSerializer.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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/ApplicationHandlerTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/ApplicationHandlerTest.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
@@ -30,7 +30,7 @@ public class ApplicationHandlerTest impl
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = (Window)beanSerializer.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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/BXMLDictionaryTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/BXMLDictionaryTest.java Thu Jul 1 12:24:34 2010
@@ -16,14 +16,14 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.HashMap;
import org.apache.pivot.json.JSONSerializer;
public class BXMLDictionaryTest {
@SuppressWarnings("unchecked")
public static void main(String[] args) throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
HashMap<String, Object> hashMap =
(HashMap<String, Object>)beanSerializer.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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/BaselineTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/BaselineTest.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Component;
@@ -29,7 +29,7 @@ public class BaselineTest implements App
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = new Window((Component)beanSerializer.readObject(getClass().getResource("baseline_test.bxml")));
window.setTitle("Baseline Test");
window.setMaximized(true);
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/BorderTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/BorderTest.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Component;
@@ -31,7 +31,7 @@ public class BorderTest implements Appli
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
frame = new Frame((Component)beanSerializer.readObject(getClass().getResource("border_test.bxml")));
frame.setTitle("Border Test");
frame.setPreferredSize(480, 360);
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/CalendarTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/CalendarTest.java Thu Jul 1 12:24:34 2010
@@ -17,7 +17,7 @@
package org.apache.pivot.tests;
import org.apache.pivot.beans.BXML;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.util.CalendarDate;
import org.apache.pivot.util.Filter;
@@ -40,7 +40,7 @@ public class CalendarTest implements App
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = (Window)beanSerializer.readObject(this, "calendar_test.bxml");
beanSerializer.bind(this, CalendarTest.class);
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/CardPaneTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/CardPaneTest.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.util.Vote;
import org.apache.pivot.wtk.Application;
@@ -48,7 +48,7 @@ public class CardPaneTest implements App
frame.setPreferredSize(800, 600);
frame.setLocation(20, 20);
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
sheet = (Sheet)beanSerializer.readObject(this, "card_pane_test.bxml");
cardPane = (CardPane)beanSerializer.get("cardPane");
sizeGroup = (ButtonGroup)beanSerializer.get("sizeGroup");
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/ColorListButtonTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/ColorListButtonTest.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.BoxPane;
@@ -33,7 +33,7 @@ public class ColorListButtonTest impleme
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
BoxPane boxPane = (BoxPane) beanSerializer.readObject(this, "color_list_button_test.bxml");
listButton = (ListButton)beanSerializer.get("listButton");
// test the getListPopup() method
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/ContextMenuTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/ContextMenuTest.java Thu Jul 1 12:24:34 2010
@@ -17,7 +17,7 @@
package org.apache.pivot.tests;
import org.apache.pivot.beans.BXML;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Component;
@@ -36,7 +36,7 @@ public class ContextMenuTest implements
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = (Window)beanSerializer.readObject(this, "context_menu_test.bxml");
beanSerializer.bind(this, ContextMenuTest.class);
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/DataBindingTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/DataBindingTest.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.HashMap;
import org.apache.pivot.collections.List;
import org.apache.pivot.collections.Map;
@@ -115,7 +115,7 @@ public class DataBindingTest implements
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = (Window)beanSerializer.readObject(this, "data_binding_test.bxml");
window.open(display);
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/DrawingTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/DrawingTest.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Component;
@@ -48,7 +48,7 @@ public class DrawingTest implements Appl
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = (Window)beanSerializer.readObject(this, "drawing_test.bxml");
imageView = (ImageView)beanSerializer.get("imageView");
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/ExpanderTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/ExpanderTest.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
@@ -30,7 +30,7 @@ public class ExpanderTest implements App
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = (Window)beanSerializer.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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/FormTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/FormTest.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Component;
@@ -30,7 +30,7 @@ public class FormTest implements Applica
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
frame = new Frame((Component)beanSerializer.readObject(getClass().getResource("form_test.bxml")));
frame.setTitle("Form Test");
frame.setPreferredSize(480, 360);
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/GridPaneTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/GridPaneTest.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
@@ -29,7 +29,7 @@ public class GridPaneTest implements App
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = (Window)beanSerializer.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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/ListViewTest2.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/ListViewTest2.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Component;
@@ -30,7 +30,7 @@ public class ListViewTest2 implements Ap
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = new Window((Component)beanSerializer.readObject(getClass().getResource("listview_test2.bxml")));
window.setTitle("ListView Test2");
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/MenuBarTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/MenuBarTest.java Thu Jul 1 12:24:34 2010
@@ -17,7 +17,7 @@
package org.apache.pivot.tests;
import org.apache.pivot.beans.BXML;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.BoxPane;
@@ -49,7 +49,7 @@ public class MenuBarTest implements Appl
frame1.setPreferredSize(320, 240);
frame1.open(display);
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
frame2 = (Frame)beanSerializer.readObject(this, "menu_bar_test.bxml");
beanSerializer.bind(this, MenuBarTest.class);
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/PanoramaTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/PanoramaTest.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Component;
@@ -45,7 +45,7 @@ public class PanoramaTest implements App
panorama.setView(imageView);
frame1.open(display);
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
frame2 = new Frame((Component)beanSerializer.readObject(getClass().getResource("panorama_test.bxml")));
frame2.setTitle("Panorama Test 2");
frame2.setPreferredSize(480, 360);
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/ResolveTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/ResolveTest.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.util.Resources;
import org.apache.pivot.wtk.Application;
@@ -30,7 +30,7 @@ public class ResolveTest implements Appl
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
Resources resources = new Resources(getClass().getName());
- BeanSerializer beanSerializer = new BeanSerializer(resources);
+ BXMLSerializer beanSerializer = new BXMLSerializer(resources);
window = (Window)beanSerializer.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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/SliderTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/SliderTest.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Component;
@@ -37,7 +37,7 @@ public class SliderTest implements Appli
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = new Window((Component)beanSerializer.readObject(getClass().getResource("slider_test.bxml")));
slider1 = (Slider)beanSerializer.get("slider1");
slider1.getSliderValueListeners().add(new SliderValueListener() {
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/SpinnerFocusTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/SpinnerFocusTest.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Action;
import org.apache.pivot.wtk.Alert;
@@ -47,7 +47,7 @@ public class SpinnerFocusTest implements
Action.getNamedActions().put("buttonAction", action);
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
frame = new Frame((Component)beanSerializer.readObject(getClass().getResource("spinner_focus_test.bxml")));
frame.setTitle("Spinner Focus Test");
frame.open(display);
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/SplitPaneTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/SplitPaneTest.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Component;
@@ -29,7 +29,7 @@ public class SplitPaneTest implements Ap
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = new Window((Component)beanSerializer.readObject(getClass().getResource("splitpane_test.bxml")));
window.setTitle("SplitPane Test");
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/SuggestionPopupTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/SuggestionPopupTest.java Thu Jul 1 12:24:34 2010
@@ -17,7 +17,7 @@
package org.apache.pivot.tests;
import org.apache.pivot.beans.BXML;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
@@ -40,7 +40,7 @@ public class SuggestionPopupTest impleme
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = (Window)beanSerializer.readObject(this, "suggestion_popup_test.bxml");
beanSerializer.bind(this);
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/TablePaneTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/TablePaneTest.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
@@ -29,7 +29,7 @@ public class TablePaneTest implements Ap
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = (Window)beanSerializer.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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/TableViewTest2.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/TableViewTest2.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
@@ -34,7 +34,7 @@ public class TableViewTest2 implements A
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = (Window)beanSerializer.readObject(this, "table_view_test2.bxml");
tableView = (TableView)beanSerializer.get("tableView");
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/TextInputValidatorTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/TextInputValidatorTest.java Thu Jul 1 12:24:34 2010
@@ -13,7 +13,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Component;
@@ -41,7 +41,7 @@ public class TextInputValidatorTest impl
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = new Window((Component)beanSerializer.readObject(
getClass().getResource("textInputValidator_test.bxml")));
textinputFloatRange = (TextInput)beanSerializer.get("textinputFloatRange");
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/WatermarkDecoratorTest.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/WatermarkDecoratorTest.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
@@ -28,7 +28,7 @@ public class WatermarkDecoratorTest impl
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = (Window)beanSerializer.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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tests.text;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.collections.Sequence.Tree.Path;
@@ -68,7 +68,7 @@ public class TextAreaTest implements App
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
frame = new Frame((Component)beanSerializer.readObject(getClass().getResource("text_area_test.bxml")));
frame.setTitle("TextArea Test");
frame.setPreferredSize(640, 480);
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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloBXML.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloBXML.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
@@ -29,7 +29,7 @@ public class HelloBXML implements Applic
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = (Window)beanSerializer.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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloJavaScript.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloJavaScript.java Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
@@ -29,7 +29,7 @@ public class HelloJavaScript implements
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = (Window)beanSerializer.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=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java Thu Jul 1 12:24:34 2010
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.net.URL;
import java.util.Comparator;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.HashMap;
import org.apache.pivot.collections.List;
@@ -101,7 +101,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
try {
component = (Component)beanSerializer.readObject(this, "buttons.bxml");
} catch(IOException exception) {
@@ -128,7 +128,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
try {
component = (Component)beanSerializer.readObject(this, "lists.bxml");
} catch(IOException exception) {
@@ -180,7 +180,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
try {
component = (Component)beanSerializer.readObject(this, "text.bxml");
} catch(IOException exception) {
@@ -202,7 +202,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
try {
component = (Component)beanSerializer.readObject(this, "calendars.bxml");
} catch(IOException exception) {
@@ -224,7 +224,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
try {
component = (Component)beanSerializer.readObject(this, "color_choosers.bxml");
} catch(IOException exception) {
@@ -246,7 +246,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
try {
component = (Component)beanSerializer.readObject(this, "navigation.bxml");
} catch(IOException exception) {
@@ -268,7 +268,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
try {
component = (Component)beanSerializer.readObject(this, "splitters.bxml");
} catch(IOException exception) {
@@ -327,7 +327,7 @@ public class KitchenSink implements Appl
}
});
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
try {
component = (Component)beanSerializer.readObject(this, "menus.bxml");
} catch(IOException exception) {
@@ -379,7 +379,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
try {
component = (Component)beanSerializer.readObject(this, "meters.bxml");
} catch(IOException exception) {
@@ -432,7 +432,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
try {
component = (Component)beanSerializer.readObject(this, "spinners.bxml");
} catch(IOException exception) {
@@ -500,7 +500,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
try {
component = (Component)beanSerializer.readObject(this, "tables.bxml");
} catch(IOException exception) {
@@ -603,7 +603,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
try {
component = (Component)beanSerializer.readObject(this, "trees.bxml");
} catch(IOException exception) {
@@ -659,7 +659,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
try {
component = (Component)beanSerializer.readObject(this, "dragdrop.bxml");
} catch(IOException exception) {
@@ -816,7 +816,7 @@ public class KitchenSink implements Appl
@Override
public Vote previewExpandedChange(Rollup rollup) {
if (component == null) {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
try {
component = (Component)beanSerializer.readObject(this, "alerts.bxml");
} catch(IOException exception) {
@@ -851,7 +851,7 @@ public class KitchenSink implements Appl
options.add("Cancel");
Component body = null;
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
try {
body = (Component)beanSerializer.readObject(this, "alert.bxml");
} catch(Exception exception) {
@@ -891,7 +891,7 @@ public class KitchenSink implements Appl
options.add("Cancel");
Component body = null;
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
try {
body = (Component)beanSerializer.readObject(this, "alert.bxml");
} catch(Exception exception) {
@@ -938,7 +938,7 @@ public class KitchenSink implements Appl
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = (Window)beanSerializer.readObject(this, "kitchen_sink.bxml");
beanSerializer.bind(this, KitchenSink.class);
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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.explorer;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.util.Resources;
import org.apache.pivot.wtk.Application;
@@ -30,7 +30,7 @@ public class ComponentExplorer implement
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer(new Resources(getClass().getName()));
+ BXMLSerializer beanSerializer = new BXMLSerializer(new Resources(getClass().getName()));
window = (ComponentExplorerWindow)beanSerializer.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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -21,7 +21,7 @@ import java.io.InputStream;
import java.io.IOException;
import java.net.URL;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.List;
@@ -132,7 +132,7 @@ public class ComponentExplorerWindow ext
sourceTextArea.setDocument(document);
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
try {
component = (Component)beanSerializer.readObject(url);
} catch (IOException 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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.Comparator;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.HashMap;
import org.apache.pivot.collections.List;
@@ -86,7 +86,7 @@ class EventLoggerSkin extends ContainerS
throw new RuntimeException(exception);
}
- BeanSerializer beanSerializer = new BeanSerializer(resources);
+ BXMLSerializer beanSerializer = new BXMLSerializer(resources);
try {
content = (Component)beanSerializer.readObject(this, "event_logger_skin.bxml");
} catch (IOException exception) {
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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -18,7 +18,7 @@ package org.apache.pivot.tutorials.layou
import java.io.IOException;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.Dictionary;
@@ -92,7 +92,7 @@ public class TablePanes extends Window i
namedActions.put("configureCell", new Action() {
@Override
public void perform() {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
Sheet sheet;
// Make the cell component available to script blocks
@@ -116,7 +116,7 @@ public class TablePanes extends Window i
namedActions.put("configureRow", new Action() {
@Override
public void perform() {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
Sheet sheet;
// Make the selected row available to script blocks
@@ -139,7 +139,7 @@ public class TablePanes extends Window i
namedActions.put("insertRow", new Action() {
@Override
public void perform() {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
Sheet sheet;
// Create and insert a new row
@@ -196,7 +196,7 @@ public class TablePanes extends Window i
namedActions.put("configureColumn", new Action() {
@Override
public void perform() {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
Sheet sheet;
// Make the selected column available to script blocks
@@ -219,7 +219,7 @@ public class TablePanes extends Window i
namedActions.put("insertColumn", new Action() {
@Override
public void perform() {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
Sheet sheet;
// Create and insert a new column
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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -20,7 +20,7 @@ import java.awt.Font;
import java.awt.GraphicsEnvironment;
import java.util.Locale;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.util.Resources;
import org.apache.pivot.wtk.Application;
@@ -56,7 +56,7 @@ public class Localization implements App
}
}
- BeanSerializer beanSerializer = new BeanSerializer(resources);
+ BXMLSerializer beanSerializer = new BXMLSerializer(resources);
window = (Window)beanSerializer.readObject(this, "localization.bxml");
window.open(display);
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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -19,7 +19,7 @@ package org.apache.pivot.tutorials.menus
import java.io.IOException;
import org.apache.pivot.beans.BXML;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.serialization.SerializationException;
@@ -92,7 +92,7 @@ public class MenuBars extends Frame impl
Action.getNamedActions().put("fileNew", new Action() {
@Override
public void perform() {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
beanSerializer.put("menuHandler", menuHandler);
Component tab;
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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.scripting;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.List;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
@@ -42,7 +42,7 @@ public class Scripting implements Applic
@Override
public void startup(Display display, Map<String, String> properties)
throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
beanSerializer.put("bar", "12345");
window = (Window)beanSerializer.readObject(this, "scripting.bxml");
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java?rev=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java Thu Jul 1 12:24:34 2010
@@ -18,7 +18,7 @@ package org.apache.pivot.tutorials.stock
import java.util.Locale;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.util.Resources;
import org.apache.pivot.wtk.Application;
@@ -41,7 +41,7 @@ public class StockTracker implements App
}
Resources resources = new Resources(StockTrackerWindow.class.getName());
- BeanSerializer beanSerializer = new BeanSerializer(resources);
+ BXMLSerializer beanSerializer = new BXMLSerializer(resources);
window = (StockTrackerWindow)beanSerializer.readObject(this, "stock_tracker_window.bxml");
window.open(display);
}
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java?rev=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/webqueries/Expenses.java Thu Jul 1 12:24:34 2010
@@ -18,7 +18,7 @@ package org.apache.pivot.tutorials.webqu
import java.net.URL;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.util.Resources;
import org.apache.pivot.wtk.Application;
@@ -69,7 +69,7 @@ public class Expenses implements Applica
secure = origin.getProtocol().equals("HTTPS");
}
- BeanSerializer beanSerializer = new BeanSerializer(new Resources(ExpensesWindow.class.getName()));
+ BXMLSerializer beanSerializer = new BXMLSerializer(new Resources(ExpensesWindow.class.getName()));
expensesWindow = (ExpensesWindow)beanSerializer.readObject(this, "expenses_window.bxml");
expensesWindow.open(display);
}
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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -19,7 +19,7 @@ package org.apache.pivot.tutorials.webqu
import java.io.IOException;
import java.net.URL;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.Dictionary;
@@ -123,7 +123,7 @@ public class ExpensesWindow extends Wind
// Load the add/edit sheet
try {
- BeanSerializer beanSerializer = new BeanSerializer(new Resources(ExpenseSheet.class.getName()));
+ BXMLSerializer beanSerializer = new BXMLSerializer(new Resources(ExpenseSheet.class.getName()));
expenseSheet = (ExpenseSheet)beanSerializer.readObject(this, "expense_sheet.bxml");
} catch (IOException exception) {
throw new RuntimeException(exception);
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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.webqueries;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.json.JSON;
import org.apache.pivot.util.concurrent.Task;
@@ -41,7 +41,7 @@ public class WebQueries implements Appli
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
window = (Window)beanSerializer.readObject(this, "web_queries.bxml");
listView = (ListView)beanSerializer.get("listView");
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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -18,7 +18,7 @@ package org.apache.pivot.tutorials.windo
import java.io.IOException;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.serialization.SerializationException;
import org.apache.pivot.wtk.Application;
@@ -38,7 +38,7 @@ public class Windows implements Applicat
int y = 0;
for (int i = 0; i < 3; i++) {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
beanSerializer.put("application", this);
Frame frame;
@@ -79,7 +79,7 @@ public class Windows implements Applicat
public Window load(String fileName)
throws SerializationException, IOException {
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
return (Window)beanSerializer.readObject(this, fileName);
}
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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -20,7 +20,7 @@ import java.io.InputStream;
import java.io.IOException;
import java.net.URL;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.json.JSONSerializer;
@@ -98,7 +98,7 @@ public class TerraAlertSkin extends Terr
alert.getAlertListeners().add(this);
// Load the alert content
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
Component content;
try {
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java?rev=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSheetSkin.java Thu Jul 1 12:24:34 2010
@@ -20,7 +20,7 @@ import java.io.File;
import java.io.IOException;
import org.apache.pivot.beans.BXML;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.serialization.SerializationException;
@@ -94,7 +94,7 @@ public class TerraFileBrowserSheetSkin e
throw new RuntimeException(exception);
}
- BeanSerializer beanSerializer = new BeanSerializer(resources);
+ BXMLSerializer beanSerializer = new BXMLSerializer(resources);
Component content;
try {
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java?rev=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraFileBrowserSkin.java Thu Jul 1 12:24:34 2010
@@ -26,7 +26,7 @@ import java.util.Comparator;
import java.util.Date;
import org.apache.pivot.beans.BXML;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.ArrayList;
import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.FilteredList;
@@ -582,7 +582,7 @@ public class TerraFileBrowserSkin extend
throw new RuntimeException(exception);
}
- BeanSerializer beanSerializer = new BeanSerializer(resources);
+ BXMLSerializer beanSerializer = new BXMLSerializer(resources);
try {
content = (Component)beanSerializer.readObject(this, "terra_file_browser_skin.bxml");
} catch (IOException exception) {
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=959633&r1=959632&r2=959633&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 Thu Jul 1 12:24:34 2010
@@ -20,7 +20,7 @@ import java.io.InputStream;
import java.io.IOException;
import java.net.URL;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.json.JSONSerializer;
@@ -91,7 +91,7 @@ public class TerraPromptSkin extends Ter
prompt.getPromptListeners().add(this);
// Load the prompt content
- BeanSerializer beanSerializer = new BeanSerializer();
+ BXMLSerializer beanSerializer = new BXMLSerializer();
Component content;
try {