Attachment 159117 Details for Bug 300238 – Fix v02

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

[patch] Fix v02

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

on 2010-02-15 11:26:31 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2010-02-15 11:26:31 EST

Size: 2.73 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.3
>diff -u -r1.3 ApplyPatchModelCompareEditorInput.java
>--- src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelCompareEditorInput.java	15 Feb 2010 13:09:44 -0000	1.3
>+++ src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelCompareEditorInput.java	15 Feb 2010 16:25:59 -0000
>@@ -13,9 +13,10 @@
> import org.eclipse.compare.CompareViewerPane;
> import org.eclipse.compare.ICompareNavigator;
> import org.eclipse.compare.internal.CompareEditorInputNavigator;
>+import org.eclipse.compare.internal.patch.PatchFileDiffNode;
> import org.eclipse.compare.structuremergeviewer.ICompareInput;
> import org.eclipse.jface.action.IMenuManager;
>-import org.eclipse.jface.viewers.StructuredSelection;
>+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;
>@@ -58,11 +59,33 @@
> 		super.contentsCreated();
> 		ICompareNavigator nav = getNavigator();
> 		if (nav instanceof CompareEditorInputNavigator) {
>-			CompareEditorInputNavigator cein = (CompareEditorInputNavigator) nav;
>-			Object pane = cein.getPanes()[0]; // the structure input pane
>+			final CompareEditorInputNavigator cein = (CompareEditorInputNavigator) nav;
>+			Object pane = cein.getPanes()[0]; // the structure input pane, top left
> 			if (pane instanceof CompareViewerPane) {
> 				CompareViewerPane cvp = (CompareViewerPane) pane;
> 				cvp.setSelection(StructuredSelection.EMPTY);
>+				cvp.addSelectionChangedListener(new ISelectionChangedListener() {
>+					public void selectionChanged(SelectionChangedEvent e) {
>+						feed1(cein);
>+					}
>+				});
>+				feed1(cein);
>+			}
>+		}
>+	}
>+
>+	// see org.eclipse.compare.CompareEditorInput.feed1(ISelection)
>+	private void feed1(CompareEditorInputNavigator cein) {
>+		if (getCompareInput() instanceof PatchFileDiffNode) {
>+			Object pane = cein.getPanes()[1]; // the top middle pane
>+			if (pane instanceof CompareViewerPane) {
>+				CompareViewerPane cvp = (CompareViewerPane) pane;
>+				cvp.setInput(getCompareInput());
>+			}
>+			pane = cein.getPanes()[2]; // the top right pane
>+			if (pane instanceof CompareViewerPane) {
>+				CompareViewerPane cvp = (CompareViewerPane) pane;
>+				cvp.setInput(null); // clear downstream pane
> 			}
> 		}
> 	}

Actions: View | Diff

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