Attachment 159006 Details for Bug 300238 – Fix v01

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

[patch] Fix v01

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

on 2010-02-12 12:45:18 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2010-02-12 12:45:18 EST

Size: 2.33 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.ui
>Index: src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelCompareEditorInput.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelCompareEditorInput.java,v
>retrieving revision 1.2
>diff -u -r1.2 ApplyPatchModelCompareEditorInput.java
>--- src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelCompareEditorInput.java	26 Jan 2010 12:35:04 -0000	1.2
>+++ src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelCompareEditorInput.java	12 Feb 2010 17:11:02 -0000
>@@ -10,8 +10,12 @@
>  *******************************************************************************/
> package org.eclipse.team.internal.ui.synchronize.patch;
> 
>+import org.eclipse.compare.CompareViewerPane;
>+import org.eclipse.compare.ICompareNavigator;
>+import org.eclipse.compare.internal.CompareEditorInputNavigator;
> import org.eclipse.compare.structuremergeviewer.ICompareInput;
> import org.eclipse.jface.action.IMenuManager;
>+import org.eclipse.jface.viewers.*;
> import org.eclipse.team.internal.ui.mapping.ModelCompareEditorInput;
> import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
> import org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant;
>@@ -49,4 +53,31 @@
> 		manager.insertAfter("merge", mergeAction); //$NON-NLS-1$
> 		*/
> 	}
>+
>+	protected void contentsCreated() {
>+		super.contentsCreated();
>+		ICompareNavigator nav = getNavigator();
>+		if (nav instanceof CompareEditorInputNavigator) {
>+			final CompareEditorInputNavigator cein = (CompareEditorInputNavigator) nav;
>+			Object pane = cein.getPanes()[0];
>+			if (pane instanceof CompareViewerPane) {
>+				CompareViewerPane cvp = (CompareViewerPane) pane;
>+				cvp.setSelection(StructuredSelection.EMPTY);
>+				cvp.addSelectionChangedListener(new ISelectionChangedListener() {
>+					public void selectionChanged(SelectionChangedEvent e) {
>+						feed2(cein);
>+					}
>+				});
>+				feed2(cein);
>+			}
>+		}
>+	}
>+
>+	private void feed2(CompareEditorInputNavigator cein) {
>+		Object pane = cein.getPanes()[1];
>+		if (pane instanceof CompareViewerPane) {
>+			CompareViewerPane cvp = (CompareViewerPane) pane;
>+			cvp.setInput(getCompareInput());
>+		}
>+	}
> }

Actions: View | Diff

Attachments on bug 300238: 156685 | 156686 | 156687 | 159006 | 159007 | 159117