diff options
| author | Andre Weinand | 2003-11-17 22:22:38 +0000 |
|---|---|---|
| committer | Andre Weinand | 2003-11-17 22:22:38 +0000 |
| commit | d91d3838a7add970857502e584f2ae20b0a28ceb (patch) | |
| tree | 30ab1f1d60fdb3fccc0add9031d3110c646faef8 /bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java | |
| parent | f278bbbfd5f05a40f395e6b65a27e23ddca55d8c (diff) | |
| download | eclipse.platform.team-d91d3838a7add970857502e584f2ae20b0a28ceb.tar.gz eclipse.platform.team-d91d3838a7add970857502e584f2ae20b0a28ceb.tar.xz eclipse.platform.team-d91d3838a7add970857502e584f2ae20b0a28ceb.zip | |
fixed #46805
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java')
| -rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ComparePreferencePage.java | 8 |
1 files changed, 6 insertions, 2 deletions
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; } } |