diff options
author | Lars Vogel | 2016-12-08 18:31:44 +0000 |
---|---|---|
committer | Lars Vogel | 2016-12-08 18:33:05 +0000 |
commit | 7bc0f2b7e258f7855e4260f20fe07f2e8265e75b (patch) | |
tree | 21daac28d7ccd924201868772c573b2ebed41edd /bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TokenComparator.java | |
parent | c98b91a62b388046c27ce91943eba202c56f662a (diff) | |
download | eclipse.platform.team-7bc0f2b7e258f7855e4260f20fe07f2e8265e75b.tar.gz eclipse.platform.team-7bc0f2b7e258f7855e4260f20fe07f2e8265e75b.tar.xz eclipse.platform.team-7bc0f2b7e258f7855e4260f20fe07f2e8265e75b.zip |
Bug 508941 - Add @Override and @Deprecated to org.eclipse.compare
This change was done via Cleanup actions.
Change-Id: I89fe3a04dbe1ec6fba009d770b8827c0b458efb8
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TokenComparator.java')
-rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TokenComparator.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TokenComparator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TokenComparator.java index 1ceed1234..dc5aab797 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TokenComparator.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TokenComparator.java @@ -71,6 +71,7 @@ public class TokenComparator implements ITokenComparator { /* (non-Javadoc) * @see org.eclipse.compare.rangedifferencer.IRangeComparator#getRangeCount() */ + @Override public int getRangeCount() { return fCount; } @@ -78,6 +79,7 @@ public class TokenComparator implements ITokenComparator { /* (non-Javadoc) * @see org.eclipse.compare.contentmergeviewer.ITokenComparator#getTokenStart(int) */ + @Override public int getTokenStart(int index) { if (index < fCount) return fStarts[index]; @@ -87,6 +89,7 @@ public class TokenComparator implements ITokenComparator { /* (non-Javadoc) * @see org.eclipse.compare.contentmergeviewer.ITokenComparator#getTokenLength(int) */ + @Override public int getTokenLength(int index) { if (index < fCount) return fLengths[index]; @@ -96,6 +99,7 @@ public class TokenComparator implements ITokenComparator { /* (non-Javadoc) * @see org.eclipse.compare.rangedifferencer.IRangeComparator#rangesEqual(int, org.eclipse.compare.rangedifferencer.IRangeComparator, int) */ + @Override public boolean rangesEqual(int thisIndex, IRangeComparator other, int otherIndex) { if (other != null && getClass() == other.getClass()) { TokenComparator tc= (TokenComparator) other; @@ -110,6 +114,7 @@ public class TokenComparator implements ITokenComparator { /* (non-Javadoc) * @see org.eclipse.compare.rangedifferencer.IRangeComparator#skipRangeComparison(int, int, org.eclipse.compare.rangedifferencer.IRangeComparator) */ + @Override public boolean skipRangeComparison(int length, int max, IRangeComparator other) { if (getRangeCount() < 50 || other.getRangeCount() < 50) |