Attachment 176547 Details for Bug 322329 – Closing the editor when cancelled during init

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Closing the editor when cancelled during init

clipboard.txt (text/plain), 1.59 KB, created by Tomasz Zarna

on 2010-08-13 08:28:46 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2010-08-13 08:28:46 EDT

Size: 1.59 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.compare
>Index: compare/org/eclipse/compare/internal/CompareEditor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java,v
>retrieving revision 1.84
>diff -u -r1.84 CompareEditor.java
>--- compare/org/eclipse/compare/internal/CompareEditor.java	9 Apr 2010 13:06:32 -0000	1.84
>+++ compare/org/eclipse/compare/internal/CompareEditor.java	13 Aug 2010 12:21:39 -0000
>@@ -366,11 +366,11 @@
> 						newState[0] = CANCELED;
> 					Display.getDefault().syncExec(new Runnable() {
> 						public void run() {
>+							if (fPageBook.isDisposed())
>+								return;
> 							// we need to register the saveable if we had a previous input or if
> 							// there are knownSaveables (which means that the workbench called
> 							// getSaveables and got an empty list
>-							if (monitor.isCanceled() || fPageBook.isDisposed())
>-								return;
> 							if (hadPreviousInput || (knownSaveables != null && !isAllSaveablesKnown())) {
> 								registerSaveable();
> 							}
>@@ -448,6 +448,12 @@
> 					closeEditor();
> 				}
> 			} else if (fControl == null && getState() != CREATING_CONTROL) {
>+				if (getState() == CANCELED) {
>+					// Close the editor when we are canceled, even when compare
>+					// result has been already prepared
>+					closeEditor();
>+					return;
>+				}
> 				// Set the state in case this method gets called again
> 				setState(CREATING_CONTROL);
> 				if (getSite().getSelectionProvider() == null)

Actions: View | Diff

Attachments on bug 322329: 176337 | 176338 | 176444 | 176538 | 176547