Revert "Bug 512395 - "Copy all from right to left" has no effect in some cases"
This reverts commit 4c395500d1ea10ec726ce49d3c66d0d43295aeb9.
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 f2d3426..5b07e4b 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
@@ -4869,15 +4869,28 @@
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) {
