diff options
Diffstat (limited to 'bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer')
4 files changed, 22 insertions, 27 deletions
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/DifferencesIterator.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/DifferencesIterator.java index 3c4be7f87..0ad70b4f4 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/DifferencesIterator.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/DifferencesIterator.java @@ -24,7 +24,7 @@ import java.util.List; RangeDifference[] fArray; RangeDifference fDifference; - /** + /* * Creates a differences iterator on an array of <code>RangeDifference</code>s. */ DifferencesIterator(RangeDifference[] differenceRanges) { @@ -38,14 +38,14 @@ import java.util.List; fDifference= null; } - /** + /* * Returns the number of RangeDifferences */ int getCount() { return fRange.size(); } - /** + /* * Appends the edit to its list and moves to the next <code>RangeDifference</code>. */ void next() { @@ -58,7 +58,7 @@ import java.util.List; } } - /** + /* * Difference iterators are used in pairs. * This method returns the other iterator. */ @@ -68,7 +68,7 @@ import java.util.List; return right; } - /** + /* * Removes all <code>RangeDifference</code>s */ void removeAll() { diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/LinkedRangeDifference.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/LinkedRangeDifference.java index cd9ef08e7..0d06930bf 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/LinkedRangeDifference.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/LinkedRangeDifference.java @@ -17,7 +17,7 @@ package org.eclipse.compare.rangedifferencer; LinkedRangeDifference fNext; - /** + /* * Creates a LinkedRangeDifference an initializes it to the error state */ LinkedRangeDifference() { @@ -25,7 +25,7 @@ package org.eclipse.compare.rangedifferencer; fNext= null; } - /** + /* * Constructs and links a LinkeRangeDifference to another LinkedRangeDifference */ LinkedRangeDifference(LinkedRangeDifference next, int operation) { @@ -33,7 +33,7 @@ package org.eclipse.compare.rangedifferencer; fNext= next; } - /** + /* * Follows the next link */ LinkedRangeDifference getNext() { @@ -48,7 +48,7 @@ package org.eclipse.compare.rangedifferencer; return kind() == INSERT; } - /** + /* * Sets the next link of this LinkedRangeDifference */ void setNext(LinkedRangeDifference next) { diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifference.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifference.java index 9a8b15d50..8d75eae7e 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifference.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifference.java @@ -71,7 +71,7 @@ public class RangeDifference { * Creates a new <code>RangeDifference</code> with the given change kind * and left and right ranges. * - * @param changeKind the kind of change + * @param kind the kind of change * @param rightStart start index of entity on right side * @param rightLength number of entities on right side * @param leftStart start index of entity on left side @@ -89,7 +89,7 @@ public class RangeDifference { * Creates a new <code>RangeDifference</code> with the given change kind * and left, right, and ancestor ranges. * - * @param changeKind the kind of change + * @param kind the kind of change * @param rightStart start index of entity on right side * @param rightLength number of entities on right side * @param leftStart start index of entity on left side diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifferencer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifferencer.java index d3cb46313..31cbc8214 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifferencer.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/rangedifferencer/RangeDifferencer.java @@ -44,7 +44,8 @@ public final class RangeDifferencer { /* (non Javadoc) * Non instantiatiable! */ - private RangeDifferencer() { + private RangeDifferencer() { + // nothing to do } /** @@ -93,8 +94,8 @@ public final class RangeDifferencer { int row, col; // find common prefix - for (row= 0; row < rightSize && row < leftSize && rangesEqual(right, row, left, row) == true; ++row) - ; + for (row= 0; row < rightSize && row < leftSize && rangesEqual(right, row, left, row) == true;) + row++; lastDiagonal[origin]= row; script[origin]= null; @@ -381,7 +382,7 @@ public final class RangeDifferencer { //---- private methods - /** + /* * Creates a Vector of DifferencesRanges out of the LinkedRangeDifference. * It coalesces adjacent changes. * In addition, indices are changed such that the ranges are 1) open, i.e, @@ -445,18 +446,12 @@ public final class RangeDifferencer { return (RangeDifference[]) result.toArray(EMPTY_RESULT); } - /** + /* * Creates a <code>RangeDifference3</code> given the * state of two DifferenceIterators. */ - private static RangeDifference createRangeDifference3( - DifferencesIterator myIter, - DifferencesIterator yourIter, - List diff3, - IRangeComparator right, - IRangeComparator left, - int changeRangeStart, - int changeRangeEnd) { + private static RangeDifference createRangeDifference3(DifferencesIterator myIter, DifferencesIterator yourIter, List diff3, + IRangeComparator right, IRangeComparator left, int changeRangeStart, int changeRangeEnd) { int rightStart, rightEnd; int leftStart, leftEnd; @@ -498,14 +493,14 @@ public final class RangeDifferencer { return new RangeDifference(kind, rightStart, rightEnd - rightStart, leftStart, leftEnd - leftStart, changeRangeStart, changeRangeEnd - changeRangeStart); } - /** + /* * Tests if two ranges are equal */ private static boolean rangesEqual(IRangeComparator a, int ai, IRangeComparator b, int bi) { return a.rangesEqual(ai, b, bi); } - /** + /* * Tests whether <code>right</code> and <code>left</left> changed in the same way */ private static boolean rangeSpansEqual(IRangeComparator right, int rightStart, int rightLen, IRangeComparator left, int leftStart, int leftLen) { @@ -521,7 +516,7 @@ public final class RangeDifferencer { return false; } - /** + /* * Reverses the range differences */ private static LinkedRangeDifference reverseDifferences(LinkedRangeDifference start) { |