update sirius to 6.2.x
Change-Id: I1780a6ca35ec2a944e616c703742707f79be2f12
Signed-off-by: Thomas Guiu <thomas.guiu@soyatec.com>
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java
index e5b909d..028aed1 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateEdgeCommand.java
@@ -1,7 +1,7 @@
/**
* <copyright>
*
- * Copyright (c) 2014, 2017 Thales Corporate Services S.A.S.
+ * Copyright (c) 2014, 2019 Thales Corporate Services S.A.S.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
@@ -41,6 +41,7 @@
import org.eclipse.sirius.diagram.business.internal.experimental.sync.DDiagramElementSynchronizer;
import org.eclipse.sirius.diagram.business.internal.experimental.sync.DDiagramSynchronizer;
import org.eclipse.sirius.diagram.business.internal.experimental.sync.DEdgeCandidate;
+import org.eclipse.sirius.diagram.business.internal.metamodel.operations.DDiagramSpecOperations;
import org.eclipse.sirius.diagram.description.ContainerMapping;
import org.eclipse.sirius.diagram.description.DiagramElementMapping;
import org.eclipse.sirius.diagram.description.EdgeMapping;
@@ -202,7 +203,7 @@
{
if (diagramElementMapping instanceof ContainerMapping)
{
- EList<DDiagramElementContainer> containers = _diagram.getContainersFromMapping((ContainerMapping) diagramElementMapping);
+ EList<DDiagramElementContainer> containers = DDiagramSpecOperations.getContainersFromMapping(_diagram, (ContainerMapping) diagramElementMapping);
for (DDiagramElementContainer dDiagramElementContainer : containers)
{
if (dDiagramElementContainer.getTarget().equals(semantic))
@@ -213,7 +214,7 @@
if (diagramElementMapping instanceof NodeMapping)
{
- EList<DNode> nodes = _diagram.getNodesFromMapping((NodeMapping) diagramElementMapping);
+ EList<DNode> nodes = DDiagramSpecOperations.getNodesFromMapping(_diagram, (NodeMapping) diagramElementMapping);
for (DNode dNode : nodes)
{
if (dNode.getTarget().equals(semantic))
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateNodeCommand.java b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateNodeCommand.java
index e734f83..f3c1647 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateNodeCommand.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/command/CreateNodeCommand.java
@@ -1,7 +1,7 @@
/**
* <copyright>
*
- * Copyright (c) 2014 Thales Corporate Services S.A.S.
+ * Copyright (c) 2014, 2019 Thales Corporate Services S.A.S.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
@@ -38,6 +38,8 @@
import org.eclipse.sirius.diagram.business.internal.componentization.mappings.DiagramMappingsManagerRegistryImpl;
import org.eclipse.sirius.diagram.business.internal.experimental.sync.AbstractDNodeCandidate;
import org.eclipse.sirius.diagram.business.internal.experimental.sync.DDiagramSynchronizer;
+import org.eclipse.sirius.diagram.business.internal.metamodel.helper.ContainerMappingHelper;
+import org.eclipse.sirius.diagram.business.internal.metamodel.helper.MappingHelper;
import org.eclipse.sirius.diagram.description.AbstractNodeMapping;
import org.eclipse.sirius.diagram.description.ContainerMapping;
import org.eclipse.sirius.diagram.description.DiagramElementMapping;
@@ -126,7 +128,7 @@
// create it sub nodes
EList<AbstractNodeMapping> childrenNodeMapping = new BasicEList<AbstractNodeMapping>();
- for (DiagramElementMapping iDiagramElementMapping : nodeMapping.getAllMappings())
+ for (DiagramElementMapping iDiagramElementMapping : MappingHelper.getAllMappings(nodeMapping))
{
if (iDiagramElementMapping instanceof AbstractNodeMapping)
childrenNodeMapping.add((AbstractNodeMapping) iDiagramElementMapping);
diff --git a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java
index 45c56f1..4555cf1 100644
--- a/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java
+++ b/portfolio/org.eclipse.egf.portfolio.genchain.ecoretools/src/org/eclipse/egf/portfolio/genchain/ecoretools/operation/CreateEcoreTools2RepresentationOperation.java
@@ -1,7 +1,7 @@
/**
* <copyright>
*
- * Copyright (c) 2014 Thales Corporate Services S.A.S.
+ * Copyright (c) 2014, 2019 Thales Corporate Services S.A.S.
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v2.0
* which accompanies this distribution, and is available at
@@ -16,7 +16,7 @@
*/
package org.eclipse.egf.portfolio.genchain.ecoretools.operation;
-
+
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Collection;
@@ -45,7 +45,6 @@
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.transaction.RecordingCommand;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.common.core.util.ObjectAdapter;
import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
@@ -69,6 +68,7 @@
import org.eclipse.sirius.diagram.business.api.refresh.CanonicalSynchronizer;
import org.eclipse.sirius.diagram.business.api.refresh.CanonicalSynchronizerFactory;
import org.eclipse.sirius.diagram.business.api.refresh.DiagramCreationUtil;
+import org.eclipse.sirius.diagram.business.internal.metamodel.helper.ContentHelper;
import org.eclipse.sirius.diagram.description.AbstractNodeMapping;
import org.eclipse.sirius.diagram.description.ContainerMapping;
import org.eclipse.sirius.diagram.description.DiagramDescription;
@@ -363,12 +363,12 @@
EList<AbstractNodeMapping> abstractNodeMappings = new BasicEList<AbstractNodeMapping>();
final DiagramDescription description = diagram.getDescription();
/** Handle description NodeMppings **/
- EList<NodeMapping> nodeMappings = description.getAllNodeMappings();
+ EList<NodeMapping> nodeMappings = ContentHelper.getAllNodeMappings(description, true);
if (!nodeMappings.isEmpty())
abstractNodeMappings.addAll(nodeMappings);
/** Handle description ContainerMppings **/
- EList<ContainerMapping> containerMappings = description.getAllContainerMappings();
+ EList<ContainerMapping> containerMappings = ContentHelper.getAllContainerMappings(description, true);
if (!containerMappings.isEmpty())
abstractNodeMappings.addAll(containerMappings);
diff --git a/releng/org.eclipse.egf.targets/core-2019-03.target b/releng/org.eclipse.egf.targets/core-2019-03.target
index f4e623f..9e1d81a 100644
--- a/releng/org.eclipse.egf.targets/core-2019-03.target
+++ b/releng/org.eclipse.egf.targets/core-2019-03.target
@@ -58,7 +58,7 @@
<unit id="org.eclipse.sirius.runtime.acceleo.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sirius.runtime.aql.source.feature.group" version="0.0.0"/>
- <repository id="Sirus" location="https://download.eclipse.org/sirius/updates/releases/6.1.1/photon"/>
+ <repository id="Sirus" location="https://download.eclipse.org/sirius/updates/nightly/6.2.0-N20190129-113513/2018-12/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.ecoretools.sdk.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.egf.targets/core-2019-03.targetplatform b/releng/org.eclipse.egf.targets/core-2019-03.targetplatform
index 85572ea..27e0981 100644
--- a/releng/org.eclipse.egf.targets/core-2019-03.targetplatform
+++ b/releng/org.eclipse.egf.targets/core-2019-03.targetplatform
@@ -33,7 +33,7 @@
org.eclipse.acceleo.sdk.feature.group lazy
}
-location Sirus "https://download.eclipse.org/sirius/updates/releases/6.1.1/photon" {
+location Sirus "https://download.eclipse.org/sirius/updates/nightly/6.2.0-N20190129-113513/2018-12/" {
org.eclipse.sirius.doc.feature.feature.group lazy
org.eclipse.sirius.runtime.ide.eef.feature.group lazy
org.eclipse.sirius.runtime.ide.ui.acceleo.feature.group lazy
