From d91d3838a7add970857502e584f2ae20b0a28ceb Mon Sep 17 00:00:00 2001 From: Andre Weinand Date: Mon, 17 Nov 2003 22:22:38 +0000 Subject: fixed #46805 --- .../org/eclipse/compare/internal/ComparePreferencePage.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java') diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java index 8e779009f..f8ba07487 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java @@ -35,7 +35,8 @@ import org.eclipse.compare.structuremergeviewer.*; public class ComparePreferencePage extends PreferencePage implements IWorkbenchPreferencePage { - class FakeInput implements ITypedElement, IStreamContentAccessor { + class FakeInput implements ITypedElement, IStreamContentAccessorExtension2 { + static final String UTF_16= "UTF-16"; //$NON-NLS-1$ String fContent; FakeInput(String name) { @@ -51,7 +52,10 @@ public class ComparePreferencePage extends PreferencePage implements IWorkbenchP return "no type"; //$NON-NLS-1$ } public InputStream getContents() { - return new ByteArrayInputStream(fContent.getBytes()); + return new ByteArrayInputStream(Utilities.getBytes(fContent, UTF_16)); + } + public String getCharset() { + return UTF_16; } } -- cgit v1.2.3