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/06/25 01:47:14 UTC
svn commit: r957752 - in /pivot/trunk/demos/src/org/apache/pivot/demos:
decorator/ dnd/ lists/ rss/ suggest/ tables/
Author: gbrown
Date: Thu Jun 24 23:47:13 2010
New Revision: 957752
URL: http://svn.apache.org/viewvc?rev=957752&view=rev
Log:
Update demos (as appropriate) to use Bindable.
Added:
pivot/trunk/demos/src/org/apache/pivot/demos/decorator/reflection_window.bxml
- copied unchanged from r957549, pivot/trunk/demos/src/org/apache/pivot/demos/decorator/reflection.bxml
pivot/trunk/demos/src/org/apache/pivot/demos/decorator/translucent_frame.bxml
- copied unchanged from r957549, pivot/trunk/demos/src/org/apache/pivot/demos/decorator/translucent.bxml
pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTableDemo.java
- copied, changed from r957549, pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTable.java
pivot/trunk/demos/src/org/apache/pivot/demos/tables/fixed_column_table_demo.bxml
- copied, changed from r957549, pivot/trunk/demos/src/org/apache/pivot/demos/tables/fixed_column_table.bxml
Removed:
pivot/trunk/demos/src/org/apache/pivot/demos/decorator/reflection.bxml
pivot/trunk/demos/src/org/apache/pivot/demos/decorator/translucent.bxml
pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTable.java
pivot/trunk/demos/src/org/apache/pivot/demos/tables/fixed_column_table.bxml
Modified:
pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java
pivot/trunk/demos/src/org/apache/pivot/demos/dnd/DragAndDropDemo.java
pivot/trunk/demos/src/org/apache/pivot/demos/dnd/FileDropTargetDemo.java
pivot/trunk/demos/src/org/apache/pivot/demos/dnd/drag_and_drop.bxml
pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.bxml
pivot/trunk/demos/src/org/apache/pivot/demos/lists/MultiSelect.java
pivot/trunk/demos/src/org/apache/pivot/demos/lists/multi_select.bxml
pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java
pivot/trunk/demos/src/org/apache/pivot/demos/rss/rss_feed_demo.bxml
pivot/trunk/demos/src/org/apache/pivot/demos/suggest/SuggestionDemo.java
pivot/trunk/demos/src/org/apache/pivot/demos/suggest/suggestion_demo.bxml
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=957752&r1=957751&r2=957752&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 Jun 24 23:47:13 2010
@@ -19,7 +19,6 @@ package org.apache.pivot.demos.decorator
import org.apache.pivot.beans.BeanSerializer;
import org.apache.pivot.collections.Map;
import org.apache.pivot.wtk.Application;
-import org.apache.pivot.wtk.Border;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.ComponentMouseListener;
import org.apache.pivot.wtk.DesktopApplicationContext;
@@ -29,22 +28,14 @@ import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.effects.FadeDecorator;
public class DecoratorDemo implements Application {
- private Window mainWindow = null;
private Window reflectionWindow = null;
private Frame translucentFrame = null;
@Override
public void startup(Display display, Map<String, String> properties) throws Exception {
- Border border = new Border();
- border.getStyles().put("color", 10);
- border.getStyles().put("backgroundColor", 3);
- mainWindow = new Window(border);
- mainWindow.setMaximized(true);
- mainWindow.open(display);
-
BeanSerializer beanSerializer = new BeanSerializer();
- reflectionWindow = (Window)beanSerializer.readObject(this, "reflection.bxml");
- translucentFrame = (Frame)beanSerializer.readObject(this, "translucent.bxml");
+ reflectionWindow = (Window)beanSerializer.readObject(this, "reflection_window.bxml");
+ translucentFrame = (Frame)beanSerializer.readObject(this, "translucent_frame.bxml");
final FadeDecorator fadeDecorator = new FadeDecorator();
translucentFrame.getDecorators().insert(fadeDecorator, 0);
@@ -63,7 +54,7 @@ public class DecoratorDemo implements Ap
}
});
- reflectionWindow.open(mainWindow);
+ reflectionWindow.open(display);
translucentFrame.open(reflectionWindow);
}
@@ -77,10 +68,6 @@ public class DecoratorDemo implements Ap
translucentFrame.close();
}
- if (mainWindow != null) {
- mainWindow.close();
- }
-
return false;
}
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/dnd/DragAndDropDemo.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/DragAndDropDemo.java?rev=957752&r1=957751&r2=957752&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/dnd/DragAndDropDemo.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/dnd/DragAndDropDemo.java Thu Jun 24 23:47:13 2010
@@ -19,16 +19,14 @@ package org.apache.pivot.demos.dnd;
import java.io.IOException;
import org.apache.pivot.beans.BXML;
-import org.apache.pivot.beans.BeanSerializer;
-import org.apache.pivot.collections.Map;
+import org.apache.pivot.beans.Bindable;
+import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.io.FileList;
-import org.apache.pivot.wtk.Application;
+import org.apache.pivot.util.Resources;
import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.ButtonPressListener;
import org.apache.pivot.wtk.Clipboard;
import org.apache.pivot.wtk.Component;
-import org.apache.pivot.wtk.DesktopApplicationContext;
-import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.DragSource;
import org.apache.pivot.wtk.DropAction;
import org.apache.pivot.wtk.DropTarget;
@@ -43,9 +41,7 @@ import org.apache.pivot.wtk.Visual;
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.media.Image;
-public class DragAndDropDemo implements Application {
- private Window window = null;
-
+public class DragAndDropDemo extends Window implements Bindable {
@BXML private Label label;
@BXML private PushButton copyTextButton;
@BXML private PushButton pasteTextButton;
@@ -57,12 +53,7 @@ public class DragAndDropDemo implements
@BXML private PushButton pasteFilesButton;
@Override
- public void startup(Display display, Map<String, String> properties)
- throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
- window = (Window)beanSerializer.readObject(this, "drag_and_drop.bxml");
- beanSerializer.bind(this, DragAndDropDemo.class);
-
+ public void initialize(Dictionary<String, Object> context, Resources resources) {
// Text
label.setDragSource(new DragSource() {
private LocalManifest content = null;
@@ -423,28 +414,5 @@ public class DragAndDropDemo implements
// TODO
}
});
-
- window.open(display);
- }
-
- @Override
- public boolean shutdown(boolean optional) {
- if (window != null) {
- window.close();
- }
-
- return false;
- }
-
- @Override
- public void suspend() {
- }
-
- @Override
- public void resume() {
- }
-
- public static void main(String[] args) {
- DesktopApplicationContext.main(DragAndDropDemo.class, args);
}
}
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/dnd/FileDropTargetDemo.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/FileDropTargetDemo.java?rev=957752&r1=957751&r2=957752&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/dnd/FileDropTargetDemo.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/dnd/FileDropTargetDemo.java Thu Jun 24 23:47:13 2010
@@ -20,19 +20,17 @@ import java.io.File;
import java.io.IOException;
import org.apache.pivot.beans.BXML;
-import org.apache.pivot.beans.BeanSerializer;
-import org.apache.pivot.collections.Map;
+import org.apache.pivot.beans.Bindable;
+import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.List;
import org.apache.pivot.collections.ListListener;
import org.apache.pivot.collections.Sequence;
import org.apache.pivot.io.FileList;
-import org.apache.pivot.wtk.Application;
+import org.apache.pivot.util.Resources;
import org.apache.pivot.wtk.Button;
import org.apache.pivot.wtk.ButtonPressListener;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.ComponentKeyListener;
-import org.apache.pivot.wtk.DesktopApplicationContext;
-import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.DropAction;
import org.apache.pivot.wtk.DropTarget;
import org.apache.pivot.wtk.Keyboard;
@@ -44,21 +42,14 @@ import org.apache.pivot.wtk.Span;
import org.apache.pivot.wtk.TableView;
import org.apache.pivot.wtk.Window;
-public class FileDropTargetDemo implements Application {
- private Window window = null;
-
+public class FileDropTargetDemo extends Window implements Bindable {
@BXML private TableView fileTableView;
@BXML private PushButton uploadButton;
private FileList fileList = null;
@Override
- public void startup(Display display, Map<String, String> properties)
- throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
- window = (Window)beanSerializer.readObject(this, "file_drop_target_demo.bxml");
- beanSerializer.bind(this, FileDropTargetDemo.class);
-
+ public void initialize(Dictionary<String, Object> context, Resources resources) {
fileList = new FileList();
fileTableView.setTableData(fileList);
@@ -160,31 +151,8 @@ public class FileDropTargetDemo implemen
uploadButton.getButtonPressListeners().add(new ButtonPressListener() {
@Override
public void buttonPressed(Button button) {
- Prompt.prompt(MessageType.INFO, "Pretending to upload...", window);
+ Prompt.prompt(MessageType.INFO, "Pretending to upload...", FileDropTargetDemo.this);
}
});
-
- window.open(display);
- }
-
- @Override
- public boolean shutdown(boolean optional) throws Exception {
- if (window != null) {
- window.close();
- }
-
- return false;
- }
-
- @Override
- public void suspend() {
- }
-
- @Override
- public void resume() {
- }
-
- public static void main(String[] args) {
- DesktopApplicationContext.main(FileDropTargetDemo.class, args);
}
}
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/dnd/drag_and_drop.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/drag_and_drop.bxml?rev=957752&r1=957751&r2=957752&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/dnd/drag_and_drop.bxml (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/dnd/drag_and_drop.bxml Thu Jun 24 23:47:13 2010
@@ -16,8 +16,9 @@ See the License for the specific languag
limitations under the License.
-->
-<Window title="Drag and Drop Demo" maximized="true"
+<dnd:DragAndDropDemo title="Drag and Drop Demo" maximized="true"
xmlns:bxml="http://pivot.apache.org/bxml"
+ xmlns:dnd="org.apache.pivot.demos.dnd"
xmlns="org.apache.pivot.wtk">
<TablePane styles="{padding:4, horizontalSpacing:4}">
<columns>
@@ -106,4 +107,4 @@ limitations under the License.
</Border>
</TablePane.Row>
</TablePane>
-</Window>
+</dnd:DragAndDropDemo>
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.bxml?rev=957752&r1=957751&r2=957752&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.bxml (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.bxml Thu Jun 24 23:47:13 2010
@@ -16,8 +16,9 @@ See the License for the specific languag
limitations under the License.
-->
-<Window title="File Drop Target Demo" maximized="true"
+<dnd:FileDropTargetDemo title="File Drop Target Demo" maximized="true"
xmlns:bxml="http://pivot.apache.org/bxml"
+ xmlns:dnd="org.apache.pivot.demos.dnd"
xmlns:terra="org.apache.pivot.wtk.skin.terra"
xmlns="org.apache.pivot.wtk">
<TablePane styles="{verticalSpacing:6}">
@@ -63,4 +64,4 @@ limitations under the License.
</BoxPane>
</TablePane.Row>
</TablePane>
-</Window>
+</dnd:FileDropTargetDemo>
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/lists/MultiSelect.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/lists/MultiSelect.java?rev=957752&r1=957751&r2=957752&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/lists/MultiSelect.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/lists/MultiSelect.java Thu Jun 24 23:47:13 2010
@@ -16,31 +16,25 @@
*/
package org.apache.pivot.demos.lists;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.Bindable;
import org.apache.pivot.collections.ArrayList;
-import org.apache.pivot.collections.Map;
+import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.Sequence;
-import org.apache.pivot.wtk.Application;
-import org.apache.pivot.wtk.DesktopApplicationContext;
+import org.apache.pivot.util.Resources;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.ListView;
import org.apache.pivot.wtk.ListViewSelectionListener;
import org.apache.pivot.wtk.Span;
import org.apache.pivot.wtk.Window;
-public class MultiSelect implements Application {
- private Window window = null;
+public class MultiSelect extends Window implements Bindable {
private ListView dataListView = null;
private ListView selectionListView = null;
@Override
- public void startup(Display display, Map<String, String> properties)
- throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
- window = (Window)beanSerializer.readObject(this, "multi_select.bxml");
-
- dataListView = (ListView)beanSerializer.get("dataListView");
- selectionListView = (ListView)beanSerializer.get("selectionListView");
+ public void initialize(Dictionary<String, Object> context, Resources resources) {
+ dataListView = (ListView)context.get("dataListView");
+ selectionListView = (ListView)context.get("selectionListView");
dataListView.getListViewSelectionListeners().add(new ListViewSelectionListener() {
@Override
@@ -58,35 +52,17 @@ public class MultiSelect implements Appl
refreshSelectionListData();
}
});
-
- refreshSelectionListData();
-
- window.open(display);
- dataListView.requestFocus();
}
@Override
- public boolean shutdown(boolean optional) {
- if (window != null) {
- window.close();
- }
-
- return false;
- }
+ public void open(Display display, Window owner) {
+ super.open(display, owner);
- @Override
- public void suspend() {
- }
-
- @Override
- public void resume() {
+ refreshSelectionListData();
+ dataListView.requestFocus();
}
private void refreshSelectionListData() {
selectionListView.setListData(new ArrayList<Span>(dataListView.getSelectedRanges()));
}
-
- public static void main(String[] args) {
- DesktopApplicationContext.main(MultiSelect.class, args);
- }
}
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/lists/multi_select.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/lists/multi_select.bxml?rev=957752&r1=957751&r2=957752&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/lists/multi_select.bxml (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/lists/multi_select.bxml Thu Jun 24 23:47:13 2010
@@ -16,10 +16,11 @@ See the License for the specific languag
limitations under the License.
-->
-<Window title="Multiple Selection Demo" maximized="true"
+<lists:MultiSelect title="Multiple Selection Demo" maximized="true"
xmlns:bxml="http://pivot.apache.org/bxml"
xmlns:collections="org.apache.pivot.collections"
xmlns:content="org.apache.pivot.wtk.content"
+ xmlns:lists="org.apache.pivot.demos.lists"
xmlns="org.apache.pivot.wtk">
<TablePane styles="{horizontalSpacing:8}">
<columns>
@@ -44,4 +45,4 @@ limitations under the License.
</Border>
</TablePane.Row>
</TablePane>
-</Window>
+</lists:MultiSelect>
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java?rev=957752&r1=957751&r2=957752&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/rss/RSSFeedDemo.java Thu Jun 24 23:47:13 2010
@@ -22,17 +22,15 @@ import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.URL;
-import org.apache.pivot.beans.BeanSerializer;
-import org.apache.pivot.collections.Map;
+import org.apache.pivot.beans.Bindable;
+import org.apache.pivot.collections.Dictionary;
+import org.apache.pivot.util.Resources;
import org.apache.pivot.util.concurrent.Task;
import org.apache.pivot.util.concurrent.TaskListener;
import org.apache.pivot.web.GetQuery;
-import org.apache.pivot.wtk.Application;
import org.apache.pivot.wtk.CardPane;
import org.apache.pivot.wtk.Component;
import org.apache.pivot.wtk.ComponentMouseButtonListener;
-import org.apache.pivot.wtk.DesktopApplicationContext;
-import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.Label;
import org.apache.pivot.wtk.ListView;
import org.apache.pivot.wtk.Mouse;
@@ -42,20 +40,16 @@ import org.apache.pivot.xml.Element;
import org.apache.pivot.xml.XML;
import org.apache.pivot.xml.XMLSerializer;
-public class RSSFeedDemo implements Application {
- private Window window = null;
+public class RSSFeedDemo extends Window implements Bindable {
private ListView feedListView = null;
private CardPane cardPane = null;
private Label statusLabel = null;
@Override
- public void startup(Display display, Map<String, String> properties)
- throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
- window = (Window)beanSerializer.readObject(this, "rss_feed_demo.bxml");
- feedListView = (ListView)beanSerializer.get("feedListView");
- cardPane = (CardPane)beanSerializer.get("cardPane");
- statusLabel = (Label)beanSerializer.get("statusLabel");
+ public void initialize(Dictionary<String, Object> context, Resources resources) {
+ feedListView = (ListView)context.get("feedListView");
+ cardPane = (CardPane)context.get("cardPane");
+ statusLabel = (Label)context.get("statusLabel");
feedListView.getComponentMouseButtonListeners().add(new ComponentMouseButtonListener.Adapter() {
private int index = -1;
@@ -103,29 +97,5 @@ public class RSSFeedDemo implements Appl
statusLabel.setText(task.getFault().toString());
}
}));
-
- window.setMaximized(true);
- window.open(display);
- }
-
- @Override
- public boolean shutdown(boolean optional) throws Exception {
- if (window != null) {
- window.close();
- }
-
- return false;
- }
-
- @Override
- public void suspend() {
- }
-
- @Override
- public void resume() {
- }
-
- public static void main(String[] args) {
- DesktopApplicationContext.main(RSSFeedDemo.class, args);
}
}
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/rss/rss_feed_demo.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/rss/rss_feed_demo.bxml?rev=957752&r1=957751&r2=957752&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/rss/rss_feed_demo.bxml (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/rss/rss_feed_demo.bxml Thu Jun 24 23:47:13 2010
@@ -16,7 +16,7 @@ See the License for the specific languag
limitations under the License.
-->
-<Window title="RSS Feed Demo" maximized="true"
+<rss:RSSFeedDemo title="RSS Feed Demo" maximized="true"
xmlns:bxml="http://pivot.apache.org/bxml"
xmlns:effects="org.apache.pivot.wtk.effects"
xmlns:rss="org.apache.pivot.demos.rss"
@@ -34,4 +34,4 @@ limitations under the License.
</ScrollPane>
</CardPane>
</Border>
-</Window>
+</rss:RSSFeedDemo>
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/suggest/SuggestionDemo.java
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/suggest/SuggestionDemo.java?rev=957752&r1=957751&r2=957752&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/suggest/SuggestionDemo.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/suggest/SuggestionDemo.java Thu Jun 24 23:47:13 2010
@@ -23,16 +23,15 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLEncoder;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.Bindable;
+import org.apache.pivot.collections.Dictionary;
import org.apache.pivot.collections.List;
-import org.apache.pivot.collections.Map;
import org.apache.pivot.json.JSON;
+import org.apache.pivot.util.Resources;
import org.apache.pivot.util.concurrent.Task;
import org.apache.pivot.util.concurrent.TaskListener;
import org.apache.pivot.web.GetQuery;
import org.apache.pivot.wtk.ActivityIndicator;
-import org.apache.pivot.wtk.Application;
-import org.apache.pivot.wtk.DesktopApplicationContext;
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.SuggestionPopup;
import org.apache.pivot.wtk.SuggestionPopupCloseListener;
@@ -41,8 +40,7 @@ import org.apache.pivot.wtk.TextInput;
import org.apache.pivot.wtk.TextInputCharacterListener;
import org.apache.pivot.wtk.Window;
-public class SuggestionDemo implements Application {
- private Window window = null;
+public class SuggestionDemo extends Window implements Bindable {
private TextInput textInput = null;
private ActivityIndicator activityIndicator = null;
@@ -50,11 +48,9 @@ public class SuggestionDemo implements A
private GetQuery suggestionQuery = null;
@Override
- public void startup(Display display, Map<String, String> properties) throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
- window = (Window)beanSerializer.readObject(this, "suggestion_demo.bxml");
- textInput = (TextInput)beanSerializer.get("textInput");
- activityIndicator = (ActivityIndicator)beanSerializer.get("activityIndicator");
+ public void initialize(Dictionary<String, Object> context, Resources resources) {
+ textInput = (TextInput)context.get("textInput");
+ activityIndicator = (ActivityIndicator)context.get("activityIndicator");
textInput.getTextInputCharacterListeners().add(new TextInputCharacterListener() {
@Override
@@ -71,8 +67,11 @@ public class SuggestionDemo implements A
suggestionPopup.close();
}
});
+ }
- window.open(display);
+ @Override
+ public void open(Display display, Window owner) {
+ super.open(display, owner);
textInput.requestFocus();
}
@@ -154,25 +153,4 @@ public class SuggestionDemo implements A
activityIndicator.setActive(true);
}
-
- @Override
- public boolean shutdown(boolean optional) {
- if (window != null) {
- window.close();
- }
-
- return false;
- }
-
- @Override
- public void suspend() {
- }
-
- @Override
- public void resume() {
- }
-
- public static void main(String[] args) {
- DesktopApplicationContext.main(SuggestionDemo.class, args);
- }
}
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/suggest/suggestion_demo.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/suggest/suggestion_demo.bxml?rev=957752&r1=957751&r2=957752&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/suggest/suggestion_demo.bxml (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/suggest/suggestion_demo.bxml Thu Jun 24 23:47:13 2010
@@ -16,8 +16,9 @@ See the License for the specific languag
limitations under the License.
-->
-<Window title="Suggestion Demo" maximized="true"
+<suggest:SuggestionDemo title="Suggestion Demo" maximized="true"
xmlns:bxml="http://pivot.apache.org/bxml"
+ xmlns:suggest="org.apache.pivot.demos.suggest"
xmlns="org.apache.pivot.wtk">
<Border>
<FlowPane styles="{padding:6, alignToBaseline:true}">
@@ -26,4 +27,4 @@ limitations under the License.
<ActivityIndicator bxml:id="activityIndicator"/>
</FlowPane>
</Border>
-</Window>
+</suggest:SuggestionDemo>
Copied: pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTableDemo.java (from r957549, pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTable.java)
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTableDemo.java?p2=pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTableDemo.java&p1=pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTable.java&r1=957549&r2=957752&rev=957752&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTable.java (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/tables/FixedColumnTableDemo.java Thu Jun 24 23:47:13 2010
@@ -16,13 +16,11 @@
*/
package org.apache.pivot.demos.tables;
-import org.apache.pivot.beans.BeanSerializer;
+import org.apache.pivot.beans.Bindable;
+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.wtk.Application;
-import org.apache.pivot.wtk.DesktopApplicationContext;
-import org.apache.pivot.wtk.Display;
+import org.apache.pivot.util.Resources;
import org.apache.pivot.wtk.Span;
import org.apache.pivot.wtk.TableView;
import org.apache.pivot.wtk.TableViewSelectionListener;
@@ -30,20 +28,16 @@ import org.apache.pivot.wtk.TableViewSor
import org.apache.pivot.wtk.Window;
import org.apache.pivot.wtk.content.TableViewRowComparator;
-public class FixedColumnTable implements Application {
- private Window window = null;
+public class FixedColumnTableDemo extends Window implements Bindable {
private TableView primaryTableView = null;
private TableView fixedTableView = null;
private boolean synchronizingSelection = false;
@Override
- public void startup(Display display, Map<String, String> properties)
- throws Exception {
- BeanSerializer beanSerializer = new BeanSerializer();
- window = (Window)beanSerializer.readObject(this, "fixed_column_table.bxml");
- primaryTableView = (TableView)beanSerializer.get("primaryTableView");
- fixedTableView = (TableView)beanSerializer.get("fixedTableView");
+ public void initialize(Dictionary<String, Object> context, Resources resources) {
+ primaryTableView = (TableView)context.get("primaryTableView");
+ fixedTableView = (TableView)context.get("fixedTableView");
// Keep selection state in sync
primaryTableView.getTableViewSelectionListeners().add(new TableViewSelectionListener() {
@@ -130,28 +124,5 @@ public class FixedColumnTable implements
tableData.setComparator(new TableViewRowComparator(tableView));
}
});
-
- window.open(display);
- }
-
- @Override
- public boolean shutdown(boolean optional) {
- if (window != null) {
- window.close();
- }
-
- return false;
- }
-
- @Override
- public void suspend() {
- }
-
- @Override
- public void resume() {
- }
-
- public static void main(String[] args) {
- DesktopApplicationContext.main(FixedColumnTable.class, args);
}
}
Copied: pivot/trunk/demos/src/org/apache/pivot/demos/tables/fixed_column_table_demo.bxml (from r957549, pivot/trunk/demos/src/org/apache/pivot/demos/tables/fixed_column_table.bxml)
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/tables/fixed_column_table_demo.bxml?p2=pivot/trunk/demos/src/org/apache/pivot/demos/tables/fixed_column_table_demo.bxml&p1=pivot/trunk/demos/src/org/apache/pivot/demos/tables/fixed_column_table.bxml&r1=957549&r2=957752&rev=957752&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/tables/fixed_column_table.bxml (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/tables/fixed_column_table_demo.bxml Thu Jun 24 23:47:13 2010
@@ -16,8 +16,9 @@ See the License for the specific languag
limitations under the License.
-->
-<Window title="Fixed Column Table Demo" maximized="true"
+<tables:FixedColumnTableDemo title="Fixed Column Table Demo" maximized="true"
xmlns:bxml="http://pivot.apache.org/bxml"
+ xmlns:tables="org.apache.pivot.demos.tables"
xmlns="org.apache.pivot.wtk">
<bxml:define xmlns="org.apache.pivot.collections">
<ArrayList bxml:id="tableData">
@@ -71,4 +72,4 @@ limitations under the License.
</corner>
</ScrollPane>
</Border>
-</Window>
+</tables:FixedColumnTableDemo>