|
Lines 1667-1681
Link Here
|
| 1667 |
} |
1667 |
} |
| 1668 |
|
1668 |
|
| 1669 |
// set new documents |
1669 |
// set new documents |
| 1670 |
setDocument(fLeft, 'L', left); |
1670 |
setDocument(fLeft, 'L', left, null); |
| 1671 |
fLeftLineCount= fLeft.getLineCount(); |
1671 |
fLeftLineCount= fLeft.getLineCount(); |
| 1672 |
fLeftEncoding= getEncoding(left); |
1672 |
fLeftEncoding= getEncoding(left); |
| 1673 |
|
1673 |
|
| 1674 |
setDocument(fRight, 'R', right); |
1674 |
setDocument(fRight, 'R', right, fLeftEncoding); |
| 1675 |
fRightLineCount= fRight.getLineCount(); |
1675 |
fRightLineCount= fRight.getLineCount(); |
| 1676 |
fRightEncoding= getEncoding(right); |
1676 |
fRightEncoding= getEncoding(fLeftEncoding); |
| 1677 |
|
1677 |
|
| 1678 |
setDocument(fAncestor, 'A', ancestor); |
1678 |
setDocument(fAncestor, 'A', ancestor, fLeftEncoding); |
| 1679 |
|
1679 |
|
| 1680 |
updateHeader(); |
1680 |
updateHeader(); |
| 1681 |
updateControls(); |
1681 |
updateControls(); |
|
Lines 1899-1905
Link Here
|
| 1899 |
/* |
1899 |
/* |
| 1900 |
* Returns true if a new Document could be installed. |
1900 |
* Returns true if a new Document could be installed. |
| 1901 |
*/ |
1901 |
*/ |
| 1902 |
private boolean setDocument(MergeSourceViewer tp, char type, Object o) { |
1902 |
private boolean setDocument(MergeSourceViewer tp, char type, Object o, String encoding) { |
| 1903 |
|
1903 |
|
| 1904 |
if (tp == null) |
1904 |
if (tp == null) |
| 1905 |
return false; |
1905 |
return false; |
|
Lines 1922-1928
Link Here
|
| 1922 |
String s= null; |
1922 |
String s= null; |
| 1923 |
|
1923 |
|
| 1924 |
try { |
1924 |
try { |
| 1925 |
s= Utilities.readString(sca); |
1925 |
s= (encoding == null ? Utilities.readString(sca) : Utilities.readString(sca.getContents(), encoding)); |
| 1926 |
} catch (CoreException ex) { |
1926 |
} catch (CoreException ex) { |
| 1927 |
setError(type, ex.getMessage()); |
1927 |
setError(type, ex.getMessage()); |
| 1928 |
} |
1928 |
} |
