Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2004-06-02 18:37:46 -0400
committerAndre Weinand2004-06-02 18:37:46 -0400
commit8d4a1f4f083a5be99e8fd0982e769bb146bcc431 (patch)
treeab551746bad1210896d1bc7b749e6b89b36224c2 /bundles/org.eclipse.compare/compare
parent67534904d7cd2b8d4bbc898ff9149628296c25ed (diff)
downloadeclipse.platform.team-8d4a1f4f083a5be99e8fd0982e769bb146bcc431.tar.gz
eclipse.platform.team-8d4a1f4f083a5be99e8fd0982e769bb146bcc431.tar.xz
eclipse.platform.team-8d4a1f4f083a5be99e8fd0982e769bb146bcc431.zip
fixed #65460
Diffstat (limited to 'bundles/org.eclipse.compare/compare')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java
index 8a348e182..31188a10d 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java
@@ -84,7 +84,10 @@ public class HistoryItem implements IEncodedStreamContentAccessor, ITypedElement
* @see org.eclipse.compare.IEncodedStreamContentAccessor#getCharset()
*/
public String getCharset() throws CoreException {
- return fFileState.getCharset();
+ String charset= fFileState.getCharset();
+ if (charset == null && fBase instanceof IEncodedStreamContentAccessor)
+ charset= ((IEncodedStreamContentAccessor)fBase).getCharset();
+ return charset;
}
}

Back to the top