Attachment 140943 Details for Bug 277375 – Fix v01

[patch] Fix v01

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

on 2009-07-07 06:23:08 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2009-07-07 06:23:08 EDT

Size: 1.39 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.ui
>Index: src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java,v
>retrieving revision 1.19
>diff -u -r1.19 SaveableCompareEditorInput.java
>--- src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java	17 Apr 2009 09:04:53 -0000	1.19
>+++ src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java	7 Jul 2009 10:21:45 -0000
>@@ -74,7 +74,7 @@
> 	private static ITypedElement getFileElement(ICompareInput input,
> 			CompareEditorInput editorInput) {
> 		if (input.getLeft() instanceof LocalResourceTypedElement) {
>-			return (LocalResourceTypedElement) input.getLeft();
>+			return input.getLeft();
> 		}
> 		if (editorInput instanceof CompareFileRevisionEditorInput) {
> 			return ((CompareFileRevisionEditorInput) editorInput).getLocalElement();
>@@ -289,7 +289,10 @@
> 			if (Display.getCurrent() != null) {
> 				runnable.run();
> 			} else {
>-				Display display = getPage().getWorkbenchWindow().getShell().getDisplay();
>+				IWorkbenchPage page = getPage();
>+				if (page == null)
>+					return false;
>+				Display display = page.getWorkbenchWindow().getShell().getDisplay();
> 				display.asyncExec(runnable);
> 			}
> 			return true;

Actions: View | Diff

Attachments on bug 277375: 140943 | 140944 | 152596