diff options
| author | Andre Weinand | 2001-07-17 16:02:33 +0000 |
|---|---|---|
| committer | Andre Weinand | 2001-07-17 16:02:33 +0000 |
| commit | 33300f9edd058265c1d76b3490398bd3308866f6 (patch) | |
| tree | 15eba758f16d778b4acf68e7017385fa677ada92 | |
| parent | 5a278caea15f61d9bc59713f0d6a9e57eb5e6756 (diff) | |
| download | eclipse.platform.team-33300f9edd058265c1d76b3490398bd3308866f6.tar.gz eclipse.platform.team-33300f9edd058265c1d76b3490398bd3308866f6.tar.xz eclipse.platform.team-33300f9edd058265c1d76b3490398bd3308866f6.zip | |
Fixed a comment
2 files changed, 4 insertions, 6 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java index f5ebc7b4d..c877a54ba 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java @@ -10,7 +10,7 @@ import org.eclipse.compare.rangedifferencer.IRangeComparator; import org.eclipse.compare.contentmergeviewer.ITokenComparator;
/**
- * Implements the <code>ITokenComparator</code> interface for lines in a document.
+ * Implements the <code>IRangeComparator</code> interface for lines in a document.
* A <code>DocLineComparator</code> is used as the input for the <code>RangeDifferencer</code>
* engine to perform a line oriented compare on documents.
* <p>
@@ -95,10 +95,9 @@ public class DocLineComparator implements IRangeComparator { * @return the contents of the line as a String
*/
public String extract(int line) {
- line += fLineOffset;
if (line < fLineCount) {
try {
- IRegion r= fDocument.getLineInformation(line);
+ IRegion r= fDocument.getLineInformation(fLineOffset + line);
return fDocument.get(r.getOffset(), r.getLength());
// return fDocument.getLine(line);
} catch(BadLocationException e) {
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java index f5ebc7b4d..c877a54ba 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/DocLineComparator.java @@ -10,7 +10,7 @@ import org.eclipse.compare.rangedifferencer.IRangeComparator; import org.eclipse.compare.contentmergeviewer.ITokenComparator;
/**
- * Implements the <code>ITokenComparator</code> interface for lines in a document.
+ * Implements the <code>IRangeComparator</code> interface for lines in a document.
* A <code>DocLineComparator</code> is used as the input for the <code>RangeDifferencer</code>
* engine to perform a line oriented compare on documents.
* <p>
@@ -95,10 +95,9 @@ public class DocLineComparator implements IRangeComparator { * @return the contents of the line as a String
*/
public String extract(int line) {
- line += fLineOffset;
if (line < fLineCount) {
try {
- IRegion r= fDocument.getLineInformation(line);
+ IRegion r= fDocument.getLineInformation(fLineOffset + line);
return fDocument.get(r.getOffset(), r.getLength());
// return fDocument.getLine(line);
} catch(BadLocationException e) {
|