diff options
| author | Lars Vogel | 2016-10-25 17:18:28 +0000 |
|---|---|---|
| committer | Sergey Prigogin | 2016-10-29 18:06:43 +0000 |
| commit | 0184c987caf65aef45ba64d52d73953f59fce02f (patch) | |
| tree | 68c305a8d9c6883d3f32c27e3a0b9810b983cf14 /bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer | |
| parent | 766d0c7fb4f68d718956006332af34b3ea01ee70 (diff) | |
| download | eclipse.platform.team-0184c987caf65aef45ba64d52d73953f59fce02f.tar.gz eclipse.platform.team-0184c987caf65aef45ba64d52d73953f59fce02f.tar.xz eclipse.platform.team-0184c987caf65aef45ba64d52d73953f59fce02f.zip | |
Bug 506518 - Add @Override to org.eclipse.compare.core.
Change-Id: I5f15a0d84360ca5a4a62fa349b1fc27d22b12262
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Diffstat (limited to 'bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer')
3 files changed, 10 insertions, 0 deletions
diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java index 2cf00732e..c4cd87844 100644 --- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java +++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java @@ -41,22 +41,27 @@ import org.eclipse.core.runtime.SubMonitor; this.comparator2 = comparator2; } + @Override protected int getLength1() { return this.comparator1.getRangeCount(); } + @Override protected int getLength2() { return this.comparator2.getRangeCount(); } + @Override protected void initializeLcs(int lcsLength) { this.lcs = new int[2][lcsLength]; } + @Override protected boolean isRangeEqual(int i1, int i2) { return this.comparator1.rangesEqual(i1, this.comparator2, i2); } + @Override protected void setLcs(int sl1, int sl2) { // Add one to the values so that 0 can mean that the slot is empty this.lcs[0][sl1] = sl1 + 1; @@ -182,6 +187,7 @@ import org.eclipse.core.runtime.SubMonitor; /* (non-Javadoc) * @see org.eclipse.compare.internal.LCS#longestCommonSubsequence(org.eclipse.core.runtime.SubMonitor) */ + @Override public void longestCommonSubsequence(SubMonitor subMonitor) { super.longestCommonSubsequence(subMonitor); if (this.lcs != null) { // The LCS can be null if one of the sides is empty diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeDifference.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeDifference.java index 05584b816..24bd5f46f 100644 --- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeDifference.java +++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeDifference.java @@ -257,6 +257,7 @@ public class RangeDifference { return Math.max(this.rightLength, Math.max(this.leftLength, this.ancestorLength)); } + @Override public boolean equals(Object obj) { if (obj instanceof RangeDifference) { RangeDifference other = (RangeDifference) obj; @@ -271,6 +272,7 @@ public class RangeDifference { return super.equals(obj); } + @Override public int hashCode() { final int prime = 31; int result = 1; @@ -284,6 +286,7 @@ public class RangeDifference { return result; } + @Override public String toString() { StringBuffer buf = new StringBuffer("RangeDifference {"); //$NON-NLS-1$ switch (this.kind) { diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeDifferencer.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeDifferencer.java index a4984cf23..e91a8b4bc 100644 --- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeDifferencer.java +++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeDifferencer.java @@ -42,6 +42,7 @@ public final class RangeDifferencer { private static final RangeDifference[] EMPTY_RESULT= new RangeDifference[0]; private static final AbstractRangeDifferenceFactory defaultFactory = new AbstractRangeDifferenceFactory() { + @Override protected RangeDifference createRangeDifference() { return new RangeDifference(RangeDifference.NOCHANGE); } |