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/09/21 17:56:45 UTC
svn commit: r817301 - in /incubator/pivot/trunk:
tutorials/src/org/apache/pivot/tutorials/ wtk/src/org/apache/pivot/wtk/
wtk/src/org/apache/pivot/wtk/skin/terra/ wtk/test/org/apache/pivot/wtk/test/
Author: gbrown
Date: Mon Sep 21 15:56:45 2009
New Revision: 817301
URL: http://svn.apache.org/viewvc?rev=817301&view=rev
Log:
Add modal argument to dialogClosed() event.
Modified:
incubator/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/KitchenSink.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DialogCloseListener.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DialogStateListener.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java
incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ShutdownTest.java
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=817301&r1=817300&r2=817301&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 Sep 21 15:56:45 2009
@@ -862,7 +862,7 @@
alert.setOwner(window);
alert.open(window.getDisplay(), new DialogCloseListener() {
@Override
- public void dialogClosed(Dialog dialog) {
+ public void dialogClosed(Dialog dialog, boolean modal) {
dialog.setOwner(null);
}
});
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java?rev=817301&r1=817300&r2=817301&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Alert.java Mon Sep 21 15:56:45 2009
@@ -157,7 +157,7 @@
alert.getDialogStateListeners().add(new DialogStateListener.Adapter() {
@Override
- public void dialogClosed(Dialog dialog) {
+ public void dialogClosed(Dialog dialog, boolean modal) {
dialog.setOwner(null);
}
});
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java?rev=817301&r1=817300&r2=817301&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/Dialog.java Mon Sep 21 15:56:45 2009
@@ -45,9 +45,9 @@
}
@Override
- public void dialogClosed(Dialog dialog) {
+ public void dialogClosed(Dialog dialog, boolean modal) {
for (DialogStateListener listener : this) {
- listener.dialogClosed(dialog);
+ listener.dialogClosed(dialog, modal);
}
}
}
@@ -165,7 +165,8 @@
if (isClosed()) {
this.result = result;
- modal = false;
+ boolean modal = this.modal;
+ this.modal = false;
// Move the owner to the front
Window owner = getOwner();
@@ -175,10 +176,10 @@
}
// Notify listeners
- dialogStateListeners.dialogClosed(this);
+ dialogStateListeners.dialogClosed(this, modal);
if (dialogCloseListener != null) {
- dialogCloseListener.dialogClosed(this);
+ dialogCloseListener.dialogClosed(this, modal);
dialogCloseListener = null;
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DialogCloseListener.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DialogCloseListener.java?rev=817301&r1=817300&r2=817301&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DialogCloseListener.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DialogCloseListener.java Mon Sep 21 15:56:45 2009
@@ -25,5 +25,5 @@
*
* @param dialog
*/
- public void dialogClosed(Dialog dialog);
+ public void dialogClosed(Dialog dialog, boolean modal);
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DialogStateListener.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DialogStateListener.java?rev=817301&r1=817300&r2=817301&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DialogStateListener.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DialogStateListener.java Mon Sep 21 15:56:45 2009
@@ -36,7 +36,7 @@
}
@Override
- public void dialogClosed(Dialog dialog) {
+ public void dialogClosed(Dialog dialog, boolean modal) {
}
}
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java?rev=817301&r1=817300&r2=817301&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/skin/terra/TerraDialogSkin.java Mon Sep 21 15:56:45 2009
@@ -176,7 +176,7 @@
}
@Override
- public void dialogClosed(Dialog dialog) {
+ public void dialogClosed(Dialog dialog, boolean modal) {
// No-op
}
}
Modified: incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ShutdownTest.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ShutdownTest.java?rev=817301&r1=817300&r2=817301&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ShutdownTest.java (original)
+++ incubator/pivot/trunk/wtk/test/org/apache/pivot/wtk/test/ShutdownTest.java Mon Sep 21 15:56:45 2009
@@ -50,7 +50,7 @@
alert = new Alert(MessageType.QUESTION, "Cancel shutdown?", options);
alert.open(display, new DialogCloseListener() {
- public void dialogClosed(Dialog dialog) {
+ public void dialogClosed(Dialog dialog, boolean modal) {
Alert alert = (Alert)dialog;
if (alert.getResult()) {