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/24 15:56:47 UTC
svn commit: r788023 - 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/itunes/ de...
Author: gbrown
Date: Wed Jun 24 13:56:45 2009
New Revision: 788023
URL: http://svn.apache.org/viewvc?rev=788023&view=rev
Log:
Return true from shutdown() to cancel rather than false to approve.
Added:
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ShutdownTest.java
- copied, changed from r787859, incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ReflectionDecoratorTest.java
Removed:
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ReflectionDecoratorTest.java
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/dom/DOMTest.java
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/itunes/SearchDemo.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/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/TabPanes.java
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/progress/ActivityIndicators.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/DesktopApplicationContext.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ScriptApplication.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.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/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/WindowFocusTest.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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -44,7 +44,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -65,7 +65,7 @@
translucentFrame.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -389,7 +389,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -56,7 +56,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/itunes/SearchDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/itunes/SearchDemo.java?rev=788023&r1=788022&r2=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/itunes/SearchDemo.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/itunes/SearchDemo.java Wed Jun 24 13:56:45 2009
@@ -86,7 +86,11 @@
@Override
public boolean shutdown(boolean optional) {
- return true;
+ if (window != null) {
+ window.close();
+ }
+
+ return false;
}
@Override
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -206,7 +206,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -75,7 +75,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -288,7 +288,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -56,7 +56,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -132,7 +132,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -33,6 +33,7 @@
import org.apache.pivot.wtk.ButtonPressListener;
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.Frame;
import org.apache.pivot.wtk.ListButton;
@@ -380,8 +381,11 @@
}
public boolean shutdown(boolean optional) throws Exception {
- // No-op
- return true;
+ if (window != null) {
+ window.close();
+ }
+
+ return false;
}
public void suspend() throws Exception {
@@ -391,4 +395,8 @@
public void resume() throws Exception {
// No-op
}
+
+ public static void main(String[] args) {
+ DesktopApplicationContext.main(HTTPClient.class, args);
+ }
}
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -49,8 +49,11 @@
}
public boolean shutdown(boolean optional) {
- window.close();
- return true;
+ if (window != null) {
+ window.close();
+ }
+
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -38,7 +38,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -841,7 +841,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -70,7 +70,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -60,7 +60,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -54,7 +54,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -63,7 +63,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -38,7 +38,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -59,7 +59,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -109,8 +109,6 @@
window.close();
}
- window = null;
-
return false;
}
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -37,7 +37,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -37,7 +37,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -80,7 +80,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -77,7 +77,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -38,7 +38,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -37,7 +37,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -80,7 +80,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -88,7 +88,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -115,7 +115,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -101,7 +101,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -75,7 +75,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -61,7 +61,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -38,7 +38,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -182,7 +182,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -138,7 +138,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -90,7 +90,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -20,6 +20,9 @@
/**
* Represents the entry point into a WTK application.
+ * <p>
+ * These methods are called by the application context. In general, they should
+ * not be invoked directly by the application.
*
* @author gbrown
*/
@@ -54,10 +57,10 @@
*
* @param optional
* If <tt>true</tt>, the shutdown may be canceled by returning a value of
- * <tt>false</tt>.
+ * <tt>true</tt>.
*
* @return
- * <tt>true</tt> to continue shutdown, <tt>false</tt> to cancel.
+ * <tt>true</tt> to cancel shutdown, <tt>false</tt> to continue.
*/
public boolean shutdown(boolean optional) throws Exception;
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java?rev=788023&r1=788022&r2=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java Wed Jun 24 13:56:45 2009
@@ -152,17 +152,17 @@
* Terminates the application context.
*/
public static void exit() {
- boolean shutdown = true;
+ boolean cancelShutdown = true;
try {
- shutdown = application.shutdown(true);
+ cancelShutdown = application.shutdown(true);
} catch(Exception exception) {
exception.printStackTrace();
Alert.alert(MessageType.ERROR, exception.getMessage(),
applicationContext.getDisplay());
}
- if (shutdown) {
+ if (!cancelShutdown) {
destroyTimer();
windowedHostFrame.dispose();
fullScreenHostFrame.dispose();
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -51,8 +51,11 @@
}
public boolean shutdown(boolean optional) {
- window.close();
- return true;
+ if (window != null) {
+ window.close();
+ }
+
+ return false;
}
public void resume() {
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java?rev=788023&r1=788022&r2=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Sheet.java Wed Jun 24 13:56:45 2009
@@ -66,7 +66,6 @@
ApplicationContext.beep();
moveToFront();
- restoreFocus();
}
return false;
@@ -175,6 +174,13 @@
}
}
+ @Override
+ public void moveToFront() {
+ super.moveToFront();
+
+ restoreFocus();
+ }
+
public SheetCloseListener getSheetCloseListener() {
return sheetCloseListener;
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java?rev=788023&r1=788022&r2=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java Wed Jun 24 13:56:45 2009
@@ -1525,7 +1525,8 @@
if (showBranchControls) {
Sequence<Path> paths = treeView.getSelectedPaths();
- if (paths != null) {
+ if (paths != null
+ && paths.getLength() > 0) {
Path path = paths.get(paths.getLength() - 1);
NodeInfo nodeInfo = getNodeInfoAt(path);
@@ -1548,7 +1549,8 @@
if (showBranchControls) {
Sequence<Path> paths = treeView.getSelectedPaths();
- if (paths != null) {
+ if (paths != null
+ && paths.getLength() > 0) {
Path path = paths.get(paths.getLength() - 1);
NodeInfo nodeInfo = getNodeInfoAt(path);
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -39,7 +39,7 @@
frame.close();
}
- return true;
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -37,8 +37,11 @@
}
public boolean shutdown(boolean optional) {
- frame.close();
- return true;
+ if (frame != null) {
+ frame.close();
+ }
+
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -90,7 +90,7 @@
frame.close();
}
- return true;
+ return false;
}
public void resume() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -42,8 +42,11 @@
}
public boolean shutdown(boolean optional) {
- window.close();
- return true;
+ if (window != null) {
+ window.close();
+ }
+
+ return false;
}
public void resume() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -36,8 +36,11 @@
}
public boolean shutdown(boolean optional) {
- frame.close();
- return true;
+ if (frame != null) {
+ frame.close();
+ }
+
+ return false;
}
public void resume() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -172,9 +172,15 @@
}
public boolean shutdown(boolean optional) {
- frame1.close();
- frame2.close();
- return true;
+ if (frame1 != null) {
+ frame1.close();
+ }
+
+ if (frame2 != null) {
+ frame2.close();
+ }
+
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -59,8 +59,11 @@
}
public boolean shutdown(boolean optional) {
- frame.close();
- return true;
+ if (frame != null) {
+ frame.close();
+ }
+
+ return false;
}
public void suspend() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -36,8 +36,11 @@
}
public boolean shutdown(boolean optional) {
- frame.close();
- return true;
+ if (frame != null) {
+ frame.close();
+ }
+
+ return false;
}
public void resume() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -36,8 +36,11 @@
}
public boolean shutdown(boolean optional) {
- frame.close();
- return true;
+ if (frame != null) {
+ frame.close();
+ }
+
+ return false;
}
public void resume() {
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=788023&r1=788022&r2=788023&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 Wed Jun 24 13:56:45 2009
@@ -71,8 +71,11 @@
}
public boolean shutdown(boolean optional) {
- window.close();
- return true;
+ if (window != null) {
+ window.close();
+ }
+
+ return false;
}
public void suspend() {
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/LinkButtonTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/LinkButtonTest.java?rev=788023&r1=788022&r2=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/LinkButtonTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/LinkButtonTest.java Wed Jun 24 13:56:45 2009
@@ -77,8 +77,11 @@
}
public boolean shutdown(boolean optional) {
- window.close();
- return true;
+ if (window != null) {
+ window.close();
+ }
+
+ return false;
}
public void suspend() {
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ListViewSelectionTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ListViewSelectionTest.java?rev=788023&r1=788022&r2=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ListViewSelectionTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ListViewSelectionTest.java Wed Jun 24 13:56:45 2009
@@ -134,7 +134,7 @@
}
public boolean shutdown(boolean optional) {
- return true;
+ return false;
}
public void suspend() {
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ListViewTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ListViewTest.java?rev=788023&r1=788022&r2=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ListViewTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ListViewTest.java Wed Jun 24 13:56:45 2009
@@ -67,8 +67,11 @@
}
public boolean shutdown(boolean optional) {
- window.close();
- return true;
+ if (window != null) {
+ window.close();
+ }
+
+ return false;
}
public void suspend() {
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/NativeDragDropTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/NativeDragDropTest.java?rev=788023&r1=788022&r2=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/NativeDragDropTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/NativeDragDropTest.java Wed Jun 24 13:56:45 2009
@@ -142,8 +142,11 @@
}
public boolean shutdown(boolean optional) {
- frame.close();
- return true;
+ if (frame != null) {
+ frame.close();
+ }
+
+ return false;
}
public void suspend() {
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/PanoramaTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/PanoramaTest.java?rev=788023&r1=788022&r2=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/PanoramaTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/PanoramaTest.java Wed Jun 24 13:56:45 2009
@@ -51,8 +51,14 @@
}
public boolean shutdown(boolean optional) {
- frame1.close();
- frame2.close();
+ if (frame1 != null) {
+ frame1.close();
+ }
+
+ if (frame2 != null) {
+ frame2.close();
+ }
+
return false;
}
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/PushButtonTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/PushButtonTest.java?rev=788023&r1=788022&r2=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/PushButtonTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/PushButtonTest.java Wed Jun 24 13:56:45 2009
@@ -49,7 +49,7 @@
window.close();
}
- return true;
+ return false;
}
public void suspend() {
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SheetTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SheetTest.java?rev=788023&r1=788022&r2=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SheetTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SheetTest.java Wed Jun 24 13:56:45 2009
@@ -108,8 +108,11 @@
}
public boolean shutdown(boolean optional) {
- frame.close();
- return true;
+ if (frame != null) {
+ frame.close();
+ }
+
+ return false;
}
public void suspend() {
Copied: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ShutdownTest.java (from r787859, incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ReflectionDecoratorTest.java)
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ShutdownTest.java?p2=incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ShutdownTest.java&p1=incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ReflectionDecoratorTest.java&r1=787859&r2=788023&rev=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ReflectionDecoratorTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ShutdownTest.java Wed Jun 24 13:56:45 2009
@@ -26,12 +26,14 @@
import org.apache.pivot.wtk.Display;
import org.apache.pivot.wtk.MessageType;
-public class ReflectionDecoratorTest implements Application {
+public class ShutdownTest implements Application {
Display display = null;
- boolean shutdown = false;
+ boolean cancelShutdown = true;
public void startup(Display display, Map<String, String> properties) {
this.display = display;
+ cancelShutdown = true;
+
System.out.println("startup()");
}
@@ -39,24 +41,24 @@
System.out.println("shutdown()");
ArrayList<String> options = new ArrayList<String>();
- options.add("OK");
- options.add("Cancel");
+ options.add("Yes");
+ options.add("No");
- Alert alert = new Alert(MessageType.QUESTION, "Shutdown?", options);
+ Alert alert = new Alert(MessageType.QUESTION, "Cancel shutdown?", options);
alert.open(display, new DialogCloseListener() {
public void dialogClosed(Dialog dialog) {
Alert alert = (Alert)dialog;
if (alert.getResult()) {
- if (alert.getSelectedOption() == 0) {
- shutdown = true;
+ if (alert.getSelectedOption() == 1) {
+ cancelShutdown = false;
DesktopApplicationContext.exit();
}
}
}
});
- return shutdown;
+ return cancelShutdown;
}
public void suspend() {
@@ -64,4 +66,8 @@
public void resume() {
}
+
+ public static void main(String[] args) {
+ DesktopApplicationContext.main(ShutdownTest.class, args);
+ }
}
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SliderTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SliderTest.java?rev=788023&r1=788022&r2=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SliderTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SliderTest.java Wed Jun 24 13:56:45 2009
@@ -50,8 +50,11 @@
}
public boolean shutdown(boolean optional) {
- window.close();
- return true;
+ if (window != null) {
+ window.close();
+ }
+
+ return false;
}
public void resume() {
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SpinnerFocusTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SpinnerFocusTest.java?rev=788023&r1=788022&r2=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SpinnerFocusTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/SpinnerFocusTest.java Wed Jun 24 13:56:45 2009
@@ -53,8 +53,11 @@
}
public boolean shutdown(boolean optional) {
- frame.close();
- return true;
+ if (frame != null) {
+ frame.close();
+ }
+
+ return false;
}
public void suspend() {
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/TablePaneTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/TablePaneTest.java?rev=788023&r1=788022&r2=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/TablePaneTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/TablePaneTest.java Wed Jun 24 13:56:45 2009
@@ -44,8 +44,11 @@
}
public boolean shutdown(boolean optional) {
- window.close();
- return true;
+ if (window != null) {
+ window.close();
+ }
+
+ return false;
}
public void suspend() {
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/TagDecoratorTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/TagDecoratorTest.java?rev=788023&r1=788022&r2=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/TagDecoratorTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/TagDecoratorTest.java Wed Jun 24 13:56:45 2009
@@ -44,8 +44,11 @@
}
public boolean shutdown(boolean optional) {
- frame.close();
- return true;
+ if (frame!= null) {
+ frame.close();
+ }
+
+ return false;
}
public void suspend() {
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/TextInputValidatorTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/TextInputValidatorTest.java?rev=788023&r1=788022&r2=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/TextInputValidatorTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/TextInputValidatorTest.java Wed Jun 24 13:56:45 2009
@@ -108,8 +108,11 @@
}
public boolean shutdown(boolean optional) {
- window.close();
- return true;
+ if (window != null) {
+ window.close();
+ }
+
+ return false;
}
public void resume() {
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/WindowFocusTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/WindowFocusTest.java?rev=788023&r1=788022&r2=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/WindowFocusTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/WindowFocusTest.java Wed Jun 24 13:56:45 2009
@@ -49,15 +49,11 @@
frame1.close();
}
- frame1 = null;
-
if (frame2 != null) {
frame2.close();
}
- frame2 = null;
-
- return true;
+ return false;
}
@Override
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/WindowTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/WindowTest.java?rev=788023&r1=788022&r2=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/WindowTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/WindowTest.java Wed Jun 24 13:56:45 2009
@@ -126,8 +126,11 @@
}
public boolean shutdown(boolean optional) {
- window1.close();
- return true;
+ if (window1 != null) {
+ window1.close();
+ }
+
+ return false;
}
public void suspend() {
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/text/test/TextAreaTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/text/test/TextAreaTest.java?rev=788023&r1=788022&r2=788023&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/text/test/TextAreaTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/text/test/TextAreaTest.java Wed Jun 24 13:56:45 2009
@@ -127,8 +127,11 @@
}
public boolean shutdown(boolean optional) {
- frame.close();
- return true;
+ if (frame != null) {
+ frame.close();
+ }
+
+ return false;
}
public void suspend() {