View | Details | Raw Unified | Return to bug 277375 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java (-2 / +5 lines)
Lines 74-80 Link Here
74
	private static ITypedElement getFileElement(ICompareInput input,
74
	private static ITypedElement getFileElement(ICompareInput input,
75
			CompareEditorInput editorInput) {
75
			CompareEditorInput editorInput) {
76
		if (input.getLeft() instanceof LocalResourceTypedElement) {
76
		if (input.getLeft() instanceof LocalResourceTypedElement) {
77
			return (LocalResourceTypedElement) input.getLeft();
77
			return input.getLeft();
78
		}
78
		}
79
		if (editorInput instanceof CompareFileRevisionEditorInput) {
79
		if (editorInput instanceof CompareFileRevisionEditorInput) {
80
			return ((CompareFileRevisionEditorInput) editorInput).getLocalElement();
80
			return ((CompareFileRevisionEditorInput) editorInput).getLocalElement();
Lines 289-295 Link Here
289
			if (Display.getCurrent() != null) {
289
			if (Display.getCurrent() != null) {
290
				runnable.run();
290
				runnable.run();
291
			} else {
291
			} else {
292
				Display display = getPage().getWorkbenchWindow().getShell().getDisplay();
292
				IWorkbenchPage page = getPage();
293
				if (page == null)
294
					return false;
295
				Display display = page.getWorkbenchWindow().getShell().getDisplay();
293
				display.asyncExec(runnable);
296
				display.asyncExec(runnable);
294
			}
297
			}
295
			return true;
298
			return true;

Return to bug 277375