diff options
| author | Mikaël Barbero | 2013-08-14 13:08:29 +0000 |
|---|---|---|
| committer | Mikaël Barbero | 2013-08-19 12:28:55 +0000 |
| commit | bc293cd2b7c6deb689d4d061a13b2915eeb379f5 (patch) | |
| tree | bc902f4d7b8a7432c1bc7ed95aa48b50acbd4d5d | |
| parent | 7b49789cf9f841992c9de3970d69f34de3c290d5 (diff) | |
| download | org.eclipse.emf.compare-bc293cd2b7c6deb689d4d061a13b2915eeb379f5.tar.gz org.eclipse.emf.compare-bc293cd2b7c6deb689d4d061a13b2915eeb379f5.tar.xz org.eclipse.emf.compare-bc293cd2b7c6deb689d4d061a13b2915eeb379f5.zip | |
Workaround bug 293926 only when installed on 3.7 and previous releases(cherry picked from commit a18ee80862fa1d6f6824a5ecf17ed770ae405d33)
| -rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/accessor/AccessorAdapter.java | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/accessor/AccessorAdapter.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/accessor/AccessorAdapter.java index 5e8aaf3f0..ba03ee09d 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/accessor/AccessorAdapter.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/accessor/AccessorAdapter.java @@ -16,13 +16,21 @@ import java.io.InputStream; import org.eclipse.compare.IStreamContentAccessor;
import org.eclipse.compare.ITypedElement;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.swt.graphics.Image;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.Version;
/**
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
*/
public final class AccessorAdapter implements ITypedElement, IStreamContentAccessor {
+ /**
+ * Fix for #293926 has been release in org.eclipse.compare 3.5.201.R37x_v20110817-0800
+ */
+ private static final Version BUG_293926_VERSION = Version.parseVersion("3.5.201"); //$NON-NLS-1$
+
private final Object target;
private AccessorAdapter(Object target) {
@@ -56,7 +64,14 @@ public final class AccessorAdapter implements ITypedElement, IStreamContentAcces * that this bug has been fixed in 3.7.1, we're keeping this around for the compatibility with 3.5 and
* 3.6.
*/
- return new ByteArrayInputStream(new byte[] {' ' });
+ Bundle compareBundle = Platform.getBundle("org.eclipse.compare"); //$NON-NLS-1$
+ Version compareBundleVersion = compareBundle.getVersion();
+ if (compareBundleVersion.compareTo(BUG_293926_VERSION) < 0) {
+ // workaround for before before indigo SR1 - 3.7.1
+ return new ByteArrayInputStream(new byte[] {' ' });
+ } else {
+ return null;
+ }
}
/**
|