Attachment 215172 Details for Bug 202435 – patch v0.1

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

[patch] patch v0.1

patch202435.txt (text/plain), 1.72 KB, created by Marek Chodorowski

on 2012-05-07 06:19:40 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Chodorowski

Created: 2012-05-07 06:19:40 EDT

Size: 1.72 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java
>index 463d8d1..1dc18b9 100644
>--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java
>+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007, 2010 IBM Corporation and others.
>+ * Copyright (c) 2007, 2012 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -1221,13 +1221,12 @@
> 		return fAllDiffs.iterator();
> 	}
> 	
>-	public boolean isFirstChildDiff(char contributor, int startOffset,
>-			Diff diff) {
>+	public boolean isFirstChildDiff(char contributor, int start, Diff diff) {
> 		if (!diff.hasChildren())
> 			return false;
> 		Diff d = (Diff)diff.fDiffs.get(0);
> 		Position p= d.getPosition(contributor);
>-		return (p.getOffset() >= startOffset);
>+		return (p.getOffset() >= start);
> 	}
> 	
> 	public Diff getWrappedDiff(Diff diff, boolean down) {
>@@ -1393,7 +1392,7 @@
> 					} else if (start >= startOffset) {
> 						// If we are at or before the first diff, select the 
> 						// entire diff so next and previous are symmetrical
>-						if (isFirstChildDiff(contributor, startOffset, diff)) {
>+						if (isFirstChildDiff(contributor, start, diff)) {
> 							return diff;
> 						}
> 						d= findPrev(contributor, diff.fDiffs, start, end, deep);

Actions: View | Diff

Attachments on bug 202435: 215172