Bug 495250 - OperationBrowser does not work with Neon Modeling Edition
RC2
image now has png extension instead of gif
Change-Id: I76a58963de36726ad012904935a66ae1f26fd66d
Signed-off-by: Johannes Faltermeier <jfaltermeier@eclipsesource.com>
diff --git a/builds/org.eclipse.emf.edapt.releng.target/edapt_neon.target b/builds/org.eclipse.emf.edapt.releng.target/edapt_neon.target
new file mode 100644
index 0000000..da25b34
--- /dev/null
+++ b/builds/org.eclipse.emf.edapt.releng.target/edapt_neon.target
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="Edapt Neon Target" sequenceNumber="1464859164">
+ <locations>
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="2.1.2.201310031412"/>
+ <unit id="org.eclipse.emf.compare.feature.group" version="2.1.2.201310031412"/>
+ <unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="2.1.2.201310031412"/>
+ <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="2.1.2.201310031412"/>
+ <repository location="http://download.eclipse.org/modeling/emf/compare/updates/releases/2.1"/>
+ </location>
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.rcp.source.feature.group" version="4.6.0.v20160525-2000"/>
+ <unit id="org.eclipse.pde.api.tools.ee.feature.feature.group" version="1.0.1.v20160419-1303"/>
+ <unit id="org.eclipse.releng.tools.feature.group" version="3.9.0.v20160424-1559"/>
+ <unit id="org.eclipse.equinox.sdk.feature.group" version="3.12.0.v20160525-1303"/>
+ <unit id="org.eclipse.sdk.ide" version="4.6.0.I20160525-2000"/>
+ <unit id="org.eclipse.platform.sdk" version="4.6.0.I20160525-2000"/>
+ <unit id="org.eclipse.test.feature.group" version="3.7.100.v20160503-1715"/>
+ <unit id="org.eclipse.sdk.tests.feature.group" version="4.6.0.v20160525-2000"/>
+ <unit id="org.eclipse.platform.ide" version="4.6.0.I20160525-2000"/>
+ <unit id="org.eclipse.rcp.feature.group" version="4.6.0.v20160525-2000"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.6milestones"/>
+ </location>
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.ocl.core.sdk.feature.group" version="4.0.1.v20120917-1739"/>
+ <repository location="http://download.eclipse.org/modeling/mdt/ocl/updates/releases/4.0.1"/>
+ </location>
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.emf.ecore.xcore.ui.feature.group" version="1.3.0.v20150602-0808"/>
+ <unit id="org.eclipse.emf.databinding.feature.group" version="1.4.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.codegen.ecore.feature.group" version="2.11.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.edit.ui.feature.group" version="2.11.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.mapping.ecore.editor.feature.group" version="2.10.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.gwt.feature.group" version="2.9.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.mapping.ecore.feature.group" version="2.9.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.rap.edit.ui.feature.group" version="2.9.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.oda.ecore.feature.group" version="1.3.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.codegen.ecore.ui.feature.group" version="2.11.0.v20150601-0402"/>
+ <unit id="org.eclipse.xsd.sdk.feature.group" version="2.11.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.common.feature.group" version="2.11.0.v20150512-0501"/>
+ <unit id="org.eclipse.emf.ecore.edit.feature.group" version="2.9.0.v20150601-0402"/>
+ <unit id="org.eclipse.xsd.feature.group" version="2.11.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.ecore.xcore.feature.group" version="1.3.0.v20150602-0808"/>
+ <unit id="org.eclipse.emf.codegen.feature.group" version="2.11.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.edit.feature.group" version="2.11.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="1.3.0.v20150602-0808"/>
+ <unit id="org.eclipse.xsd.edit.feature.group" version="2.9.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.all.feature.group" version="2.11.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.oda.ecore.ui.feature.group" version="1.3.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.rap.feature.group" version="2.11.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.ecore.editor.feature.group" version="2.11.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.codegen.ui.feature.group" version="2.8.0.v20150601-0402"/>
+ <unit id="org.eclipse.xsd.mapping.editor.feature.group" version="2.9.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.mapping.feature.group" version="2.9.0.v20150601-0402"/>
+ <unit id="org.eclipse.xsd.doc.feature.group" version="2.9.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.feature.group" version="2.11.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.doc.feature.group" version="2.10.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.examples.feature.group" version="2.11.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.oda.sdk.feature.group" version="1.4.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.gwt.common.feature.group" version="2.9.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.rap.common.ui.feature.group" version="2.9.0.v20150601-0402"/>
+ <unit id="org.eclipse.xsd.editor.feature.group" version="2.9.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.oda.feature.group" version="1.3.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.gwt.edit.ui.feature.group" version="2.7.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.common.ui.feature.group" version="2.10.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.rap.sdk.feature.group" version="2.11.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.ecore.feature.group" version="2.11.0.v20150512-0501"/>
+ <unit id="org.eclipse.emf.mapping.ui.feature.group" version="2.9.0.v20150601-0402"/>
+ <unit id="org.eclipse.xsd.mapping.feature.group" version="2.9.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.converter.feature.group" version="2.11.0.v20150601-0402"/>
+ <unit id="org.eclipse.xsd.ecore.converter.feature.group" version="2.9.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.databinding.edit.feature.group" version="1.4.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.gwt.ecore.feature.group" version="2.9.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.gwt.edit.feature.group" version="2.8.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.gwt.ecore.edit.feature.group" version="2.8.0.v20150601-0402"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="2.11.0.v20150601-0402"/>
+ <repository location="http://download.eclipse.org/modeling/emf/emf/updates/releases/"/>
+ </location>
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.acceleo.examples.feature.group" version="3.2.2.v20120807-0831"/>
+ <unit id="org.eclipse.acceleo.runtime.feature.group" version="3.2.2.v20120807-0831"/>
+ <unit id="org.eclipse.acceleo.ui.capabilities.feature.group" version="3.2.2.v20120807-0831"/>
+ <unit id="org.eclipse.acceleo.doc.feature.group" version="3.2.2.v20120807-0831"/>
+ <unit id="org.eclipse.acceleo.feature.group" version="3.2.2.v20120807-0831"/>
+ <unit id="org.eclipse.acceleo.sdk.feature.group" version="3.2.2.v20120807-0831"/>
+ <repository location="http://download.eclipse.org/modeling/m2t/acceleo/updates/releases/3.2"/>
+ </location>
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.junit" version="4.11.0.v201303080030"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/"/>
+ </location>
+ </locations>
+</target>
diff --git a/builds/org.eclipse.emf.edapt.releng.target/edapt_neon.tpd b/builds/org.eclipse.emf.edapt.releng.target/edapt_neon.tpd
new file mode 100644
index 0000000..eebfe65
--- /dev/null
+++ b/builds/org.eclipse.emf.edapt.releng.target/edapt_neon.tpd
@@ -0,0 +1,90 @@
+target "Edapt Neon Target"
+
+location "http://download.eclipse.org/modeling/emf/compare/updates/releases/2.1" {
+org.eclipse.emf.compare.source.feature.group
+org.eclipse.emf.compare.feature.group
+org.eclipse.emf.compare.rcp.ui.source.feature.group
+org.eclipse.emf.compare.rcp.ui.feature.group
+}
+
+location "http://download.eclipse.org/eclipse/updates/4.6milestones" {
+org.eclipse.rcp.source.feature.group
+org.eclipse.pde.api.tools.ee.feature.feature.group
+org.eclipse.releng.tools.feature.group
+org.eclipse.equinox.sdk.feature.group
+org.eclipse.sdk.ide
+org.eclipse.platform.sdk
+org.eclipse.test.feature.group
+org.eclipse.sdk.tests.feature.group
+org.eclipse.platform.ide
+org.eclipse.rcp.feature.group
+}
+
+location "http://download.eclipse.org/modeling/mdt/ocl/updates/releases/4.0.1" {
+org.eclipse.ocl.core.sdk.feature.group
+}
+
+location "http://download.eclipse.org/modeling/emf/emf/updates/releases/" {
+org.eclipse.emf.ecore.xcore.ui.feature.group
+org.eclipse.emf.databinding.feature.group
+org.eclipse.emf.codegen.ecore.feature.group
+org.eclipse.emf.edit.ui.feature.group
+org.eclipse.emf.mapping.ecore.editor.feature.group
+org.eclipse.emf.gwt.feature.group
+org.eclipse.emf.mapping.ecore.feature.group
+org.eclipse.emf.rap.edit.ui.feature.group
+org.eclipse.emf.oda.ecore.feature.group
+org.eclipse.emf.codegen.ecore.ui.feature.group
+org.eclipse.xsd.sdk.feature.group
+org.eclipse.emf.common.feature.group
+org.eclipse.emf.ecore.edit.feature.group
+org.eclipse.xsd.feature.group
+org.eclipse.emf.ecore.xcore.feature.group
+org.eclipse.emf.codegen.feature.group
+org.eclipse.emf.edit.feature.group
+org.eclipse.emf.ecore.xcore.sdk.feature.group
+org.eclipse.xsd.edit.feature.group
+org.eclipse.emf.all.feature.group
+org.eclipse.emf.oda.ecore.ui.feature.group
+org.eclipse.emf.rap.feature.group
+org.eclipse.emf.ecore.editor.feature.group
+org.eclipse.emf.codegen.ui.feature.group
+org.eclipse.xsd.mapping.editor.feature.group
+org.eclipse.emf.mapping.feature.group
+org.eclipse.xsd.doc.feature.group
+org.eclipse.emf.feature.group
+org.eclipse.emf.doc.feature.group
+org.eclipse.emf.examples.feature.group
+org.eclipse.emf.oda.sdk.feature.group
+org.eclipse.emf.gwt.common.feature.group
+org.eclipse.emf.rap.common.ui.feature.group
+org.eclipse.xsd.editor.feature.group
+org.eclipse.emf.oda.feature.group
+org.eclipse.emf.gwt.edit.ui.feature.group
+org.eclipse.emf.common.ui.feature.group
+org.eclipse.emf.rap.sdk.feature.group
+org.eclipse.emf.ecore.feature.group
+org.eclipse.emf.mapping.ui.feature.group
+org.eclipse.xsd.mapping.feature.group
+org.eclipse.emf.converter.feature.group
+org.eclipse.xsd.ecore.converter.feature.group
+org.eclipse.emf.databinding.edit.feature.group
+org.eclipse.emf.gwt.ecore.feature.group
+org.eclipse.emf.gwt.edit.feature.group
+org.eclipse.emf.gwt.ecore.edit.feature.group
+org.eclipse.emf.sdk.feature.group
+}
+
+location "http://download.eclipse.org/modeling/m2t/acceleo/updates/releases/3.2" {
+org.eclipse.acceleo.examples.feature.group
+org.eclipse.acceleo.runtime.feature.group
+org.eclipse.acceleo.ui.capabilities.feature.group
+org.eclipse.acceleo.doc.feature.group
+org.eclipse.acceleo.feature.group
+org.eclipse.acceleo.sdk.feature.group
+}
+
+location "http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/" {
+org.junit
+}
+
diff --git a/plugins/org.eclipse.emf.edapt.history.editor/src/org/eclipse/emf/edapt/history/instantiation/ui/ConstraintViewer.java b/plugins/org.eclipse.emf.edapt.history.editor/src/org/eclipse/emf/edapt/history/instantiation/ui/ConstraintViewer.java
index aff96f2..5a2ef58 100644
--- a/plugins/org.eclipse.emf.edapt.history.editor/src/org/eclipse/emf/edapt/history/instantiation/ui/ConstraintViewer.java
+++ b/plugins/org.eclipse.emf.edapt.history.editor/src/org/eclipse/emf/edapt/history/instantiation/ui/ConstraintViewer.java
@@ -59,8 +59,11 @@
| SWT.FULL_SELECTION);
// icon taken from IDE Workbench plugin
- final ImageDescriptor imageDescriptor = IDEWorkbenchPlugin
- .getIDEImageDescriptor("obj16/error_tsk.gif"); //$NON-NLS-1$
+ ImageDescriptor imageDescriptor = IDEWorkbenchPlugin.getIDEImageDescriptor("obj16/error_tsk.png"); //$NON-NLS-1$
+ if (imageDescriptor == null) {
+ /* fall back for pre neon IDEs */
+ imageDescriptor = IDEWorkbenchPlugin.getIDEImageDescriptor("obj16/error_tsk.gif"); //$NON-NLS-1$
+ }
constraintImage = imageDescriptor.createImage();
init();
