You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/06/15 21:27:33 UTC
svn commit: r784930 [1/2] - in /incubator/pivot/trunk:
demos/src/org/apache/pivot/demos/clock/
demos/src/org/apache/pivot/demos/decorator/
demos/src/org/apache/pivot/demos/dnd/ demos/src/org/apache/pivot/demos/dom/
demos/src/org/apache/pivot/demos/mill...
Author: gbrown
Date: Mon Jun 15 19:27:31 2009
New Revision: 784930
URL: http://svn.apache.org/viewvc?rev=784930&view=rev
Log:
Make properties startup argument a Map instead of a Dictionary.
Modified:
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/ClockDemo.java
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/DragAndDropDemo.java
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/FileDropTargetDemo.java
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dom/DOMTest.java
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dom/IMClient.java
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.java
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/ScriptingDemo.java
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTable.java
incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/HTTPClient.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloJava.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloWTKX.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/Checkboxes.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/LinkButtons.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/PushButtons.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/RadioButtons.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/ToggleButtons.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/drawing/RotateLine.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowser/FileBrowser.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/labels/Labels.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Borders.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/FlowPanes.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Forms.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Panels.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/StackPanes.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListButtons.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Accordions.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Expanders.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/ActivityIndicators.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/Meters.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/separators/Separators.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/Text.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/transition/Transitions.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Application.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/AccordionTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/BorderTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/CardPaneTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/CheckedListViewTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ColorListButtonTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/DragDropTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FlowPaneTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FormTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/LabelTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/LinkButtonTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ListViewSelectionTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ListViewTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/NativeDragDropTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/PanoramaTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/PushButtonTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ReflectionDecoratorTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SheetTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SliderTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SpinnerFocusTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/TablePaneTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/TagDecoratorTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/TextInputValidatorTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/WindowTest.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/text/test/TextAreaTest.java
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/ClockDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/ClockDemo.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/ClockDemo.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/clock/ClockDemo.java Mon Jun 15 19:27:31 2009
@@ -16,14 +16,13 @@
*/
package org.apache.pivot.demos.clock;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.MovieView;
import org.apache.pivot.wtk.Window;
-
/**
* Demonstrates how to write a movie "asset" class.
*
@@ -33,7 +32,7 @@
private Window window;
private Clock clock = new Clock();
- public void startup(Display display, Dictionary<String, String> properties) {
+ public void startup(Display display, Map<String, String> properties) {
window = new Window(new MovieView(clock));
window.setMaximized(true);
window.open(display);
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.demos.decorator;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.ComponentMouseListener;
@@ -27,12 +27,11 @@
import org.apache.pivot.wtk.effects.FadeDecorator;
import org.apache.pivot.wtkx.WTKXSerializer;
-
public class DecoratorDemo implements Application {
private Window reflectionWindow = null;
private Frame translucentFrame = null;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
reflectionWindow = (Window)wtkxSerializer.readObject(this, "reflection.wtkx");
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/DragAndDropDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/DragAndDropDemo.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/DragAndDropDemo.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/DragAndDropDemo.java Mon Jun 15 19:27:31 2009
@@ -18,7 +18,7 @@
import java.io.IOException;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.io.FileList;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Button;
@@ -43,7 +43,6 @@
import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
-
public class DragAndDropDemo implements Application {
private Window window = null;
@@ -57,7 +56,7 @@
@WTKX private PushButton copyFilesButton;
@WTKX private PushButton pasteFilesButton;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "drag_and_drop.wtkx");
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/FileDropTargetDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/FileDropTargetDemo.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/FileDropTargetDemo.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/FileDropTargetDemo.java Mon Jun 15 19:27:31 2009
@@ -19,7 +19,7 @@
import java.io.File;
import java.io.IOException;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.List;
import org.apache.pivot.collections.ListListener;
import org.apache.pivot.collections.Sequence;
@@ -44,7 +44,6 @@
import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
-
public class FileDropTargetDemo implements Application {
private Window window = null;
@@ -53,7 +52,7 @@
private FileList fileList = null;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "file_drop_target_demo.wtkx");
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dom/DOMTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dom/DOMTest.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dom/DOMTest.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dom/DOMTest.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.demos.dom;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Alert;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.BrowserApplicationContext;
@@ -28,12 +28,11 @@
import org.apache.pivot.wtk.PushButton;
import org.apache.pivot.wtk.Window;
-
public class DOMTest implements Application {
private Window window = null;
private PushButton helloButton = null;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
FlowPane flowPane = new FlowPane();
flowPane.getStyles().put("horizontalAlignment", HorizontalAlignment.CENTER);
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dom/IMClient.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dom/IMClient.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dom/IMClient.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/dom/IMClient.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.demos.dom;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.util.concurrent.Task;
import org.apache.pivot.util.concurrent.TaskExecutionException;
import org.apache.pivot.util.concurrent.TaskListener;
@@ -50,7 +50,6 @@
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.Packet;
-
public class IMClient implements Application {
/**
* Task for asynchronously logging into Jabber.
@@ -92,7 +91,7 @@
private ApplicationContext.ScheduledCallback scheduledFadeCallback = null;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "im_client.wtkx");
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/million/LargeData.java Mon Jun 15 19:27:31 2009
@@ -22,8 +22,8 @@
import java.net.URL;
import org.apache.pivot.collections.ArrayList;
-import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.List;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.serialization.CSVSerializer;
import org.apache.pivot.serialization.SerializationException;
import org.apache.pivot.wtk.Application;
@@ -41,7 +41,6 @@
import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
-
public class LargeData implements Application {
private class LoadDataCallback implements Runnable {
private class AddRowsCallback implements Runnable {
@@ -159,7 +158,7 @@
csvSerializer.getKeys().add("c3");
}
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
basePath = properties.get(BASE_PATH_KEY);
if (basePath == null) {
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/roweditor/RowEditorDemo.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.demos.roweditor;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.EnumList;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
@@ -31,7 +31,6 @@
import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
-
/**
* Demonstrates a flip transition used to initiate a table view row editor.
*
@@ -42,7 +41,7 @@
@WTKX TableView tableView;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "demo.wtkx");
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java Mon Jun 15 19:27:31 2009
@@ -32,7 +32,7 @@
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.io.IOTask;
import org.apache.pivot.util.concurrent.Task;
import org.apache.pivot.util.concurrent.TaskExecutionException;
@@ -58,7 +58,6 @@
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
-
/**
* RSS feed demo application.
*
@@ -259,7 +258,7 @@
});
}
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "rss_feed_demo.wtkx");
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/ScriptingDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/ScriptingDemo.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/ScriptingDemo.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/scripting/ScriptingDemo.java Mon Jun 15 19:27:31 2009
@@ -16,8 +16,8 @@
*/
package org.apache.pivot.demos.scripting;
-import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.List;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.ButtonPressListener;
@@ -27,7 +27,6 @@
import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
-
public class ScriptingDemo implements Application {
public static class MyButtonPressListener implements ButtonPressListener {
public void buttonPressed(Button button) {
@@ -40,7 +39,7 @@
@WTKX private String foo;
@WTKX private List<?> listData;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "scripting_demo.wtkx");
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTable.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTable.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTable.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTable.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.demos.tables;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
@@ -30,7 +30,6 @@
import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
-
public class FixedColumnTable implements Application {
private Window window = null;
@@ -41,7 +40,7 @@
private boolean synchronizingSelection = false;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "fixed_column_table.wtkx");
Modified: incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/HTTPClient.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/HTTPClient.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/HTTPClient.java (original)
+++ incubator/pivot/trunk/tools/src/org/apache/pivot/tools/net/HTTPClient.java Mon Jun 15 19:27:31 2009
@@ -21,7 +21,7 @@
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.SSLSession;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.List;
import org.apache.pivot.util.Base64;
import org.apache.pivot.util.Vote;
@@ -48,7 +48,6 @@
import org.apache.pivot.wtk.content.ListItem;
import org.apache.pivot.wtkx.WTKXSerializer;
-
/**
* HTTP client.
*
@@ -163,7 +162,7 @@
// Application methods
- public void startup(Display display, Dictionary<String, String> properties) throws Exception {
+ public void startup(Display display, Map<String, String> properties) throws Exception {
new Action("setAuthenticationAction") {
public String getDescription() {
return "Specifies authentication credentials";
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloJava.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloJava.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloJava.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloJava.java Mon Jun 15 19:27:31 2009
@@ -19,7 +19,7 @@
import java.awt.Color;
import java.awt.Font;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
@@ -31,7 +31,7 @@
public class HelloJava implements Application {
private Window window = null;
- public void startup(Display display, Dictionary<String, String> properties) {
+ public void startup(Display display, Map<String, String> properties) {
Label label = new Label();
label.setText("Hello World!");
label.getStyles().put("font", new Font("Arial", Font.BOLD, 24));
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloWTKX.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloWTKX.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloWTKX.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/HelloWTKX.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
@@ -26,7 +26,7 @@
public class HelloWTKX implements Application {
private Window window = null;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "hello.wtkx");
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java Mon Jun 15 19:27:31 2009
@@ -24,7 +24,6 @@
import java.util.Comparator;
import org.apache.pivot.collections.ArrayList;
-import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.List;
import org.apache.pivot.collections.Map;
import org.apache.pivot.serialization.JSONSerializer;
@@ -824,7 +823,7 @@
DesktopApplicationContext.main(KitchenSink.class, args);
}
- public void startup(Display display, Dictionary<String, String> properties) throws Exception {
+ public void startup(Display display, Map<String, String> properties) throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "kitchen_sink.wtkx");
wtkxSerializer.bind(this, KitchenSink.class);
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/Checkboxes.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/Checkboxes.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/Checkboxes.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/Checkboxes.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.buttons;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.ButtonPressListener;
@@ -38,7 +38,7 @@
@WTKX private ImageView clockImageView;
@WTKX private ImageView houseImageView;
- public void startup(Display display, Dictionary<String, String> properties) throws Exception {
+ public void startup(Display display, Map<String, String> properties) throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "checkboxes.wtkx");
wtkxSerializer.bind(this, Checkboxes.class);
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/LinkButtons.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/LinkButtons.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/LinkButtons.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/LinkButtons.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.buttons;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.ButtonPressListener;
@@ -35,7 +35,7 @@
@WTKX private LinkButton nextButton;
@WTKX private LinkButton previousButton;
- public void startup(Display display, Dictionary<String, String> properties) throws Exception {
+ public void startup(Display display, Map<String, String> properties) throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "link_buttons.wtkx");
wtkxSerializer.bind(this, LinkButtons.class);
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/PushButtons.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/PushButtons.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/PushButtons.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/PushButtons.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.buttons;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Alert;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Button;
@@ -34,7 +34,7 @@
@WTKX private PushButton pushButton;
- public void startup(Display display, Dictionary<String, String> properties) throws Exception {
+ public void startup(Display display, Map<String, String> properties) throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "push_buttons.wtkx");
wtkxSerializer.bind(this, PushButtons.class);
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/RadioButtons.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/RadioButtons.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/RadioButtons.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/RadioButtons.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.buttons;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Alert;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Button;
@@ -36,7 +36,7 @@
@WTKX private RadioButton oneButton;
@WTKX private PushButton selectButton;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "radio_buttons.wtkx");
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/ToggleButtons.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/ToggleButtons.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/ToggleButtons.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/ToggleButtons.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.buttons;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
@@ -26,7 +26,7 @@
public class ToggleButtons implements Application {
private Window window = null;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "toggle_buttons.wtkx");
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/databinding/DataBinding.java Mon Jun 15 19:27:31 2009
@@ -18,7 +18,6 @@
import java.io.InputStream;
-import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.Map;
import org.apache.pivot.serialization.JSONSerializer;
import org.apache.pivot.wtk.Application;
@@ -47,7 +46,7 @@
"(617) 555-1234", "joe_smith@foo.com",
new IMAccount("jsmith1234", "AIM"));
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "data_binding.wtkx");
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/drawing/RotateLine.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/drawing/RotateLine.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/drawing/RotateLine.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/drawing/RotateLine.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.drawing;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.ApplicationContext;
import org.apache.pivot.wtk.DesktopApplicationContext;
@@ -35,7 +35,7 @@
private Window window = null;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception{
WTKXSerializer wtkxSerializer = new WTKXSerializer();
drawing = (Drawing)wtkxSerializer.readObject(this, "rotate_line.wtkd");
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowser/FileBrowser.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowser/FileBrowser.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowser/FileBrowser.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/filebrowser/FileBrowser.java Mon Jun 15 19:27:31 2009
@@ -20,7 +20,7 @@
import java.io.FileFilter;
import java.net.MalformedURLException;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.collections.Sequence.Tree.Path;
import org.apache.pivot.io.Folder;
@@ -44,7 +44,7 @@
@WTKX private TreeView folderTreeView;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "file_browser.wtkx");
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/labels/Labels.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/labels/Labels.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/labels/Labels.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/labels/Labels.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.labels;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
@@ -26,7 +26,7 @@
public class Labels implements Application {
private Window window = null;
- public void startup(Display display, Dictionary<String, String> properties) throws Exception {
+ public void startup(Display display, Map<String, String> properties) throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "labels.wtkx");
window.open(display);
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Borders.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Borders.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Borders.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Borders.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.layout;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
@@ -26,7 +26,7 @@
public class Borders implements Application {
private Window window = null;
- public void startup(Display display, Dictionary<String, String> properties) throws Exception {
+ public void startup(Display display, Map<String, String> properties) throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "borders.wtkx");
window.open(display);
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/FlowPanes.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/FlowPanes.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/FlowPanes.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/FlowPanes.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.layout;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.ButtonStateListener;
@@ -46,7 +46,7 @@
@WTKX private RadioButton verticalAlignmentCenterButton;
@WTKX private RadioButton verticalAlignmentJustifyButton;
- public void startup(Display display, Dictionary<String, String> properties) throws Exception {
+ public void startup(Display display, Map<String, String> properties) throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "flow_panes.wtkx");
wtkxSerializer.bind(this, FlowPanes.class);
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Forms.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Forms.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Forms.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Forms.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.layout;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.ButtonPressListener;
@@ -42,7 +42,7 @@
@WTKX private PushButton submitButton;
@WTKX private Label errorLabel;
- public void startup(Display display, Dictionary<String, String> properties) throws Exception {
+ public void startup(Display display, Map<String, String> properties) throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "forms.wtkx");
wtkxSerializer.bind(this, Forms.class);
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Panels.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Panels.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Panels.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/Panels.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.layout;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
@@ -26,7 +26,7 @@
public class Panels implements Application {
private Window window = null;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "panels.wtkx");
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/StackPanes.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/StackPanes.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/StackPanes.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/StackPanes.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.layout;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
@@ -26,7 +26,7 @@
public class StackPanes implements Application {
private Window window = null;
- public void startup(Display display, Dictionary<String, String> properties) throws Exception {
+ public void startup(Display display, Map<String, String> properties) throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "stack_panes.wtkx");
window.open(display);
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListButtons.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListButtons.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListButtons.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListButtons.java Mon Jun 15 19:27:31 2009
@@ -17,7 +17,7 @@
package org.apache.pivot.tutorials.lists;
import java.net.URL;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.util.ThreadUtilities;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.ApplicationContext;
@@ -64,7 +64,7 @@
}
};
- public void startup(Display display, Dictionary<String, String> properties) throws Exception {
+ public void startup(Display display, Map<String, String> properties) throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "list_buttons.wtkx");
wtkxSerializer.bind(this, ListButtons.class);
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists/ListViews.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.lists;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
@@ -72,7 +72,7 @@
}
};
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "list_views.wtkx");
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Accordions.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Accordions.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Accordions.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Accordions.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.navigation;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.util.Vote;
import org.apache.pivot.wtk.Accordion;
@@ -78,7 +78,7 @@
}
};
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "accordions.wtkx");
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/CardPanes.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.navigation;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.ButtonPressListener;
@@ -45,7 +45,7 @@
@WTKX private RadioButton verticalSlideRadioButton;
@WTKX private RadioButton noneRadioButton;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "card_panes.wtkx");
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Expanders.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Expanders.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Expanders.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/Expanders.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.navigation;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
@@ -33,7 +33,7 @@
@WTKX private Expander weatherExpander;
@WTKX private Expander calendarExpander;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "expanders.wtkx");
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/navigation/TabPanes.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.navigation;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.ButtonStateListener;
@@ -40,7 +40,7 @@
@WTKX private RadioButton verticalRadioButton;
@WTKX private FlowPane cornerFlowPane;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "tab_panes.wtkx");
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/ActivityIndicators.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/ActivityIndicators.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/ActivityIndicators.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/ActivityIndicators.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.progress;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.ActivityIndicator;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Button;
@@ -36,7 +36,7 @@
@WTKX private ActivityIndicator activityIndicator3;
@WTKX private PushButton activityButton;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "activity_indicators.wtkx");
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/Meters.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/Meters.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/Meters.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/Meters.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.progress;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.util.concurrent.Task;
import org.apache.pivot.util.concurrent.TaskExecutionException;
import org.apache.pivot.util.concurrent.TaskListener;
@@ -68,7 +68,7 @@
private SampleTask sampleTask = null;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "meters.wtkx");
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/separators/Separators.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/separators/Separators.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/separators/Separators.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/separators/Separators.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.separators;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
@@ -26,7 +26,7 @@
public class Separators implements Application {
private Window window = null;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "separators.wtkx");
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/stocktracker/StockTracker.java Mon Jun 15 19:27:31 2009
@@ -26,8 +26,8 @@
import org.apache.pivot.web.GetQuery;
import org.apache.pivot.collections.ArrayList;
-import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.List;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.serialization.CSVSerializer;
import org.apache.pivot.util.Resources;
@@ -95,7 +95,7 @@
symbols.add("JAVA");
}
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
// Set the locale
String language = properties.get(LANGUAGE_PROPERTY_NAME);
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/Text.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/Text.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/Text.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/text/Text.java Mon Jun 15 19:27:31 2009
@@ -17,7 +17,7 @@
package org.apache.pivot.tutorials.text;
import org.apache.pivot.collections.ArrayList;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
@@ -122,7 +122,7 @@
states.add("Wyoming");
}
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "text.wtkx");
Modified: incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/transition/Transitions.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/transition/Transitions.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/transition/Transitions.java (original)
+++ incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/transition/Transitions.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.tutorials.transition;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.ButtonPressListener;
@@ -34,7 +34,7 @@
@WTKX private Button button3;
@WTKX private Button button4;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
window = (Window)wtkxSerializer.readObject(this, "transitions.wtkx");
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Application.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Application.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Application.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Application.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.wtk;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
/**
* Represents the entry point into a WTK application.
@@ -47,7 +47,7 @@
* @param properties
* Initialization properties passed to the application.
*/
- public void startup(Display display, Dictionary<String, String> properties) throws Exception;
+ public void startup(Display display, Map<String, String> properties) throws Exception;
/**
* Called when the application is being shut down.
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/BrowserApplicationContext.java Mon Jun 15 19:27:31 2009
@@ -25,12 +25,10 @@
import java.net.URLDecoder;
import org.apache.pivot.collections.ArrayList;
-import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.HashMap;
import netscape.javascript.JSObject;
-
/**
* Application context used to execute applications in a web browser.
*
@@ -43,91 +41,74 @@
* @author gbrown
*/
public static final class HostApplet extends Applet {
- private class PropertyDictionary implements Dictionary<String, String> {
- public String get(String key) {
- String value = properties.containsKey(key) ?
- properties.get(key) : getParameter(key);
- return value;
- }
-
- public String put(String key, String value) {
- throw new UnsupportedOperationException();
- }
-
- public String remove(String key) {
- throw new UnsupportedOperationException();
- }
-
- public boolean containsKey(String key) {
- return properties.containsKey(key)
- || getParameter(key) != null;
- }
-
- public boolean isEmpty() {
- return properties.isEmpty();
- }
- }
-
private class InitCallback implements Runnable {
public void run() {
- // Set the origin
- URL codeBase = getCodeBase();
- if (codeBase != null) {
- if (codeBase.getProtocol().equals("file")) {
- File userHome = null;
- try {
- userHome = new File(System.getProperty("user.home"));
- } catch(SecurityException exception) {
- // No-op
- }
-
- if (userHome != null) {
- try {
- origin = userHome.toURI().toURL();
- } catch(MalformedURLException exception) {
- // No-op
- }
- }
- } else {
- try {
- origin = new URL(codeBase.getProtocol(), codeBase.getHost(),
- codeBase.getPort(), "");
- } catch(MalformedURLException exception) {
- // No-op
- }
- }
- }
+ // Set the origin
+ URL codeBase = getCodeBase();
+ if (codeBase != null) {
+ if (codeBase.getProtocol().equals("file")) {
+ File userHome = null;
+ try {
+ userHome = new File(System.getProperty("user.home"));
+ } catch (SecurityException exception) {
+ // No-op
+ }
+
+ if (userHome != null) {
+ try {
+ origin = userHome.toURI().toURL();
+ } catch (MalformedURLException exception) {
+ // No-op
+ }
+ }
+ } else {
+ try {
+ origin = new URL(codeBase.getProtocol(), codeBase.getHost(),
+ codeBase.getPort(), "");
+ } catch (MalformedURLException exception) {
+ // No-op
+ }
+ }
+ }
- // Create the application context
- applicationContext = new BrowserApplicationContext();
+ // Create the application context
+ applicationContext = new BrowserApplicationContext();
- // Load properties specified on the query string
+ // Get the startup properties
properties = new HashMap<String, String>();
+ // Load properties specified as applet parameters
+ String[][] parameterInfo = getParameterInfo();
+ for (int i = 0; i < parameterInfo.length; i++) {
+ String[] parameter = parameterInfo[i];
+ properties.put(parameter[0], parameter[1]);
+ }
+
+ // Load properties specified on the query string
URL documentBase = getDocumentBase();
if (documentBase != null) {
- String queryString = documentBase.getQuery();
- if (queryString != null) {
- String[] arguments = queryString.split("&");
-
- for (int i = 0, n = arguments.length; i < n; i++) {
- String argument = arguments[i];
- String[] property = argument.split("=");
-
- if (property.length == 2) {
- String key, value;
- try {
- final String encoding = "UTF-8";
- key = URLDecoder.decode(property[0], encoding);
- value = URLDecoder.decode(property[1], encoding);
- properties.put(key, value);
- } catch(UnsupportedEncodingException exception) {
- }
- } else {
- System.err.println(argument + " is not a valid startup property.");
- }
- }
- }
+ String queryString = documentBase.getQuery();
+ if (queryString != null) {
+ String[] arguments = queryString.split("&");
+
+ for (int i = 0, n = arguments.length; i < n; i++) {
+ String argument = arguments[i];
+ String[] property = argument.split("=");
+
+ if (property.length == 2) {
+ String key, value;
+ try {
+ final String encoding = "UTF-8";
+ key = URLDecoder.decode(property[0], encoding);
+ value = URLDecoder.decode(property[1], encoding);
+ properties.put(key, value);
+ } catch (UnsupportedEncodingException exception) {
+ }
+ } else {
+ System.err.println(argument + " is not a valid startup property.");
+ }
+ }
+ }
}
// Add the display host to the applet
@@ -149,8 +130,8 @@
} else {
try {
Class<?> applicationClass = Class.forName(applicationClassName);
- application = (Application)applicationClass.newInstance();
- } catch(Exception exception) {
+ application = (Application) applicationClass.newInstance();
+ } catch (Exception exception) {
Alert.alert(MessageType.ERROR, exception.getMessage(),
applicationContext.getDisplay());
exception.printStackTrace();
@@ -173,8 +154,8 @@
if (application != null) {
try {
- application.startup(applicationContext.getDisplay(), propertyDictionary);
- } catch(Exception exception) {
+ application.startup(applicationContext.getDisplay(), properties);
+ } catch (Exception exception) {
Alert.alert(MessageType.ERROR, exception.getMessage(),
applicationContext.getDisplay());
exception.printStackTrace();
@@ -187,7 +168,7 @@
public void run() {
try {
application.shutdown(false);
- } catch(Exception exception) {
+ } catch (Exception exception) {
Alert.alert(MessageType.ERROR, exception.getMessage(),
applicationContext.getDisplay());
exception.printStackTrace();
@@ -207,7 +188,6 @@
private BrowserApplicationContext applicationContext = null;
private HashMap<String, String> properties = null;
- private PropertyDictionary propertyDictionary = new PropertyDictionary();
private Application application = null;
public static final String APPLICATION_CLASS_NAME_PARAMETER = "applicationClassName";
@@ -274,7 +254,7 @@
* Retrieves a named application.
*
* @param name
- * The name of the applet hosting the application.
+ * The name of the applet hosting the application.
*/
public static Application getApplication(String name) {
if (name == null) {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.wtk;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtkx.WTKXSerializer;
@@ -35,7 +35,7 @@
DesktopApplicationContext.main(ScriptApplication.class, args);
}
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
if (!properties.containsKey(SRC_ARGUMENT)) {
throw new IllegalArgumentException(SRC_ARGUMENT + " argument is required.");
@@ -45,6 +45,9 @@
String title = properties.get(TITLE_ARGUMENT);
WTKXSerializer wtkxSerializer = new WTKXSerializer();
+ for (String property : properties) {
+ wtkxSerializer.put(property, properties.get(property));
+ }
Component content = (Component)wtkxSerializer.readObject(src);
window = new Window(content);
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java Mon Jun 15 19:27:31 2009
@@ -491,6 +491,8 @@
resources = new Resources(attribute.value);
} else if (attribute.localName.equals(INCLUDE_ASYNCHRONOUS_ATTRIBUTE)) {
// TODO
+ throw new UnsupportedOperationException("Asynchronous includes are not"
+ + " yet supported.");
} else {
if (attribute.namespaceURI == null) {
throw new SerializationException("Instance property setters are not"
@@ -889,16 +891,16 @@
}
WTKXSerializer serializer = this;
- String[] namespacePath = name.split("\\.");
+ String[] path = name.split("\\.");
int i = 0;
- int n = namespacePath.length - 1;
+ int n = path.length - 1;
while (i < n && serializer != null) {
- String namespace = namespacePath[i++];
+ String namespace = path[i++];
serializer = serializer.includeSerializers.get(namespace);
}
- String id = namespacePath[i];
+ String id = path[i];
Object object = null;
if (serializer != null
@@ -909,14 +911,22 @@
return object;
}
- public Object put(String name, Object value) {
- // TODO
- throw new UnsupportedOperationException();
+ public Object put(String id, Object value) {
+ if (id == null) {
+ throw new IllegalArgumentException("id is null.");
+ }
+
+ includeSerializers.remove(id);
+ return namedObjects.put(id, value);
}
- public Object remove(String name) {
- // TODO
- throw new UnsupportedOperationException();
+ public Object remove(String id) {
+ if (id == null) {
+ throw new IllegalArgumentException("id is null.");
+ }
+
+ includeSerializers.remove(id);
+ return namedObjects.remove(id);
}
public boolean containsKey(String name) {
@@ -925,16 +935,16 @@
}
WTKXSerializer serializer = this;
- String[] namespacePath = name.split("\\.");
+ String[] path = name.split("\\.");
int i = 0;
- int n = namespacePath.length - 1;
+ int n = path.length - 1;
while (i < n && serializer != null) {
- String namespace = namespacePath[i++];
+ String namespace = path[i++];
serializer = serializer.includeSerializers.get(namespace);
}
- String id = namespacePath[i];
+ String id = path[i];
return serializer != null
&& serializer.namedObjects.containsKey(id);
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/AccordionTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/AccordionTest.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/AccordionTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/AccordionTest.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.wtk.test;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
@@ -27,7 +27,7 @@
public class AccordionTest implements Application {
private Frame frame = null;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
frame = (Frame)wtkxSerializer.readObject(this, "accordion_test.wtkx");
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/BorderTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/BorderTest.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/BorderTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/BorderTest.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.wtk.test;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Display;
@@ -27,7 +27,7 @@
public class BorderTest implements Application {
private Frame frame = null;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
frame = new Frame((Component)wtkxSerializer.readObject(getClass().getResource("border_test.wtkx")));
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/CardPaneTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/CardPaneTest.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/CardPaneTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/CardPaneTest.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.wtk.test;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.util.Vote;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Button;
@@ -30,14 +30,13 @@
import org.apache.pivot.wtkx.WTKX;
import org.apache.pivot.wtkx.WTKXSerializer;
-
public class CardPaneTest implements Application {
private Frame frame = null;
private Sheet sheet = null;
@WTKX private CardPane cardPane;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
frame = new Frame(new FlowPane());
frame.getStyles().put("padding", 0);
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/CheckedListViewTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/CheckedListViewTest.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/CheckedListViewTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/CheckedListViewTest.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.wtk.test;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.serialization.JSONSerializer;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Display;
@@ -27,7 +27,7 @@
public class CheckedListViewTest implements Application {
private Window window = null;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
ListView listView = new ListView(JSONSerializer.parseList("['One', 'Two', 'Three', 'Four']"));
listView.setSelectMode(ListView.SelectMode.MULTI);
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ColorListButtonTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ColorListButtonTest.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ColorListButtonTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ColorListButtonTest.java Mon Jun 15 19:27:31 2009
@@ -16,18 +16,17 @@
*/
package org.apache.pivot.wtk.test;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Frame;
import org.apache.pivot.wtkx.WTKXSerializer;
-
public class ColorListButtonTest implements Application {
private Frame frame = null;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
frame = new Frame((Component)wtkxSerializer.readObject(getClass().getResource("color_list_button_test.wtkx")));
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/DragDropTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/DragDropTest.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/DragDropTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/DragDropTest.java Mon Jun 15 19:27:31 2009
@@ -19,7 +19,7 @@
import java.awt.Color;
import java.io.IOException;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Display;
@@ -34,7 +34,6 @@
import org.apache.pivot.wtk.Visual;
import org.apache.pivot.wtk.media.Image;
-
public class DragDropTest implements Application {
private Frame frame1 = new Frame();
private Frame frame2 = new Frame();
@@ -42,7 +41,7 @@
private static final Color IMAGE_VIEW_BACKGROUND_COLOR = new Color(0x99, 0x99, 0x99);
private static final Color IMAGE_VIEW_DROP_HIGHLIGHT_COLOR = new Color(0xf0, 0xe6, 0x8c);
- public void startup(Display display, Dictionary<String, String> properties) throws Exception {
+ public void startup(Display display, Map<String, String> properties) throws Exception {
frame1.setTitle("Frame 1");
frame1.setPreferredSize(160, 120);
frame1.getStyles().put("resizable", false);
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserTest.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FileBrowserTest.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.wtk.test;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.collections.Sequence.Tree.Path;
import org.apache.pivot.io.Folder;
@@ -28,11 +28,10 @@
import org.apache.pivot.wtk.TreeViewBranchListener;
import org.apache.pivot.wtkx.WTKXSerializer;
-
public class FileBrowserTest implements Application {
private Frame frame = null;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
frame = new Frame((Component)wtkxSerializer.readObject(getClass().getResource("file_browser_test.wtkx")));
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FlowPaneTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FlowPaneTest.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FlowPaneTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FlowPaneTest.java Mon Jun 15 19:27:31 2009
@@ -16,18 +16,17 @@
*/
package org.apache.pivot.wtk.test;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Frame;
import org.apache.pivot.wtkx.WTKXSerializer;
-
public class FlowPaneTest implements Application {
private Frame frame = null;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
frame = new Frame((Component)wtkxSerializer.readObject(getClass().getResource("flow_pane_test.wtkx")));
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FormTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FormTest.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FormTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/FormTest.java Mon Jun 15 19:27:31 2009
@@ -16,18 +16,17 @@
*/
package org.apache.pivot.wtk.test;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Frame;
import org.apache.pivot.wtkx.WTKXSerializer;
-
public class FormTest implements Application {
private Frame frame = null;
- public void startup(Display display, Dictionary<String, String> properties)
+ public void startup(Display display, Map<String, String> properties)
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
frame = new Frame((Component)wtkxSerializer.readObject(getClass().getResource("form_test.wtkx")));
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/LabelTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/LabelTest.java?rev=784930&r1=784929&r2=784930&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/LabelTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/LabelTest.java Mon Jun 15 19:27:31 2009
@@ -16,7 +16,7 @@
*/
package org.apache.pivot.wtk.test;
-import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.FlowPane;
@@ -27,11 +27,10 @@
import org.apache.pivot.wtk.TextDecoration;
import org.apache.pivot.wtk.Window;
-
public class LabelTest implements Application {
private Window window = null;
- public void startup(Display display, Dictionary<String, String> properties) throws Exception {
+ public void startup(Display display, Map<String, String> properties) throws Exception {
window = new Window();
window.setTitle("Label Test");