diff options
author | Michael Valenta | 2007-04-24 14:41:56 +0000 |
---|---|---|
committer | Michael Valenta | 2007-04-24 14:41:56 +0000 |
commit | 8d54d83066264082928503cb58bdd5934bba6808 (patch) | |
tree | 856f2a962f4d03d69e35a234969bb489efa2fcd2 /bundles/org.eclipse.team.cvs.ui | |
parent | 9e93981eb975b311ff4e615e99b5246db9ac4b11 (diff) | |
download | eclipse.platform.team-8d54d83066264082928503cb58bdd5934bba6808.tar.gz eclipse.platform.team-8d54d83066264082928503cb58bdd5934bba6808.tar.xz eclipse.platform.team-8d54d83066264082928503cb58bdd5934bba6808.zip |
Bug 182868 DBCS3.3: compare displays bogus if invoked at History view
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui')
-rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java index 2ac7ea05a..5eb7024ba 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java @@ -1625,13 +1625,26 @@ public class CVSHistoryPage extends HistoryPage implements IAdaptable, IHistoryC IFileRevision selectedFileRevision = (IFileRevision)object; if (fileElement == null) fileElement = SaveableCompareEditorInput.createFileElement((IFile) file.getIResource()); - FileRevisionTypedElement right = new FileRevisionTypedElement(selectedFileRevision); + FileRevisionTypedElement right = new FileRevisionTypedElement(selectedFileRevision, getLocalEncoding()); DiffNode node = new DiffNode(fileElement, right); return node; } return null; } + private String getLocalEncoding() { + IResource resource = file.getIResource(); + if (resource instanceof IFile) { + IFile file = (IFile) resource; + try { + return file.getCharset(); + } catch (CoreException e) { + CVSUIPlugin.log(e); + } + } + return null; + } + public void setClickAction(boolean compare) { //toggleCompareAction is going to switch the mode //so make sure that we're in the appropriate mode before |