From eea8d939fc174791b19a75e670d007536f4408a9 Mon Sep 17 00:00:00 2001 From: Stephan Wahlbrink Date: Wed, 10 Dec 2025 14:33:41 +0100 Subject: [PATCH 1/2] Fix encoding for 'compare with clipboard' if default encoding is not UTF-8 --- .../org/eclipse/compare/internal/ClipboardCompare.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ClipboardCompare.java b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ClipboardCompare.java index 22284abac94..939ac3251da 100644 --- a/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ClipboardCompare.java +++ b/team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ClipboardCompare.java @@ -22,7 +22,7 @@ import org.eclipse.compare.CompareConfiguration; import org.eclipse.compare.CompareEditorInput; import org.eclipse.compare.CompareUI; -import org.eclipse.compare.IStreamContentAccessor; +import org.eclipse.compare.IEncodedStreamContentAccessor; import org.eclipse.compare.ITypedElement; import org.eclipse.compare.structuremergeviewer.DiffNode; import org.eclipse.core.resources.IFile; @@ -125,7 +125,7 @@ private void processComparison(IFile file, Shell parentShell) throws IOException * @param parentShell The shell containing this window's controls */ private void showComparison(String source, String fileName, String clipboardContents, Shell parentShell) { - class ClipboardTypedElement implements ITypedElement, IStreamContentAccessor { + class ClipboardTypedElement implements ITypedElement, IEncodedStreamContentAccessor { private final String name; private final String content; @@ -149,6 +149,11 @@ public String getType() { return null; } + @Override + public String getCharset() throws CoreException { + return "UTF-8"; //$NON-NLS-1$ + } + @Override public InputStream getContents() throws CoreException { return new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8)); From cb4a4f73864a324c74d0c274e54728921e72b59c Mon Sep 17 00:00:00 2001 From: Eclipse Platform Bot Date: Wed, 10 Dec 2025 14:02:27 +0000 Subject: [PATCH 2/2] Version bump(s) for 4.39 stream --- team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF b/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF index e30174cbcce..83b13f0a7b5 100644 --- a/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF +++ b/team/bundles/org.eclipse.compare/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.compare; singleton:=true -Bundle-Version: 3.11.600.qualifier +Bundle-Version: 3.11.700.qualifier Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin