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 [2/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/...
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java?rev=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java Thu Jul 1 12:24:34 2010
@@ -19,7 +19,7 @@ package org.apache.pivot.wtk;
import java.net.URL;
import java.io.File;
-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.util.ThreadUtilities;
@@ -46,7 +46,7 @@ public class ScriptApplication implement
resources = new Resources(properties.get(RESOURCES_KEY));
}
- BeanSerializer beanSerializer = new BeanSerializer(resources);
+ BXMLSerializer beanSerializer = new BXMLSerializer(resources);
ClassLoader classLoader = ThreadUtilities.getClassLoader();
URL location = classLoader.getResource(src);
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java?rev=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtk/media/Image.java Thu Jul 1 12:24:34 2010
@@ -23,7 +23,7 @@ import java.io.InputStream;
import java.net.URL;
import java.util.concurrent.ExecutorService;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.io.IOTask;
import org.apache.pivot.serialization.SerializationException;
import org.apache.pivot.util.ListenerList;
@@ -97,7 +97,7 @@ public abstract class Image implements V
inputStream = new MonitoredInputStream(new BufferedInputStream(location.openStream()));
if (location.getFile().endsWith("wtkd")) {
- BeanSerializer serializer = new BeanSerializer();
+ BXMLSerializer serializer = new BXMLSerializer();
image = (Drawing)serializer.readObject(inputStream);
} else {
BufferedImageSerializer serializer = new BufferedImageSerializer();
Modified: pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java?rev=959633&r1=959632&r2=959633&view=diff
==============================================================================
--- pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java (original)
+++ pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java Thu Jul 1 12:24:34 2010
@@ -16,14 +16,14 @@
*/
package org.apache.pivot.wtkx;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.BXMLSerializer;
import org.apache.pivot.util.Resources;
/**
* Loads an object hierarchy from an XML document.
*
* @deprecated
- * This class has been moved to {@link org.apache.pivot.beans.BeanSerializer}.
+ * This class has been moved to {@link org.apache.pivot.beans.BXMLSerializer}.
* You can use the <tt>bxml_upgrade.xml</tt> Ant script to update your
* source code to use the new classes. Usage:
* <p>
@@ -31,7 +31,7 @@ import org.apache.pivot.util.Resources;
* </p>
*/
@Deprecated
-public class WTKXSerializer extends BeanSerializer {
+public class WTKXSerializer extends BXMLSerializer {
public static final String WTKX_PREFIX = "wtkx";
public WTKXSerializer() {