[531282] Adapt code to Sirius modularization
Bug: 531282
Change-Id: I1805123839d7ff555e3063f247965ea02cec8e92
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
diff --git a/org.eclipse.emf.ecoretools.design.properties/META-INF/MANIFEST.MF b/org.eclipse.emf.ecoretools.design.properties/META-INF/MANIFEST.MF
index 214c484..40c772b 100644
--- a/org.eclipse.emf.ecoretools.design.properties/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.ecoretools.design.properties/META-INF/MANIFEST.MF
@@ -12,11 +12,11 @@
org.eclipse.sirius.eef.adapters,
org.eclipse.core.resources;bundle-version="3.7.100",
org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.sirius;bundle-version="0.1.0",
+ org.eclipse.sirius;bundle-version="7.0.0",
org.eclipse.emf.ecoretools.properties,
org.eclipse.emf.ecoretools.tabbedproperties,
- org.eclipse.sirius.ui;bundle-version="3.0.2",
- org.eclipse.sirius.diagram.ui;bundle-version="3.0.2"
+ org.eclipse.sirius.ui;bundle-version="7.0.0",
+ org.eclipse.sirius.diagram.ui;bundle-version="7.0.0"
Export-Package: org.eclipse.emf.ecoretools.design.properties.ecore.com
ponents,org.eclipse.emf.ecoretools.design.properties.ecore.providers,
org.eclipse.emf.ecoretools.design.properties.parts,org.eclipse.emf.ec
diff --git a/org.eclipse.emf.ecoretools.design.tests/META-INF/MANIFEST.MF b/org.eclipse.emf.ecoretools.design.tests/META-INF/MANIFEST.MF
index b8032c5..fa2e208 100644
--- a/org.eclipse.emf.ecoretools.design.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.ecoretools.design.tests/META-INF/MANIFEST.MF
@@ -8,15 +8,15 @@
org.eclipse.emf.ecoretools.design,
org.eclipse.emf.ecoretools.design.ui,
org.eclipse.core.resources,
- org.eclipse.sirius.common;bundle-version="5.0.0",
- org.eclipse.sirius.ecore.extender;bundle-version="5.0.0",
- org.eclipse.sirius;bundle-version="5.0.0",
- org.eclipse.sirius.common.acceleo.aql;bundle-version="5.0.0",
- org.eclipse.sirius.diagram;bundle-version="5.0.0",
- org.eclipse.sirius.ext.base;bundle-version="5.0.0",
- org.eclipse.sirius.ext.emf;bundle-version="5.0.0",
- org.eclipse.sirius.table;bundle-version="5.0.0",
- org.eclipse.sirius.properties;bundle-version="5.0.0",
+ org.eclipse.sirius.common;bundle-version="7.0.0",
+ org.eclipse.sirius.ecore.extender;bundle-version="7.0.0",
+ org.eclipse.sirius;bundle-version="7.0.0",
+ org.eclipse.sirius.common.acceleo.aql;bundle-version="7.0.0",
+ org.eclipse.sirius.diagram;bundle-version="7.0.0",
+ org.eclipse.sirius.ext.base;bundle-version="7.0.0",
+ org.eclipse.sirius.ext.emf;bundle-version="7.0.0",
+ org.eclipse.sirius.table;bundle-version="7.0.0",
+ org.eclipse.sirius.properties;bundle-version="7.0.0",
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.emf.ecore.xmi,
diff --git a/org.eclipse.emf.ecoretools.design/META-INF/MANIFEST.MF b/org.eclipse.emf.ecoretools.design/META-INF/MANIFEST.MF
index d4c6cec..a002aba 100644
--- a/org.eclipse.emf.ecoretools.design/META-INF/MANIFEST.MF
+++ b/org.eclipse.emf.ecoretools.design/META-INF/MANIFEST.MF
@@ -3,15 +3,15 @@
Bundle-SymbolicName: org.eclipse.emf.ecoretools.design;singleton:=true
Bundle-Version: 3.4.0.qualifier
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.sirius.common;bundle-version="5.0.0",
- org.eclipse.sirius.ecore.extender;bundle-version="5.0.0",
- org.eclipse.sirius;bundle-version="5.0.0",
- org.eclipse.sirius.common.acceleo.aql;bundle-version="5.0.0",
- org.eclipse.sirius.diagram;bundle-version="5.0.0",
- org.eclipse.sirius.ext.base;bundle-version="5.0.0",
- org.eclipse.sirius.ext.emf;bundle-version="5.0.0",
- org.eclipse.sirius.table;bundle-version="5.0.0",
- org.eclipse.sirius.properties;bundle-version="5.0.0",
+Require-Bundle: org.eclipse.sirius.common;bundle-version="7.0.0",
+ org.eclipse.sirius.ecore.extender;bundle-version="7.0.0",
+ org.eclipse.sirius;bundle-version="7.0.0",
+ org.eclipse.sirius.common.acceleo.aql;bundle-version="7.0.0",
+ org.eclipse.sirius.diagram;bundle-version="7.0.0",
+ org.eclipse.sirius.ext.base;bundle-version="7.0.0",
+ org.eclipse.sirius.ext.emf;bundle-version="7.0.0",
+ org.eclipse.sirius.table;bundle-version="7.0.0",
+ org.eclipse.sirius.properties;bundle-version="7.0.0",
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.emf.ecore.xmi,
diff --git a/org.eclipse.emf.ecoretools.design/src/org/eclipse/emf/ecoretools/design/service/DesignServices.java b/org.eclipse.emf.ecoretools.design/src/org/eclipse/emf/ecoretools/design/service/DesignServices.java
index 002e40e..f0c8e55 100644
--- a/org.eclipse.emf.ecoretools.design/src/org/eclipse/emf/ecoretools/design/service/DesignServices.java
+++ b/org.eclipse.emf.ecoretools.design/src/org/eclipse/emf/ecoretools/design/service/DesignServices.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2013, 2019 THALES GLOBAL SERVICES and Others
+ * Copyright (c) 2013, 2021 THALES GLOBAL SERVICES and Others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -68,13 +68,13 @@
import org.eclipse.sirius.diagram.EdgeTarget;
import org.eclipse.sirius.diagram.business.api.query.DDiagramQuery;
import org.eclipse.sirius.diagram.business.internal.helper.task.operations.CreateViewTask;
-import org.eclipse.sirius.diagram.business.internal.metamodel.helper.ContainerMappingHelper;
-import org.eclipse.sirius.diagram.business.internal.metamodel.helper.ContentHelper;
-import org.eclipse.sirius.diagram.business.internal.query.DDiagramInternalQuery;
import org.eclipse.sirius.diagram.description.AbstractNodeMapping;
import org.eclipse.sirius.diagram.description.DiagramElementMapping;
import org.eclipse.sirius.diagram.description.tool.CreateView;
import org.eclipse.sirius.diagram.description.tool.ToolFactory;
+import org.eclipse.sirius.diagram.model.business.internal.helper.ContentHelper;
+import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper;
+import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramInternalQuery;
import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor;
import org.eclipse.sirius.ecore.extender.business.api.accessor.exception.FeatureNotFoundException;
import org.eclipse.sirius.ecore.extender.business.api.accessor.exception.MetaClassNotFoundException;
@@ -894,13 +894,13 @@
}
}
} else if (containerView instanceof DNodeContainer) {
- for (DiagramElementMapping mapping : ContainerMappingHelper.getAllContainerMappings((((DNodeContainer) containerView).getActualMapping()))) {
+ for (DiagramElementMapping mapping : MappingHelper.getAllContainerMappings((((DNodeContainer) containerView).getActualMapping()))) {
String domainClass = ((AbstractNodeMapping) mapping).getDomainClass();
if (modelAccessor.eInstanceOf(semanticElement, domainClass) && !mapping.isCreateElements()) {
mappings.add(mapping);
}
}
- for (DiagramElementMapping mapping : ContainerMappingHelper.getAllNodeMappings((((DNodeContainer) containerView).getActualMapping()))) {
+ for (DiagramElementMapping mapping : MappingHelper.getAllNodeMappings((((DNodeContainer) containerView).getActualMapping()))) {
String domainClass = ((AbstractNodeMapping) mapping).getDomainClass();
if (modelAccessor.eInstanceOf(semanticElement, domainClass) && !mapping.isCreateElements()) {
mappings.add(mapping);
