View | Details | Raw Unified | Return to bug 259422 | Differences between
and this patch

Collapse All | Expand All

(-)compare/org/eclipse/compare/internal/DocLineComparator.java (-20 / +17 lines)
Lines 45-74 Link Here
45
		fIgnoreWhiteSpace= ignoreWhiteSpace;
45
		fIgnoreWhiteSpace= ignoreWhiteSpace;
46
46
47
		fLineOffset= 0;
47
		fLineOffset= 0;
48
		if (region != null) {
48
		if (region == null) {
49
			fLength= region.getLength();
49
			region = new Region(0, fDocument.getLength());
50
			int start= region.getOffset();
50
		}
51
		fLength= region.getLength();
52
		int start= region.getOffset();
53
		try {
54
			fLineOffset= fDocument.getLineOfOffset(start);
55
		} catch (BadLocationException ex) {
56
			// silently ignored
57
		}
58
59
		if (fLength == 0)
60
			fLineCount= 0;
61
		else {
62
			int endLine= fDocument.getNumberOfLines();
51
			try {
63
			try {
52
				fLineOffset= fDocument.getLineOfOffset(start);
64
				endLine= fDocument.getLineOfOffset(start + fLength);
53
			} catch (BadLocationException ex) {
65
			} catch (BadLocationException ex) {
54
				// silently ignored
66
				// silently ignored
55
			}
67
			}
56
68
			fLineCount= endLine - fLineOffset + 1;
57
			if (fLength == 0)
58
				fLineCount= 0;
59
			else {
60
				int endLine= fDocument.getNumberOfLines();
61
				try {
62
					endLine= fDocument.getLineOfOffset(start + fLength);
63
				} catch (BadLocationException ex) {
64
					// silently ignored
65
				}
66
				fLineCount= endLine - fLineOffset + 1;
67
			}
68
69
		} else {
70
			fLength= document.getLength();
71
			fLineCount= fDocument.getNumberOfLines();
72
		}
69
		}
73
	}
70
	}
74
71

Return to bug 259422