Revert "Bug 512395 - "Copy all from right to left" has no effect in some

cases"

This reverts commit 4c395500d1ea10ec726ce49d3c66d0d43295aeb9.

Change-Id: I9d389fb7b2145db9df41d6467d7a1c89f3552409
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>

1 files changed, 20 insertions, 7 deletions

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index 7c120419d..31811ca77 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -4953,15 +4953,28 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
 			try {
 				for (Iterator<?> iterator = fMerger.changesIterator(); iterator.hasNext();) {
 					Diff diff = (Diff) iterator.next();
-					int kind = diff.getKind();
-					if (kind != RangeDifference.LEFT && kind != RangeDifference.RIGHT) {
+					switch (diff.getKind()) {
+					case RangeDifference.LEFT:
+						if (leftToRight) {
+							if (!compoundChangeStarted) {
+								target.beginCompoundChange();
+								compoundChangeStarted= true;
+							}
+							copy(diff, leftToRight);
+						}
+						break;
+					case RangeDifference.RIGHT:
+						if (!leftToRight) {
+							if (!compoundChangeStarted) {
+								target.beginCompoundChange();
+								compoundChangeStarted= true;
+							}
+							copy(diff, leftToRight);
+						}
+						break;
+					default:
 						continue;
 					}
-					if (!compoundChangeStarted) {
-						target.beginCompoundChange();
-						compoundChangeStarted = true;
-					}
-					copy(diff, leftToRight);
 				}
 			} finally {
 				if (compoundChangeStarted) {