Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/DocumentMerger.java6
1 files changed, 3 insertions, 3 deletions
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 12dc5d0d8..faa11e67a 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
@@ -976,7 +976,7 @@ public class DocumentMerger {
return region;
}
- public Diff findDiff(Position p, boolean left) {
+ public Diff findDiff(Position p, boolean left) {
for (Iterator<Diff> iterator = fAllDiffs.iterator(); iterator.hasNext();) {
Diff diff = iterator.next();
Position diffPos;
@@ -1150,7 +1150,7 @@ public class DocumentMerger {
while (e.hasNext()) {
Diff diff= e.next();
int h= synchronizedScrolling ? diff.getMaxDiffHeight()
- : diff.getRightHeight();
+ : diff.getRightHeight();
if (useChange(diff.getKind()) && !diff.fIsWhitespace) {
yy= (y*size.y)/virtualHeight;
@@ -1282,7 +1282,7 @@ public class DocumentMerger {
for (Iterator<Diff> iterator = changesIterator(); iterator.hasNext();) {
Diff diff = iterator.next();
if (diff.isDeleted() || diff.getKind() == RangeDifference.NOCHANGE)
- continue;
+ continue;
if (diff.overlaps(contributor, rangeStart, rangeEnd, getDocument(contributor).getLength()))
return diff;
}

Back to the top