Fixes for:
https://bugs.eclipse.org/bugs/show_bug.cgi?id=491963
https://bugs.eclipse.org/bugs/show_bug.cgi?id=491964
Change-Id: I5bd53356c2ab9d846072516894b0051c715da7e2
Signed-off-by: I035983 <I035983@INLN50888509A.apj.global.corp.sap>
diff --git a/org.eclipse.ogee.designer/src/org/eclipse/ogee/designer/ODataEditorUpdateBehavior.java b/org.eclipse.ogee.designer/src/org/eclipse/ogee/designer/ODataEditorUpdateBehavior.java
index f2a2795..62ac6e7 100644
--- a/org.eclipse.ogee.designer/src/org/eclipse/ogee/designer/ODataEditorUpdateBehavior.java
+++ b/org.eclipse.ogee.designer/src/org/eclipse/ogee/designer/ODataEditorUpdateBehavior.java
@@ -15,6 +15,7 @@
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.graphiti.ui.editor.DefaultUpdateBehavior;
import org.eclipse.graphiti.ui.editor.DiagramEditor;
+import org.eclipse.graphiti.ui.editor.IDiagramEditorInput;
import org.eclipse.ogee.model.api.IModelContext;
import org.eclipse.ogee.model.api.ModelAPIException;
import org.eclipse.ogee.utils.logger.Logger;
@@ -28,21 +29,11 @@
*
*/
public class ODataEditorUpdateBehavior extends DefaultUpdateBehavior {
-
private DiagramEditor diagramEditor;
- /**
- * @param diagramEditor
- */
- public ODataEditorUpdateBehavior(DiagramEditor diagramEditor) {
-
- super(diagramEditor.getDiagramBehavior());
- this.diagramEditor = diagramEditor;
- }
-
@Override
- protected void createEditingDomain() {
-
+ protected void createEditingDomain(IDiagramEditorInput input) {
+ super.createEditingDomain(input);
TransactionalEditingDomain editingDomain = null;
IFile file = ((ODataEditor) this.diagramEditor).getModelFile();
@@ -54,6 +45,15 @@
initializeEditingDomain(editingDomain);
}
+ /**
+ * @param diagramEditor
+ */
+ public ODataEditorUpdateBehavior(DiagramEditor diagramEditor) {
+
+ super(diagramEditor.getDiagramBehavior());
+ this.diagramEditor = diagramEditor;
+ }
+
@Override
protected void disposeEditingDomain() {
diff --git a/org.eclipse.ogee.property.editor/plugin.xml b/org.eclipse.ogee.property.editor/plugin.xml
index 0c61588..bbf2fed 100644
--- a/org.eclipse.ogee.property.editor/plugin.xml
+++ b/org.eclipse.ogee.property.editor/plugin.xml
@@ -18,7 +18,7 @@
<plugin>
<extension
- point="org.eclipse.core.runtime.adapters">
+ point="org.eclipse.core.runtime.adapters">
<factory
adaptableType="org.eclipse.emf.ecore.EObject"
class="org.eclipse.ogee.property.editor.adapter.AdapterFactory">
@@ -32,7 +32,14 @@
<adapter
type="org.eclipse.ui.views.properties.IPropertySource">
</adapter>
- </factory>
+ </factory>
+ <factory
+ adaptableType=" org.eclipse.graphiti.ui.internal.parts.FreeFormConnectionEditPart"
+ class="org.eclipse.ogee.property.editor.adapter.AdapterFactory">
+ <adapter
+ type="org.eclipse.ui.views.properties.IPropertySource">
+ </adapter>
+ </factory>
</extension>
<extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
diff --git a/org.eclipse.ogee.target/org.eclipse.ogee.target b/org.eclipse.ogee.target/org.eclipse.ogee.target
index 80e703e..487700a 100644
--- a/org.eclipse.ogee.target/org.eclipse.ogee.target
+++ b/org.eclipse.ogee.target/org.eclipse.ogee.target
@@ -1,49 +1,38 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target includeMode="feature" name="Eclipse Framework Target Definition" sequenceNumber="1171">
+<?pde version="3.8"?><target includeMode="feature" name="Eclipse Framework Target Definition" sequenceNumber="1176">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.p2.extras.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.codegen.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.codegen.ui.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.codegen.ecore.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.mapping.ecore.editor.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.codegen.ecore.ui" version="0.0.0"/>
-<unit id="org.eclipse.emf.edit.ui.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.mapping.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.mapping.ui.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.converter.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.transaction.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.workspace.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.ecore.editor.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.validation.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.graphiti.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.mwe.core.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.mwe.ui.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.mwe2.language.sdk.source.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.thirdparty.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xtext.xbase.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xpand.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xsd.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xsd.edit.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xtend.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xtend.dependencies.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xtend.typesystem.emf.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xtend.ui.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xtext.ui.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.xtext.xtext.ui.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/luna"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.olingo" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/"/>
</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.validation.master.feature.group" version="1.9.0.201505312255"/>
+<unit id="org.eclipse.emf.diffmerge.sdk.feature.feature.group" version="0.5.0.v20150608-0931"/>
+<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.9.0.201506010221"/>
+<unit id="org.eclipse.emf.eef.codegen.ecore-feature.feature.group" version="1.5.0.201505291308"/>
+<unit id="org.eclipse.graphiti.feature.tools.feature.group" version="0.12.2.v20160120-1255"/>
+<unit id="org.eclipse.emf.transaction.master.feature.group" version="1.9.0.201506010221"/>
+<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.1.1.201509120604"/>
+<unit id="org.eclipse.emf.compare.diagram.papyrus.feature.group" version="3.1.1.201509120604"/>
+<unit id="org.eclipse.emf.validation.examples.feature.group" version="1.9.0.201505312255"/>
+<unit id="org.eclipse.graphiti.sdk.plus.feature.feature.group" version="0.12.2.v20160120-1255"/>
+<unit id="org.eclipse.emf.query.examples.feature.group" version="1.9.0.201505312221"/>
+<unit id="org.eclipse.emf.facet.sdk.feature.feature.group" version="1.0.2.201601181335"/>
+<unit id="org.eclipse.emf.query.master.feature.group" version="1.9.0.201505312221"/>
+<unit id="org.eclipse.emf.transaction.examples.feature.group" version="1.9.0.201506010221"/>
+<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.9.0.201505312221"/>
+<unit id="org.eclipse.emf.ecp.emfforms.sdk.feature.feature.group" version="1.8.0.20160216-1319"/>
+<unit id="org.eclipse.graphiti.feature.examples.feature.group" version="0.12.2.v20160120-1255"/>
+<unit id="org.eclipse.graphiti.export.feature.feature.group" version="0.12.2.v20160120-1255"/>
+<unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="1.3.2.v20160209-0349"/>
+<unit id="org.eclipse.emf.compare.uml2.feature.group" version="3.1.1.201509120604"/>
+<unit id="org.eclipse.emf.oda.sdk.feature.group" version="1.4.0.v20160208-0841"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.11.2.v20160208-0841"/>
+<unit id="org.eclipse.emf.emfstore.sdk.feature.feature.group" version="1.7.0.v20160209-0511"/>
+<unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.9.0.201505312255"/>
+<unit id="org.eclipse.graphiti.feature.feature.group" version="0.12.2.v20160120-1255"/>
+<unit id="org.eclipse.graphiti.sdk.feature.feature.group" version="0.12.2.v20160120-1255"/>
+<repository location="http://download.eclipse.org/releases/mars"/>
+</location>
</locations>
</target>
