diff options
| author | Stefan Lay | 2012-09-03 07:34:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2012-09-03 07:34:09 +0000 |
| commit | 4a5d2fadecceb63c4b22f8c35e0d5de7f669ca99 (patch) | |
| tree | b8aca890a6e1fa2db695dc269ba5a651a4e8d767 | |
| parent | 03513ef305f3d4f8414ab7ac2624b6d2ca75b3ee (diff) | |
| parent | 06b624b2d07f8f82b9c756728e324e4b75013ee5 (diff) | |
| download | egit-4a5d2fadecceb63c4b22f8c35e0d5de7f669ca99.tar.gz egit-4a5d2fadecceb63c4b22f8c35e0d5de7f669ca99.tar.xz egit-4a5d2fadecceb63c4b22f8c35e0d5de7f669ca99.zip | |
Merge "Correct encoding for compare views of Tree Compare"
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/FileRevisionTypedElement.java | 8 | ||||
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java | 20 |
2 files changed, 14 insertions, 14 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/FileRevisionTypedElement.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/FileRevisionTypedElement.java index c88fa681a3..10638c44a5 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/FileRevisionTypedElement.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/FileRevisionTypedElement.java @@ -35,14 +35,6 @@ public class FileRevisionTypedElement extends StorageTypedElement { /** * @param fileRevision * the file revision - */ - public FileRevisionTypedElement(IFileRevision fileRevision) { - this(fileRevision, null); - } - - /** - * @param fileRevision - * the file revision * @param localEncoding * the encoding of the local file that corresponds to the given * file revision diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java index 261ba3ea03..1c8f223f87 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java @@ -238,9 +238,11 @@ public class CompareTreeView extends ViewPart { left = new GitCompareFileRevisionEditorInput.EmptyTypedElement(NLS .bind(UIText.CompareTreeView_ItemNotFoundInVersionMessage, rightRevision.getName(), getBaseVersion())); - right = new FileRevisionTypedElement(rightRevision); + right = new FileRevisionTypedElement(rightRevision, null); } else if (selected instanceof PathNode) { PathNode node = (PathNode) selected; + String encoding = CompareCoreUtils.getResourceEncoding( + repositoryMapping.getRepository(), node.getRepoRelativePath()); switch (node.type) { case FILE_BOTH_SIDES_DIFFER: // fall through @@ -248,16 +250,16 @@ public class CompareTreeView extends ViewPart { // open a compare editor with both sides filled GitFileRevision rightRevision = compareVersionMap .get(node.path); - right = new FileRevisionTypedElement(rightRevision); + right = new FileRevisionTypedElement(rightRevision, encoding); GitFileRevision leftRevision = baseVersionMap.get(node.path); - left = new FileRevisionTypedElement(leftRevision); + left = new FileRevisionTypedElement(leftRevision, encoding); break; } case FILE_DELETED: { // open compare editor with left side empty GitFileRevision rightRevision = compareVersionMap .get(node.path); - right = new FileRevisionTypedElement(rightRevision); + right = new FileRevisionTypedElement(rightRevision, encoding); left = new GitCompareFileRevisionEditorInput.EmptyTypedElement( NLS .bind( @@ -269,7 +271,7 @@ public class CompareTreeView extends ViewPart { case FILE_ADDED: { // open compare editor with right side empty GitFileRevision leftRevision = baseVersionMap.get(node.path); - left = new FileRevisionTypedElement(leftRevision); + left = new FileRevisionTypedElement(leftRevision, encoding); right = new GitCompareFileRevisionEditorInput.EmptyTypedElement( NLS .bind( @@ -292,7 +294,9 @@ public class CompareTreeView extends ViewPart { PathNodeAdapter node = (PathNodeAdapter) selected; GitFileRevision rightRevision = compareVersionMap .get(node.pathNode.path); - right = new FileRevisionTypedElement(rightRevision); + String encoding = CompareCoreUtils.getResourceEncoding( + repositoryMapping.getRepository(), node.pathNode.getRepoRelativePath()); + right = new FileRevisionTypedElement(rightRevision, encoding); left = new GitCompareFileRevisionEditorInput.EmptyTypedElement(NLS .bind(UIText.CompareTreeView_ItemNotFoundInVersionMessage, node.pathNode.path.lastSegment(), getBaseVersion())); @@ -736,6 +740,10 @@ public class CompareTreeView extends ViewPart { this.type = type; } + public String getRepoRelativePath() { + return path.toString(); + } + @Override public int hashCode() { final int prime = 31; |