diff options
| author | Laurent Redor | 2014-03-11 16:57:26 +0000 |
|---|---|---|
| committer | Laurent Redor | 2014-03-14 08:11:47 +0000 |
| commit | 361e0eccf42054b056fe5528392ac953be0714b4 (patch) | |
| tree | 1e937246aa939102cda2a4deaef75a7deaf1bf83 | |
| parent | c088cb034e68b59d082d0c26043dbff111f9c266 (diff) | |
| download | org.eclipse.sirius-361e0eccf42054b056fe5528392ac953be0714b4.tar.gz org.eclipse.sirius-361e0eccf42054b056fe5528392ac953be0714b4.tar.xz org.eclipse.sirius-361e0eccf42054b056fe5528392ac953be0714b4.zip | |
[430121] Unexpected behavior when escaping the save dialog
The behavior when you close the "save dialog" is now the same as if you
click on "Cancel" button.
Bug: 430121
Change-Id: I515dfe53c3998e210d1cf919eac44663b4839467
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
| -rw-r--r-- | plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/SWTUtil.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/SWTUtil.java b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/SWTUtil.java index 9e36a9f516..53a5655911 100644 --- a/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/SWTUtil.java +++ b/plugins/org.eclipse.sirius.common.ui/src/org/eclipse/sirius/common/ui/tools/api/util/SWTUtil.java @@ -18,6 +18,9 @@ import org.eclipse.jface.dialogs.MessageDialogWithToggle; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.window.Window; import org.eclipse.osgi.util.NLS; +import org.eclipse.sirius.common.ui.tools.api.dialog.SiriusMessageDialogWithToggle; +import org.eclipse.sirius.common.ui.tools.internal.util.ISaveDialogExtensionDescriptor; +import org.eclipse.sirius.common.ui.tools.internal.util.ISaveDialogExtensionRegistry; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; @@ -41,10 +44,6 @@ import org.eclipse.ui.part.PageBook; import com.google.common.collect.Maps; -import org.eclipse.sirius.common.ui.tools.api.dialog.SiriusMessageDialogWithToggle; -import org.eclipse.sirius.common.ui.tools.internal.util.ISaveDialogExtensionDescriptor; -import org.eclipse.sirius.common.ui.tools.internal.util.ISaveDialogExtensionRegistry; - /** * Utility class to avoid verbose SWT code. * @@ -467,9 +466,9 @@ public final class SWTUtil { choice = dialog.open(); - // User pressed "Escape" + // User has pressed "Escape" or has closed the dialog if (choice == SWT.DEFAULT) { - choice = ISaveablePart2.CANCEL; + choice = IDialogConstants.CANCEL_ID; } // React to the use preference choice. |