Attachment 159165 Details for Bug 291213 – Fix v01

[patch] Fix v01

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

on 2010-02-16 06:24:11 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2010-02-16 06:24:11 EST

Size: 3.49 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.compare
>Index: compare/org/eclipse/compare/internal/CompareEditorMatchingStrategy.java
>===================================================================
>RCS file: compare/org/eclipse/compare/internal/CompareEditorMatchingStrategy.java
>diff -N compare/org/eclipse/compare/internal/CompareEditorMatchingStrategy.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ compare/org/eclipse/compare/internal/CompareEditorMatchingStrategy.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,47 @@
>+package org.eclipse.compare.internal;
>+
>+import org.eclipse.compare.CompareEditorInput;
>+import org.eclipse.compare.ITypedElement;
>+import org.eclipse.compare.ResourceNode;
>+import org.eclipse.compare.structuremergeviewer.ICompareInput;
>+import org.eclipse.core.resources.IFile;
>+import org.eclipse.ui.IEditorInput;
>+import org.eclipse.ui.IEditorMatchingStrategy;
>+import org.eclipse.ui.IEditorReference;
>+import org.eclipse.ui.part.FileEditorInput;
>+
>+public class CompareEditorMatchingStrategy implements IEditorMatchingStrategy {
>+
>+	public boolean matches(IEditorReference editorRef, IEditorInput input) {
>+		CompareEditor ce = (CompareEditor) editorRef.getPart(false);
>+		CompareEditorInput cei = (CompareEditorInput) ce.getEditorInput();
>+		Object compareResult = cei.getCompareResult();
>+		if (compareResult instanceof ICompareInput) {
>+			ICompareInput compareInput = (ICompareInput) compareResult;
>+			ITypedElement left = compareInput.getLeft();
>+			ITypedElement right = compareInput.getRight();
>+			if (input instanceof FileEditorInput) {
>+				IFile file = ((FileEditorInput) input).getFile();
>+				if (left instanceof ResourceNode) {
>+					ResourceNode rn = (ResourceNode) left;
>+					left = null; // don't compare by name
>+					if (file.equals(rn.getResource()))
>+						return true;
>+				}
>+				if (right instanceof ResourceNode) {
>+					ResourceNode rn = (ResourceNode) right;
>+					right = null; // don't compare by name
>+					if (file.equals(rn.getResource()))
>+						return true;
>+				}
>+				if (left != null && file.getName().equals(left.getName()))
>+					return true;
>+				// FIXME: this will result true for incoming deletion with the
>+				// same name (e.g. A.java) as other file being compared (change
>+				// in A.java on completely different path)
>+				return right != null && file.getName().equals(right.getName());
>+			}
>+		}
>+		return false;
>+	}
>+}
>Index: plugin.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml,v
>retrieving revision 1.70
>diff -u -r1.70 plugin.xml
>--- plugin.xml	23 Mar 2009 14:10:49 -0000	1.70
>+++ plugin.xml	16 Feb 2010 11:23:20 -0000
>@@ -77,11 +77,12 @@
>    <extension
>          point="org.eclipse.ui.editors">
>       <editor
>-            name="%defaultCompareEditor.name"
>-            icon="$nl$/icons/full/eview16/compare_view.gif"
>-            contributorClass="org.eclipse.compare.internal.CompareEditorContributor"
>             class="org.eclipse.compare.internal.CompareEditor"
>-            id="org.eclipse.compare.CompareEditor">
>+            contributorClass="org.eclipse.compare.internal.CompareEditorContributor"
>+            icon="$nl$/icons/full/eview16/compare_view.gif"
>+            id="org.eclipse.compare.CompareEditor"
>+            matchingStrategy="org.eclipse.compare.internal.CompareEditorMatchingStrategy"
>+            name="%defaultCompareEditor.name">
>       </editor>
>    </extension>
>

Actions: View | Diff

Attachments on bug 291213: 159165 | 159166 | 159412 | 159772