diff options
| author | Maxime Porhel | 2021-08-26 18:18:28 +0000 |
|---|---|---|
| committer | Maxime Porhel | 2021-08-30 14:03:11 +0000 |
| commit | 5b4b0f5a1e1041b4644f80be031e5dc06526b26d (patch) | |
| tree | 589ba16920974bced7cd8c258e672eb3d5ce39f8 | |
| parent | 1f6ba31e8580973e493e8cdcb91cfb8029ed7007 (diff) | |
| download | org.eclipse.sirius-5b4b0f5a1e1041b4644f80be031e5dc06526b26d.tar.gz org.eclipse.sirius-5b4b0f5a1e1041b4644f80be031e5dc06526b26d.tar.xz org.eclipse.sirius-5b4b0f5a1e1041b4644f80be031e5dc06526b26d.zip | |
[531282] Rename Diagram model plugin internal packages
Bug: 531282
Change-Id: I837b531567fc66c38a3bab8c80d4ce2eb1350398
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
145 files changed, 249 insertions, 250 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/ElkDiagramLayoutConnector.java b/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/ElkDiagramLayoutConnector.java index 16d4169a21..1bce47da3b 100644 --- a/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/ElkDiagramLayoutConnector.java +++ b/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/ElkDiagramLayoutConnector.java @@ -112,8 +112,6 @@ import org.eclipse.sirius.diagram.LabelPosition; import org.eclipse.sirius.diagram.NodeStyle; import org.eclipse.sirius.diagram.business.api.query.DDiagramElementQuery; import org.eclipse.sirius.diagram.business.api.query.DNodeQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.description.BooleanLayoutOption; import org.eclipse.sirius.diagram.description.CustomLayoutConfiguration; import org.eclipse.sirius.diagram.description.DescriptionPackage; @@ -126,6 +124,8 @@ import org.eclipse.sirius.diagram.description.LayoutOption; import org.eclipse.sirius.diagram.description.LayoutOptionTarget; import org.eclipse.sirius.diagram.description.StringLayoutOption; import org.eclipse.sirius.diagram.description.style.Side; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.business.api.query.EditPartQuery; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramElementContainerEditPart; import org.eclipse.sirius.diagram.ui.edit.api.part.IAbstractDiagramNodeEditPart; diff --git a/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/GmfLayoutEditPolicy.java b/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/GmfLayoutEditPolicy.java index 408a12a358..86e412fb3c 100644 --- a/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/GmfLayoutEditPolicy.java +++ b/plugins/org.eclipse.sirius.diagram.elk/src/org/eclipse/sirius/diagram/elk/GmfLayoutEditPolicy.java @@ -73,8 +73,8 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.sirius.diagram.DDiagramElement; import org.eclipse.sirius.diagram.DDiagramElementContainer; import org.eclipse.sirius.diagram.DNodeContainer; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DNodeContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.internal.refresh.GMFHelper; import org.eclipse.sirius.viewpoint.LabelAlignment; import org.eclipse.sirius.viewpoint.LabelStyle; diff --git a/plugins/org.eclipse.sirius.diagram.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.diagram.model/META-INF/MANIFEST.MF index fbfa5414b7..5c784da6e2 100644 --- a/plugins/org.eclipse.sirius.diagram.model/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.sirius.diagram.model/META-INF/MANIFEST.MF @@ -13,16 +13,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", com.google.guava;bundle-version="[21.0,30.2)" Eclipse-LazyStart: true Export-Package: org.eclipse.sirius.diagram;version="7.0.0", - org.eclipse.sirius.diagram.business.internal.metamodel.color;version="7.0.0";x-internal:=true, - org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions;version="7.0.0";x-internal:=true, - org.eclipse.sirius.diagram.business.internal.metamodel.description.spec;version="7.0.0";x-internal:=true, - org.eclipse.sirius.diagram.business.internal.metamodel.description.style.spec;version="7.0.0";x-internal:=true, - org.eclipse.sirius.diagram.business.internal.metamodel.description.tool.spec;version="7.0.0";x-internal:=true, - org.eclipse.sirius.diagram.business.internal.metamodel.helper.model;version="7.0.0";x-internal:=true, - org.eclipse.sirius.diagram.business.internal.metamodel.operations.model;version="7.0.0";x-internal:=true, - org.eclipse.sirius.diagram.business.internal.metamodel.query;version="7.0.0";x-internal:=true, - org.eclipse.sirius.diagram.business.internal.metamodel.spec;version="7.0.0";x-internal:=true, - org.eclipse.sirius.diagram.business.internal.query.model;version="7.0.0";x-internal:=true, org.eclipse.sirius.diagram.description;version="7.0.0", org.eclipse.sirius.diagram.description.concern;version="7.0.0", org.eclipse.sirius.diagram.description.concern.impl;version="7.0.0", @@ -39,6 +29,15 @@ Export-Package: org.eclipse.sirius.diagram;version="7.0.0", org.eclipse.sirius.diagram.description.tool.util;version="7.0.0", org.eclipse.sirius.diagram.description.util;version="7.0.0", org.eclipse.sirius.diagram.impl;version="7.0.0", + org.eclipse.sirius.diagram.model.business.internal.color;version="7.0.0";x-internal:=true, + org.eclipse.sirius.diagram.model.business.internal.description.extensions;version="7.0.0";x-internal:=true, + org.eclipse.sirius.diagram.model.business.internal.description.spec;version="7.0.0";x-internal:=true, + org.eclipse.sirius.diagram.model.business.internal.description.style.spec;version="7.0.0";x-internal:=true, + org.eclipse.sirius.diagram.model.business.internal.description.tool.spec;version="7.0.0";x-internal:=true, + org.eclipse.sirius.diagram.model.business.internal.helper;version="7.0.0";x-internal:=true, + org.eclipse.sirius.diagram.model.business.internal.operations;version="7.0.0";x-internal:=true, + org.eclipse.sirius.diagram.model.business.internal.query;version="7.0.0";x-internal:=true, + org.eclipse.sirius.diagram.model.business.internal.spec;version="7.0.0";x-internal:=true, org.eclipse.sirius.diagram.model.tools.internal;version="7.0.0";x-internal:=true, org.eclipse.sirius.diagram.model.tools.internal.util, org.eclipse.sirius.diagram.util;version="7.0.0" diff --git a/plugins/org.eclipse.sirius.diagram.model/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionFactoryImpl.java b/plugins/org.eclipse.sirius.diagram.model/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionFactoryImpl.java index d33669fc68..396a43c2cb 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionFactoryImpl.java +++ b/plugins/org.eclipse.sirius.diagram.model/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionFactoryImpl.java @@ -19,14 +19,6 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.AdditionalLayerSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.ContainerMappingImportSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.ContainerMappingSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.DiagramDescriptionSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.DiagramImportDescriptionSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.LayerSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.NodeMappingImportSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.NodeMappingSpec; import org.eclipse.sirius.diagram.description.AdditionalLayer; import org.eclipse.sirius.diagram.description.BooleanLayoutOption; import org.eclipse.sirius.diagram.description.CenteringStyle; @@ -58,6 +50,14 @@ import org.eclipse.sirius.diagram.description.NodeMapping; import org.eclipse.sirius.diagram.description.NodeMappingImport; import org.eclipse.sirius.diagram.description.OrderedTreeLayout; import org.eclipse.sirius.diagram.description.StringLayoutOption; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.AdditionalLayerSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.ContainerMappingImportSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.ContainerMappingSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.DiagramDescriptionSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.DiagramImportDescriptionSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.LayerSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.NodeMappingImportSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.NodeMappingSpec; /** * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc --> diff --git a/plugins/org.eclipse.sirius.diagram.model/src-gen/org/eclipse/sirius/diagram/description/style/impl/StyleFactoryImpl.java b/plugins/org.eclipse.sirius.diagram.model/src-gen/org/eclipse/sirius/diagram/description/style/impl/StyleFactoryImpl.java index 61bbc8b6dd..f84f5a4989 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src-gen/org/eclipse/sirius/diagram/description/style/impl/StyleFactoryImpl.java +++ b/plugins/org.eclipse.sirius.diagram.model/src-gen/org/eclipse/sirius/diagram/description/style/impl/StyleFactoryImpl.java @@ -19,10 +19,6 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; -import org.eclipse.sirius.diagram.business.internal.metamodel.color.DiagramDefaultColorStyleDescription; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.style.spec.BeginLabelStyleDescriptionSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.style.spec.CenterLabelStyleDescriptionSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.style.spec.EndLabelStyleDescriptionSpec; import org.eclipse.sirius.diagram.description.style.BeginLabelStyleDescription; import org.eclipse.sirius.diagram.description.style.BorderedStyleDescription; import org.eclipse.sirius.diagram.description.style.BracketEdgeStyleDescription; @@ -44,6 +40,10 @@ import org.eclipse.sirius.diagram.description.style.SquareDescription; import org.eclipse.sirius.diagram.description.style.StyleFactory; import org.eclipse.sirius.diagram.description.style.StylePackage; import org.eclipse.sirius.diagram.description.style.WorkspaceImageDescription; +import org.eclipse.sirius.diagram.model.business.internal.color.DiagramDefaultColorStyleDescription; +import org.eclipse.sirius.diagram.model.business.internal.description.style.spec.BeginLabelStyleDescriptionSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.style.spec.CenterLabelStyleDescriptionSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.style.spec.EndLabelStyleDescriptionSpec; /** * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc --> diff --git a/plugins/org.eclipse.sirius.diagram.model/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolFactoryImpl.java b/plugins/org.eclipse.sirius.diagram.model/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolFactoryImpl.java index 8b29ec75c8..55974080d1 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolFactoryImpl.java +++ b/plugins/org.eclipse.sirius.diagram.model/src-gen/org/eclipse/sirius/diagram/description/tool/impl/ToolFactoryImpl.java @@ -19,13 +19,6 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.tool.spec.ContainerDropDescriptionSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.tool.spec.DeleteElementDescriptionSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.tool.spec.DiagramCreationDescriptionSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.tool.spec.DiagramNavigationDescriptionSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.tool.spec.DirectEditLabelSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.tool.spec.ReconnectEdgeDescriptionSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.tool.spec.ToolSectionSpec; import org.eclipse.sirius.diagram.description.tool.BehaviorTool; import org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription; import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription; @@ -55,6 +48,13 @@ import org.eclipse.sirius.diagram.description.tool.ToolGroup; import org.eclipse.sirius.diagram.description.tool.ToolGroupExtension; import org.eclipse.sirius.diagram.description.tool.ToolPackage; import org.eclipse.sirius.diagram.description.tool.ToolSection; +import org.eclipse.sirius.diagram.model.business.internal.description.tool.spec.ContainerDropDescriptionSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.tool.spec.DeleteElementDescriptionSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.tool.spec.DiagramCreationDescriptionSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.tool.spec.DiagramNavigationDescriptionSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.tool.spec.DirectEditLabelSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.tool.spec.ReconnectEdgeDescriptionSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.tool.spec.ToolSectionSpec; import org.eclipse.sirius.viewpoint.description.tool.ContainerViewVariable; import org.eclipse.sirius.viewpoint.description.tool.DropContainerVariable; import org.eclipse.sirius.viewpoint.description.tool.EditMaskVariables; diff --git a/plugins/org.eclipse.sirius.diagram.model/src-gen/org/eclipse/sirius/diagram/impl/DiagramFactoryImpl.java b/plugins/org.eclipse.sirius.diagram.model/src-gen/org/eclipse/sirius/diagram/impl/DiagramFactoryImpl.java index 62e5306a4f..059bbdc571 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src-gen/org/eclipse/sirius/diagram/impl/DiagramFactoryImpl.java +++ b/plugins/org.eclipse.sirius.diagram.model/src-gen/org/eclipse/sirius/diagram/impl/DiagramFactoryImpl.java @@ -70,13 +70,13 @@ import org.eclipse.sirius.diagram.ShapeContainerStyle; import org.eclipse.sirius.diagram.Square; import org.eclipse.sirius.diagram.TypedVariableValue; import org.eclipse.sirius.diagram.WorkspaceImage; -import org.eclipse.sirius.diagram.business.internal.metamodel.spec.DDiagramSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.spec.DEdgeSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.spec.DNodeContainerSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.spec.DNodeListElementSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.spec.DNodeListSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.spec.DNodeSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.spec.DSemanticDiagramSpec; +import org.eclipse.sirius.diagram.model.business.internal.spec.DDiagramSpec; +import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec; +import org.eclipse.sirius.diagram.model.business.internal.spec.DNodeContainerSpec; +import org.eclipse.sirius.diagram.model.business.internal.spec.DNodeListElementSpec; +import org.eclipse.sirius.diagram.model.business.internal.spec.DNodeListSpec; +import org.eclipse.sirius.diagram.model.business.internal.spec.DNodeSpec; +import org.eclipse.sirius.diagram.model.business.internal.spec.DSemanticDiagramSpec; /** * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc --> diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/color/DiagramDefaultColorStyleDescription.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/color/DiagramDefaultColorStyleDescription.java index 1b3a0d7290..73dd7bdff5 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/color/DiagramDefaultColorStyleDescription.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/color/DiagramDefaultColorStyleDescription.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.color; +package org.eclipse.sirius.diagram.model.business.internal.color; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.diagram.description.style.BeginLabelStyleDescription; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/extensions/IContainerMappingExt.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/extensions/IContainerMappingExt.java index 5d029f187e..e712ec42ad 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/extensions/IContainerMappingExt.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/extensions/IContainerMappingExt.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions; +package org.eclipse.sirius.diagram.model.business.internal.description.extensions; import java.util.Map; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/extensions/INodeMappingExt.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/extensions/INodeMappingExt.java index a1fa91df0a..39a6ff4b06 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/extensions/INodeMappingExt.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/extensions/INodeMappingExt.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions; +package org.eclipse.sirius.diagram.model.business.internal.description.extensions; import java.util.Map; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/AdditionalLayerSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/spec/AdditionalLayerSpec.java index 0b7273a3d6..8cb09c342a 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/AdditionalLayerSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/spec/AdditionalLayerSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.spec; +package org.eclipse.sirius.diagram.model.business.internal.description.spec; import java.util.ArrayList; import java.util.Collection; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/ContainerMappingImportSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/spec/ContainerMappingImportSpec.java index d041e9eddb..e37ad1f754 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/ContainerMappingImportSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/spec/ContainerMappingImportSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.spec; +package org.eclipse.sirius.diagram.model.business.internal.description.spec; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/ContainerMappingSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/spec/ContainerMappingSpec.java index b53f7792b3..07f90afa9b 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/ContainerMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/spec/ContainerMappingSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.spec; +package org.eclipse.sirius.diagram.model.business.internal.description.spec; import java.util.HashMap; import java.util.Map; @@ -19,8 +19,8 @@ import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.diagram.DDiagramElement; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.IContainerMappingExt; import org.eclipse.sirius.diagram.description.impl.ContainerMappingImpl; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.IContainerMappingExt; import org.eclipse.sirius.viewpoint.DSemanticDecorator; /** diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/DiagramDescriptionSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/spec/DiagramDescriptionSpec.java index 1cbc350e69..61fed4dbf9 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/DiagramDescriptionSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/spec/DiagramDescriptionSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.spec; +package org.eclipse.sirius.diagram.model.business.internal.description.spec; import org.eclipse.sirius.diagram.DSemanticDiagram; import org.eclipse.sirius.diagram.DiagramFactory; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/DiagramImportDescriptionSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/spec/DiagramImportDescriptionSpec.java index 7ae39f5047..d6ccd7f95e 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/DiagramImportDescriptionSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/spec/DiagramImportDescriptionSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.spec; +package org.eclipse.sirius.diagram.model.business.internal.description.spec; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.EList; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/EdgeMappingImportWrapper.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/spec/EdgeMappingImportWrapper.java index 86cbbbd5d6..6ae90f3c64 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/EdgeMappingImportWrapper.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/spec/EdgeMappingImportWrapper.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.spec; +package org.eclipse.sirius.diagram.model.business.internal.description.spec; import java.util.HashMap; import java.util.Map; @@ -30,7 +30,6 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.Resource.Internal; import org.eclipse.sirius.diagram.DEdge; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; import org.eclipse.sirius.diagram.description.AbstractNodeMapping; import org.eclipse.sirius.diagram.description.ConditionalEdgeStyleDescription; import org.eclipse.sirius.diagram.description.DescriptionPackage; @@ -43,6 +42,7 @@ import org.eclipse.sirius.diagram.description.tool.DeleteElementDescription; import org.eclipse.sirius.diagram.description.tool.DirectEditLabel; import org.eclipse.sirius.diagram.description.tool.DoubleClickDescription; import org.eclipse.sirius.diagram.description.tool.ReconnectEdgeDescription; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; import org.eclipse.sirius.viewpoint.description.tool.PasteDescription; import org.eclipse.sirius.viewpoint.description.tool.RepresentationCreationDescription; import org.eclipse.sirius.viewpoint.description.tool.RepresentationNavigationDescription; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/LayerSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/spec/LayerSpec.java index 56640a33a7..95980fe930 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/LayerSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/spec/LayerSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.spec; +package org.eclipse.sirius.diagram.model.business.internal.description.spec; import java.util.ArrayList; import java.util.Collection; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/NodeMappingImportSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/spec/NodeMappingImportSpec.java index 112da83956..b04d3d3449 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/NodeMappingImportSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/spec/NodeMappingImportSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.spec; +package org.eclipse.sirius.diagram.model.business.internal.description.spec; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/NodeMappingSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/spec/NodeMappingSpec.java index 64cac9c9b5..dccb28d0c9 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/spec/NodeMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/spec/NodeMappingSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.spec; +package org.eclipse.sirius.diagram.model.business.internal.description.spec; import java.util.HashMap; import java.util.Map; @@ -18,8 +18,8 @@ import java.util.Map; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.diagram.DDiagramElement; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.INodeMappingExt; import org.eclipse.sirius.diagram.description.impl.NodeMappingImpl; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.INodeMappingExt; import org.eclipse.sirius.viewpoint.DSemanticDecorator; /** diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/style/spec/BeginLabelStyleDescriptionSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/style/spec/BeginLabelStyleDescriptionSpec.java index e1ddb23bc1..31e8f01dc4 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/style/spec/BeginLabelStyleDescriptionSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/style/spec/BeginLabelStyleDescriptionSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.style.spec; +package org.eclipse.sirius.diagram.model.business.internal.description.style.spec; import org.eclipse.sirius.diagram.description.style.impl.BeginLabelStyleDescriptionImpl; import org.eclipse.sirius.viewpoint.description.style.StylePackage; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/style/spec/CenterLabelStyleDescriptionSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/style/spec/CenterLabelStyleDescriptionSpec.java index e596a2826c..22a6618347 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/style/spec/CenterLabelStyleDescriptionSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/style/spec/CenterLabelStyleDescriptionSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.style.spec; +package org.eclipse.sirius.diagram.model.business.internal.description.style.spec; import org.eclipse.sirius.diagram.description.style.impl.CenterLabelStyleDescriptionImpl; import org.eclipse.sirius.viewpoint.description.style.StylePackage; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/style/spec/EndLabelStyleDescriptionSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/style/spec/EndLabelStyleDescriptionSpec.java index b713440a0e..64cb80ac03 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/style/spec/EndLabelStyleDescriptionSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/style/spec/EndLabelStyleDescriptionSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.style.spec; +package org.eclipse.sirius.diagram.model.business.internal.description.style.spec; import org.eclipse.sirius.diagram.description.style.impl.EndLabelStyleDescriptionImpl; import org.eclipse.sirius.viewpoint.description.style.StylePackage; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/tool/spec/ContainerDropDescriptionSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/tool/spec/ContainerDropDescriptionSpec.java index 4748dadcaa..19089b8da2 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/tool/spec/ContainerDropDescriptionSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/tool/spec/ContainerDropDescriptionSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.tool.spec; +package org.eclipse.sirius.diagram.model.business.internal.description.tool.spec; import java.util.Collection; import java.util.LinkedList; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/tool/spec/DeleteElementDescriptionSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/tool/spec/DeleteElementDescriptionSpec.java index 44e6c312af..08826243e5 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/tool/spec/DeleteElementDescriptionSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/tool/spec/DeleteElementDescriptionSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.tool.spec; +package org.eclipse.sirius.diagram.model.business.internal.description.tool.spec; import java.util.Collection; import java.util.LinkedList; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/tool/spec/DiagramCreationDescriptionSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/tool/spec/DiagramCreationDescriptionSpec.java index 77d65866ce..11079e1fc1 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/tool/spec/DiagramCreationDescriptionSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/tool/spec/DiagramCreationDescriptionSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.tool.spec; +package org.eclipse.sirius.diagram.model.business.internal.description.tool.spec; import java.util.Collection; import java.util.LinkedList; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/tool/spec/DiagramNavigationDescriptionSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/tool/spec/DiagramNavigationDescriptionSpec.java index cff411e504..d424fea693 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/tool/spec/DiagramNavigationDescriptionSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/tool/spec/DiagramNavigationDescriptionSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.tool.spec; +package org.eclipse.sirius.diagram.model.business.internal.description.tool.spec; import java.util.Collection; import java.util.LinkedList; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/tool/spec/DirectEditLabelSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/tool/spec/DirectEditLabelSpec.java index 402c794c94..8997acf598 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/tool/spec/DirectEditLabelSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/tool/spec/DirectEditLabelSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.tool.spec; +package org.eclipse.sirius.diagram.model.business.internal.description.tool.spec; import java.util.Collection; import java.util.LinkedList; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/tool/spec/ReconnectEdgeDescriptionSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/tool/spec/ReconnectEdgeDescriptionSpec.java index ae9999a53a..721387ab8a 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/tool/spec/ReconnectEdgeDescriptionSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/tool/spec/ReconnectEdgeDescriptionSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.tool.spec; +package org.eclipse.sirius.diagram.model.business.internal.description.tool.spec; import java.util.Collection; import java.util.LinkedList; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/tool/spec/ToolSectionSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/tool/spec/ToolSectionSpec.java index fcfaadf1f8..35623c3989 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/tool/spec/ToolSectionSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/description/tool/spec/ToolSectionSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.description.tool.spec; +package org.eclipse.sirius.diagram.model.business.internal.description.tool.spec; import java.util.LinkedHashSet; import java.util.Set; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/model/ContentHelper.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/helper/ContentHelper.java index eedb198e41..28a9c52bbd 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/model/ContentHelper.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/helper/ContentHelper.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.helper.model; +package org.eclipse.sirius.diagram.model.business.internal.helper; import java.util.ArrayList; import java.util.Collection; @@ -20,7 +20,6 @@ import java.util.List; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.EdgeMappingImportWrapper; import org.eclipse.sirius.diagram.description.AbstractNodeMapping; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DiagramDescription; @@ -31,6 +30,7 @@ import org.eclipse.sirius.diagram.description.EdgeMappingImport; import org.eclipse.sirius.diagram.description.Layer; import org.eclipse.sirius.diagram.description.NodeMapping; import org.eclipse.sirius.diagram.description.NodeMappingImport; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.EdgeMappingImportWrapper; /** * Helpers to navigate the Sirius Diagrams models. diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/model/ContentLayerHelper.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/helper/ContentLayerHelper.java index 89a93a93f0..bead031f96 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/model/ContentLayerHelper.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/helper/ContentLayerHelper.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.helper.model; +package org.eclipse.sirius.diagram.model.business.internal.helper; import java.util.ArrayList; import java.util.Collection; @@ -20,11 +20,11 @@ import java.util.Set; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.EdgeMappingImportWrapper; import org.eclipse.sirius.diagram.description.DiagramElementMapping; import org.eclipse.sirius.diagram.description.EdgeMapping; import org.eclipse.sirius.diagram.description.EdgeMappingImport; import org.eclipse.sirius.diagram.description.Layer; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.EdgeMappingImportWrapper; /** * Helpers to navigate the Sirius Diagrams models. diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/model/LayerModelHelper.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/helper/LayerModelHelper.java index fdc6fde578..6ec7e25fcc 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/model/LayerModelHelper.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/helper/LayerModelHelper.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.helper.model; +package org.eclipse.sirius.diagram.model.business.internal.helper; import java.util.ArrayList; import java.util.Collection; @@ -21,7 +21,6 @@ import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.diagram.DDiagram; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.EdgeMappingImportWrapper; import org.eclipse.sirius.diagram.description.AdditionalLayer; import org.eclipse.sirius.diagram.description.DiagramDescription; import org.eclipse.sirius.diagram.description.DiagramElementMapping; @@ -29,6 +28,7 @@ import org.eclipse.sirius.diagram.description.EdgeMapping; import org.eclipse.sirius.diagram.description.EdgeMappingImport; import org.eclipse.sirius.diagram.description.IEdgeMapping; import org.eclipse.sirius.diagram.description.Layer; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.EdgeMappingImportWrapper; import org.eclipse.sirius.viewpoint.description.DecorationDescription; /** diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/model/MappingExtHelper.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/helper/MappingExtHelper.java index ccea1290bb..159e1be6cb 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/model/MappingExtHelper.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/helper/MappingExtHelper.java @@ -10,19 +10,19 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.helper.model; +package org.eclipse.sirius.diagram.model.business.internal.helper; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.diagram.DDiagramElement; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.IContainerMappingExt; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.INodeMappingExt; import org.eclipse.sirius.diagram.description.AbstractNodeMapping; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.ContainerMappingImport; import org.eclipse.sirius.diagram.description.NodeMapping; import org.eclipse.sirius.diagram.description.NodeMappingImport; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.IContainerMappingExt; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.INodeMappingExt; import org.eclipse.sirius.viewpoint.DSemanticDecorator; /** diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/model/MappingHelper.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/helper/MappingHelper.java index 8deeb58054..71b00d1096 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/model/MappingHelper.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/helper/MappingHelper.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.helper.model; +package org.eclipse.sirius.diagram.model.business.internal.helper; import java.util.Collection; import java.util.LinkedHashSet; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/model/StyleConstants.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/helper/StyleConstants.java index 64e5d143ae..4df73d06bf 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/model/StyleConstants.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/helper/StyleConstants.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.helper.model; +package org.eclipse.sirius.diagram.model.business.internal.helper; import org.eclipse.sirius.viewpoint.description.style.StyleDescription; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/operations/model/DDiagramElementContainerOperations.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/operations/DDiagramElementContainerOperations.java index 471e83206a..1cc17dd176 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/operations/model/DDiagramElementContainerOperations.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/operations/DDiagramElementContainerOperations.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.operations.model; +package org.eclipse.sirius.diagram.model.business.internal.operations; import java.util.ArrayList; import java.util.Collection; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/operations/model/DDiagramElementSpecOperations.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/operations/DDiagramElementSpecOperations.java index 22db53526b..56f0b73e94 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/operations/model/DDiagramElementSpecOperations.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/operations/DDiagramElementSpecOperations.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.operations.model; +package org.eclipse.sirius.diagram.model.business.internal.operations; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.diagram.DDiagram; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/operations/model/DDiagramSpecOperations.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/operations/DDiagramSpecOperations.java index 25fb33fde4..0db1555a30 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/operations/model/DDiagramSpecOperations.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/operations/DDiagramSpecOperations.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.operations.model; +package org.eclipse.sirius.diagram.model.business.internal.operations; import java.util.Iterator; @@ -21,13 +21,13 @@ import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.DDiagramElementContainer; import org.eclipse.sirius.diagram.DEdge; import org.eclipse.sirius.diagram.DNode; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.EdgeMappingImportWrapper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.EdgeMapping; import org.eclipse.sirius.diagram.description.EdgeMappingImport; import org.eclipse.sirius.diagram.description.IEdgeMapping; import org.eclipse.sirius.diagram.description.NodeMapping; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.EdgeMappingImportWrapper; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; import org.eclipse.sirius.viewpoint.DView; /** diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/query/model/DDiagramElementContainerExperimentalQuery.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/query/DDiagramElementContainerExperimentalQuery.java index 2e9b13171f..c3f426a17a 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/query/model/DDiagramElementContainerExperimentalQuery.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/query/DDiagramElementContainerExperimentalQuery.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.query.model; +package org.eclipse.sirius.diagram.model.business.internal.query; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.diagram.DDiagramElementContainer; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/query/model/DDiagramInternalQuery.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/query/DDiagramInternalQuery.java index f03d31460e..d4566679d5 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/query/model/DDiagramInternalQuery.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/query/DDiagramInternalQuery.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.query.model; +package org.eclipse.sirius.diagram.model.business.internal.query; import java.util.ArrayList; import java.util.Collection; @@ -27,9 +27,9 @@ import org.eclipse.sirius.diagram.DNodeContainer; import org.eclipse.sirius.diagram.DNodeList; import org.eclipse.sirius.diagram.DNodeListElement; import org.eclipse.sirius.diagram.DiagramFactory; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.StyleConstants; import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription; import org.eclipse.sirius.diagram.description.filter.FilterDescription; +import org.eclipse.sirius.diagram.model.business.internal.helper.StyleConstants; import org.eclipse.sirius.model.business.internal.query.DRepresentationInternalQuery; import org.eclipse.sirius.viewpoint.Style; import org.eclipse.sirius.viewpoint.description.AnnotationEntry; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/query/model/DNodeContainerExperimentalQuery.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/query/DNodeContainerExperimentalQuery.java index 9380594e16..598e6d47a4 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/query/model/DNodeContainerExperimentalQuery.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/query/DNodeContainerExperimentalQuery.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.query.model; +package org.eclipse.sirius.diagram.model.business.internal.query; import org.eclipse.sirius.diagram.ContainerLayout; import org.eclipse.sirius.diagram.DNodeContainer; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/query/IEdgeMappingQuery.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/query/IEdgeMappingQuery.java index 24f99b11e6..d78ef488f0 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/query/IEdgeMappingQuery.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/query/IEdgeMappingQuery.java @@ -10,12 +10,12 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.query; +package org.eclipse.sirius.diagram.model.business.internal.query; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.EdgeMappingImportWrapper; import org.eclipse.sirius.diagram.description.EdgeMapping; import org.eclipse.sirius.diagram.description.EdgeMappingImport; import org.eclipse.sirius.diagram.description.IEdgeMapping; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.EdgeMappingImportWrapper; import org.eclipse.sirius.ext.base.Option; import org.eclipse.sirius.ext.base.Options; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DDiagramSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/spec/DDiagramSpec.java index d8f30f0205..004c28ad04 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DDiagramSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/spec/DDiagramSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.spec; +package org.eclipse.sirius.diagram.model.business.internal.spec; import java.util.Collection; @@ -22,10 +22,10 @@ import org.eclipse.sirius.diagram.DEdge; import org.eclipse.sirius.diagram.DNode; import org.eclipse.sirius.diagram.DNodeListElement; import org.eclipse.sirius.diagram.DiagramPackage; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramInternalQuery; import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription; import org.eclipse.sirius.diagram.description.filter.FilterDescription; import org.eclipse.sirius.diagram.impl.DDiagramImpl; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramInternalQuery; import org.eclipse.sirius.model.business.internal.query.DModelElementInternalQuery; import org.eclipse.sirius.viewpoint.DRepresentationElement; import org.eclipse.sirius.viewpoint.ViewpointPackage; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DEdgeSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/spec/DEdgeSpec.java index 2d537e8ebd..a725199561 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DEdgeSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/spec/DEdgeSpec.java @@ -10,17 +10,17 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.spec; +package org.eclipse.sirius.diagram.model.business.internal.spec; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.util.EObjectResolvingEList; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.DiagramPackage; import org.eclipse.sirius.diagram.EdgeTarget; -import org.eclipse.sirius.diagram.business.internal.metamodel.operations.model.DDiagramElementSpecOperations; -import org.eclipse.sirius.diagram.business.internal.metamodel.query.IEdgeMappingQuery; import org.eclipse.sirius.diagram.description.DiagramElementMapping; import org.eclipse.sirius.diagram.impl.DEdgeImpl; +import org.eclipse.sirius.diagram.model.business.internal.operations.DDiagramElementSpecOperations; +import org.eclipse.sirius.diagram.model.business.internal.query.IEdgeMappingQuery; import org.eclipse.sirius.viewpoint.Style; /** diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeContainerSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/spec/DNodeContainerSpec.java index 144af58e64..f000856ad8 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeContainerSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/spec/DNodeContainerSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.spec; +package org.eclipse.sirius.diagram.model.business.internal.spec; import java.util.ArrayList; import java.util.Collection; @@ -24,13 +24,13 @@ import org.eclipse.sirius.diagram.DDiagramElement; import org.eclipse.sirius.diagram.DDiagramElementContainer; import org.eclipse.sirius.diagram.DNode; import org.eclipse.sirius.diagram.DiagramPackage; -import org.eclipse.sirius.diagram.business.internal.metamodel.operations.model.DDiagramElementContainerOperations; -import org.eclipse.sirius.diagram.business.internal.metamodel.operations.model.DDiagramElementSpecOperations; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DiagramElementMapping; import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription; import org.eclipse.sirius.diagram.description.NodeMapping; import org.eclipse.sirius.diagram.impl.DNodeContainerImpl; +import org.eclipse.sirius.diagram.model.business.internal.operations.DDiagramElementContainerOperations; +import org.eclipse.sirius.diagram.model.business.internal.operations.DDiagramElementSpecOperations; import org.eclipse.sirius.viewpoint.Style; import com.google.common.base.Predicates; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeListElementSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/spec/DNodeListElementSpec.java index 206a1fe964..78343fcf6d 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeListElementSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/spec/DNodeListElementSpec.java @@ -10,13 +10,13 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.spec; +package org.eclipse.sirius.diagram.model.business.internal.spec; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.diagram.DDiagram; -import org.eclipse.sirius.diagram.business.internal.metamodel.operations.model.DDiagramElementSpecOperations; import org.eclipse.sirius.diagram.description.DiagramElementMapping; import org.eclipse.sirius.diagram.impl.DNodeListElementImpl; +import org.eclipse.sirius.diagram.model.business.internal.operations.DDiagramElementSpecOperations; import org.eclipse.sirius.viewpoint.DSemanticDecorator; import org.eclipse.sirius.viewpoint.Style; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeListSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/spec/DNodeListSpec.java index ede7a9ceae..daf44e24e0 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeListSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/spec/DNodeListSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.spec; +package org.eclipse.sirius.diagram.model.business.internal.spec; import java.util.ArrayList; import java.util.Collection; @@ -24,13 +24,13 @@ import org.eclipse.sirius.diagram.DDiagramElement; import org.eclipse.sirius.diagram.DDiagramElementContainer; import org.eclipse.sirius.diagram.DNode; import org.eclipse.sirius.diagram.DiagramPackage; -import org.eclipse.sirius.diagram.business.internal.metamodel.operations.model.DDiagramElementContainerOperations; -import org.eclipse.sirius.diagram.business.internal.metamodel.operations.model.DDiagramElementSpecOperations; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DiagramElementMapping; import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription; import org.eclipse.sirius.diagram.description.NodeMapping; import org.eclipse.sirius.diagram.impl.DNodeListImpl; +import org.eclipse.sirius.diagram.model.business.internal.operations.DDiagramElementContainerOperations; +import org.eclipse.sirius.diagram.model.business.internal.operations.DDiagramElementSpecOperations; import org.eclipse.sirius.viewpoint.Style; import com.google.common.base.Predicates; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/spec/DNodeSpec.java index d305a21d89..eba785c424 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DNodeSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/spec/DNodeSpec.java @@ -10,14 +10,14 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.spec; +package org.eclipse.sirius.diagram.model.business.internal.spec; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.diagram.DDiagram; -import org.eclipse.sirius.diagram.business.internal.metamodel.operations.model.DDiagramElementSpecOperations; import org.eclipse.sirius.diagram.description.DiagramElementMapping; import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription; import org.eclipse.sirius.diagram.impl.DNodeImpl; +import org.eclipse.sirius.diagram.model.business.internal.operations.DDiagramElementSpecOperations; import org.eclipse.sirius.viewpoint.DSemanticDecorator; import org.eclipse.sirius.viewpoint.Style; diff --git a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DSemanticDiagramSpec.java b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/spec/DSemanticDiagramSpec.java index 15dc2f4cd7..ab7c799d45 100644 --- a/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/business/internal/metamodel/spec/DSemanticDiagramSpec.java +++ b/plugins/org.eclipse.sirius.diagram.model/src/org/eclipse/sirius/diagram/model/business/internal/spec/DSemanticDiagramSpec.java @@ -10,7 +10,7 @@ * Contributors: * Obeo - initial API and implementation *******************************************************************************/ -package org.eclipse.sirius.diagram.business.internal.metamodel.spec; +package org.eclipse.sirius.diagram.model.business.internal.spec; import java.util.Collection; @@ -22,10 +22,10 @@ import org.eclipse.sirius.diagram.DEdge; import org.eclipse.sirius.diagram.DNode; import org.eclipse.sirius.diagram.DNodeListElement; import org.eclipse.sirius.diagram.DiagramPackage; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramInternalQuery; import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription; import org.eclipse.sirius.diagram.description.filter.FilterDescription; import org.eclipse.sirius.diagram.impl.DSemanticDiagramImpl; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramInternalQuery; import org.eclipse.sirius.model.business.internal.query.DModelElementInternalQuery; import org.eclipse.sirius.viewpoint.DRepresentationElement; import org.eclipse.sirius.viewpoint.ViewpointPackage; diff --git a/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/SequenceDDiagramSpec.java b/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/SequenceDDiagramSpec.java index da4843edc5..da05c5d34b 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/SequenceDDiagramSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/SequenceDDiagramSpec.java @@ -22,9 +22,9 @@ import org.eclipse.sirius.diagram.DEdge; import org.eclipse.sirius.diagram.DNode; import org.eclipse.sirius.diagram.DNodeListElement; import org.eclipse.sirius.diagram.DiagramPackage; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramInternalQuery; import org.eclipse.sirius.diagram.description.DragAndDropTargetDescription; import org.eclipse.sirius.diagram.description.filter.FilterDescription; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramInternalQuery; import org.eclipse.sirius.diagram.sequence.impl.SequenceDDiagramImpl; import org.eclipse.sirius.model.business.internal.query.DModelElementInternalQuery; import org.eclipse.sirius.viewpoint.DRepresentationElement; diff --git a/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/CombinedFragmentMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/CombinedFragmentMappingSpec.java index 95a0aedcf8..a05ff3e462 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/CombinedFragmentMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/CombinedFragmentMappingSpec.java @@ -18,8 +18,8 @@ import java.util.Map; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.diagram.DDiagramElement; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.IContainerMappingExt; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingExtHelper; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.IContainerMappingExt; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingExtHelper; import org.eclipse.sirius.diagram.sequence.description.impl.CombinedFragmentMappingImpl; import org.eclipse.sirius.viewpoint.DSemanticDecorator; diff --git a/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/EndOfLifeMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/EndOfLifeMappingSpec.java index 46084d396f..ad9e0d9509 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/EndOfLifeMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/EndOfLifeMappingSpec.java @@ -18,8 +18,8 @@ import java.util.Map; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.diagram.DDiagramElement; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.INodeMappingExt; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingExtHelper; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.INodeMappingExt; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingExtHelper; import org.eclipse.sirius.diagram.sequence.description.impl.EndOfLifeMappingImpl; import org.eclipse.sirius.viewpoint.DSemanticDecorator; diff --git a/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/ExecutionMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/ExecutionMappingSpec.java index 0c601a86de..28e3695f90 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/ExecutionMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/ExecutionMappingSpec.java @@ -18,8 +18,8 @@ import java.util.Map; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.diagram.DDiagramElement; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.INodeMappingExt; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingExtHelper; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.INodeMappingExt; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingExtHelper; import org.eclipse.sirius.diagram.sequence.description.impl.ExecutionMappingImpl; import org.eclipse.sirius.viewpoint.DSemanticDecorator; diff --git a/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/InstanceRoleMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/InstanceRoleMappingSpec.java index 4d49928bb0..40d9d118fc 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/InstanceRoleMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/InstanceRoleMappingSpec.java @@ -18,8 +18,8 @@ import java.util.Map; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.diagram.DDiagramElement; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.INodeMappingExt; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingExtHelper; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.INodeMappingExt; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingExtHelper; import org.eclipse.sirius.diagram.sequence.description.impl.InstanceRoleMappingImpl; import org.eclipse.sirius.viewpoint.DSemanticDecorator; diff --git a/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/InteractionUseMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/InteractionUseMappingSpec.java index 9b09c87f22..ca3c7dfa6b 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/InteractionUseMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/InteractionUseMappingSpec.java @@ -18,8 +18,8 @@ import java.util.Map; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.diagram.DDiagramElement; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.IContainerMappingExt; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingExtHelper; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.IContainerMappingExt; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingExtHelper; import org.eclipse.sirius.diagram.sequence.description.impl.InteractionUseMappingImpl; import org.eclipse.sirius.viewpoint.DSemanticDecorator; diff --git a/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/ObservationPointMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/ObservationPointMappingSpec.java index 8666ba603d..93405f8615 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/ObservationPointMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/ObservationPointMappingSpec.java @@ -18,8 +18,8 @@ import java.util.Map; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.diagram.DDiagramElement; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.INodeMappingExt; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingExtHelper; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.INodeMappingExt; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingExtHelper; import org.eclipse.sirius.diagram.sequence.description.impl.ObservationPointMappingImpl; import org.eclipse.sirius.viewpoint.DSemanticDecorator; diff --git a/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/OperandMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/OperandMappingSpec.java index 5468fb9dc2..9fb13a93b4 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/OperandMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/OperandMappingSpec.java @@ -18,8 +18,8 @@ import java.util.Map; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.diagram.DDiagramElement; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.IContainerMappingExt; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingExtHelper; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.IContainerMappingExt; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingExtHelper; import org.eclipse.sirius.diagram.sequence.description.impl.OperandMappingImpl; import org.eclipse.sirius.viewpoint.DSemanticDecorator; diff --git a/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/StateMappingSpec.java b/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/StateMappingSpec.java index 95584f6856..cbd216e302 100644 --- a/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/StateMappingSpec.java +++ b/plugins/org.eclipse.sirius.diagram.sequence.model/src/org/eclipse/sirius/diagram/sequence/model/business/internal/description/StateMappingSpec.java @@ -18,8 +18,8 @@ import java.util.Map; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.diagram.DDiagramElement; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.INodeMappingExt; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingExtHelper; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.INodeMappingExt; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingExtHelper; import org.eclipse.sirius.diagram.sequence.description.impl.StateMappingImpl; import org.eclipse.sirius.viewpoint.DSemanticDecorator; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/api/image/WorkspaceImageHelper.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/api/image/WorkspaceImageHelper.java index 5495ef72c9..26a2fe5c6c 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/api/image/WorkspaceImageHelper.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/api/image/WorkspaceImageHelper.java @@ -41,11 +41,11 @@ import org.eclipse.sirius.diagram.NodeStyle; import org.eclipse.sirius.diagram.WorkspaceImage; import org.eclipse.sirius.diagram.business.api.query.EObjectQuery; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.StyleHelper; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.description.style.BorderedStyleDescription; import org.eclipse.sirius.diagram.description.style.StyleFactory; import org.eclipse.sirius.diagram.description.style.WorkspaceImageDescription; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.business.internal.image.refresh.WorkspaceImageFigureRefresher; import org.eclipse.sirius.diagram.ui.business.internal.query.CustomizableQuery; import org.eclipse.sirius.viewpoint.BasicLabelStyle; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/CollapseSupportOnRegionMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/CollapseSupportOnRegionMigrationParticipant.java index d841337f98..2bc602b0d2 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/CollapseSupportOnRegionMigrationParticipant.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/CollapseSupportOnRegionMigrationParticipant.java @@ -28,7 +28,7 @@ import org.eclipse.sirius.business.api.query.DViewQuery; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.DDiagramElementContainer; import org.eclipse.sirius.diagram.business.api.refresh.DiagramCreationUtil; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeContainerViewNodeContainerCompartment2EditPart; import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeListViewNodeListCompartmentEditPart; import org.eclipse.sirius.diagram.ui.part.SiriusVisualIDRegistry; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/BorderSizeComputationExpressionMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/BorderSizeComputationExpressionMigrationParticipant.java index 7affff9cf8..69826cfae3 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/BorderSizeComputationExpressionMigrationParticipant.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/migration/description/BorderSizeComputationExpressionMigrationParticipant.java @@ -15,13 +15,13 @@ package org.eclipse.sirius.diagram.ui.business.internal.migration.description; import java.util.List; import org.eclipse.sirius.business.api.migration.AbstractVSMMigrationParticipant; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; import org.eclipse.sirius.diagram.description.ConditionalContainerStyleDescription; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DiagramDescription; import org.eclipse.sirius.diagram.description.DiagramExtensionDescription; import org.eclipse.sirius.diagram.description.Layer; import org.eclipse.sirius.diagram.description.style.ContainerStyleDescription; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; import org.eclipse.sirius.viewpoint.description.Group; import org.eclipse.sirius.viewpoint.description.Viewpoint; import org.osgi.framework.Version; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/query/DNodeContainerQuery.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/query/DNodeContainerQuery.java index 82a05c462c..f99f1b0796 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/query/DNodeContainerQuery.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/business/internal/query/DNodeContainerQuery.java @@ -15,8 +15,8 @@ package org.eclipse.sirius.diagram.ui.business.internal.query; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.sirius.diagram.DNodeContainer; import org.eclipse.sirius.diagram.FlatContainerStyle; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DNodeContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.tools.api.layout.LayoutUtils; import com.google.common.base.Preconditions; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDDiagramEditPart.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDDiagramEditPart.java index f23d9873bc..aeaa6e1e49 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDDiagramEditPart.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDDiagramEditPart.java @@ -60,8 +60,6 @@ import org.eclipse.sirius.diagram.business.api.query.DDiagramQuery; import org.eclipse.sirius.diagram.business.api.query.DMappingBasedQuery; import org.eclipse.sirius.diagram.business.api.query.EObjectQuery; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.LayerHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DiagramDescription; import org.eclipse.sirius.diagram.description.DiagramElementMapping; @@ -69,6 +67,8 @@ import org.eclipse.sirius.diagram.description.EdgeMapping; import org.eclipse.sirius.diagram.description.Layer; import org.eclipse.sirius.diagram.description.filter.CompositeFilterDescription; import org.eclipse.sirius.diagram.description.filter.FilterDescription; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; import org.eclipse.sirius.diagram.ui.business.api.query.ViewQuery; import org.eclipse.sirius.diagram.ui.business.internal.view.ShowingViewUtil; import org.eclipse.sirius.diagram.ui.graphical.edit.policies.SiriusPopupBarEditPolicy; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramBorderNodeEditPart.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramBorderNodeEditPart.java index 069aa8faa8..93faa50f74 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramBorderNodeEditPart.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramBorderNodeEditPart.java @@ -55,7 +55,7 @@ import org.eclipse.sirius.diagram.DNode; import org.eclipse.sirius.diagram.DiagramPackage; import org.eclipse.sirius.diagram.LabelPosition; import org.eclipse.sirius.diagram.NodeStyle; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; import org.eclipse.sirius.diagram.ui.business.api.query.ViewQuery; import org.eclipse.sirius.diagram.ui.business.api.view.SiriusLayoutDataManager; import org.eclipse.sirius.diagram.ui.business.internal.query.RequestQuery; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramContainerEditPart.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramContainerEditPart.java index 842c5461e0..5267b7ff1d 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramContainerEditPart.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramContainerEditPart.java @@ -45,9 +45,9 @@ import org.eclipse.sirius.diagram.DDiagramElementContainer; import org.eclipse.sirius.diagram.DNode; import org.eclipse.sirius.diagram.DNodeContainer; import org.eclipse.sirius.diagram.DiagramPackage; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DNodeContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.business.api.view.SiriusLayoutDataManager; import org.eclipse.sirius.diagram.ui.edit.internal.part.CommonEditPartOperation; import org.eclipse.sirius.diagram.ui.edit.internal.part.PortLayoutHelper; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramElementContainerEditPart.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramElementContainerEditPart.java index ba5f833564..59e6ba362b 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramElementContainerEditPart.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramElementContainerEditPart.java @@ -66,7 +66,7 @@ import org.eclipse.sirius.diagram.ResizeKind; import org.eclipse.sirius.diagram.ShapeContainerStyle; import org.eclipse.sirius.diagram.WorkspaceImage; import org.eclipse.sirius.diagram.business.api.query.DDiagramElementQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.business.internal.query.DNodeContainerQuery; import org.eclipse.sirius.diagram.ui.business.internal.view.ShowingViewUtil; import org.eclipse.sirius.diagram.ui.edit.internal.part.AbstractDiagramNodeEditPartOperation; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramNodeEditPart.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramNodeEditPart.java index 71a96a3fc7..1083515f29 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramNodeEditPart.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/edit/api/part/AbstractDiagramNodeEditPart.java @@ -60,7 +60,7 @@ import org.eclipse.sirius.diagram.LabelPosition; import org.eclipse.sirius.diagram.NodeStyle; import org.eclipse.sirius.diagram.ResizeKind; import org.eclipse.sirius.diagram.business.api.query.DDiagramElementQuery; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; import org.eclipse.sirius.diagram.ui.business.api.view.SiriusLayoutDataManager; import org.eclipse.sirius.diagram.ui.business.internal.query.RequestQuery; import org.eclipse.sirius.diagram.ui.edit.internal.part.AbstractDiagramNodeEditPartOperation; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/DoubleClickEditPolicy.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/DoubleClickEditPolicy.java index 576ae16dfd..24536005d5 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/DoubleClickEditPolicy.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/DoubleClickEditPolicy.java @@ -49,10 +49,10 @@ import org.eclipse.sirius.diagram.business.api.componentization.DiagramMappingsM import org.eclipse.sirius.diagram.business.api.componentization.DiagramMappingsManagerRegistry; import org.eclipse.sirius.diagram.business.api.query.DDiagramElementQuery; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.LayerHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; import org.eclipse.sirius.diagram.description.DiagramElementMapping; import org.eclipse.sirius.diagram.description.Layer; import org.eclipse.sirius.diagram.description.filter.CompositeFilterDescription; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; import org.eclipse.sirius.diagram.tools.api.command.ChangeLayerActivationCommand; import org.eclipse.sirius.diagram.tools.api.command.IDiagramCommandFactory; import org.eclipse.sirius.diagram.tools.api.command.IDiagramCommandFactoryProvider; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/RegionContainerResizableEditPolicy.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/RegionContainerResizableEditPolicy.java index 3ce0182cd9..44b524e88d 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/RegionContainerResizableEditPolicy.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/RegionContainerResizableEditPolicy.java @@ -33,7 +33,7 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalC import org.eclipse.gmf.runtime.notation.Node; import org.eclipse.sirius.diagram.DDiagramElement; import org.eclipse.sirius.diagram.DNodeContainer; -import org.eclipse.sirius.diagram.business.internal.query.model.DNodeContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.business.internal.query.RequestQuery; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramElementContainerEditPart; import org.eclipse.sirius.diagram.ui.edit.api.part.IDiagramElementEditPart; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/RegionResizableEditPolicy.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/RegionResizableEditPolicy.java index ddc4eef8d1..106e946a95 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/RegionResizableEditPolicy.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/graphical/edit/policies/RegionResizableEditPolicy.java @@ -49,7 +49,7 @@ import org.eclipse.sirius.diagram.DDiagramElementContainer; import org.eclipse.sirius.diagram.DNodeList; import org.eclipse.sirius.diagram.DNodeListElement; import org.eclipse.sirius.diagram.business.api.query.DDiagramElementQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.business.internal.query.RequestQuery; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramElementContainerEditPart; import org.eclipse.sirius.diagram.ui.edit.api.part.IDiagramElementEditPart; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/AbstractDNodeContainerCompartmentEditPart.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/AbstractDNodeContainerCompartmentEditPart.java index 11c46576de..57c7e84b57 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/AbstractDNodeContainerCompartmentEditPart.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/AbstractDNodeContainerCompartmentEditPart.java @@ -66,8 +66,8 @@ import org.eclipse.sirius.diagram.DDiagramElementContainer; import org.eclipse.sirius.diagram.DNodeContainer; import org.eclipse.sirius.diagram.DiagramPackage; import org.eclipse.sirius.diagram.business.api.query.DDiagramElementQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DNodeContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.business.api.query.ViewQuery; import org.eclipse.sirius.diagram.ui.business.internal.view.ShowingViewUtil; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramContainerEditPart; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/AbstractDNodeListCompartmentEditPart.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/AbstractDNodeListCompartmentEditPart.java index 70a80f058b..c99b659f3b 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/AbstractDNodeListCompartmentEditPart.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/parts/AbstractDNodeListCompartmentEditPart.java @@ -55,8 +55,8 @@ import org.eclipse.sirius.diagram.DDiagramElementContainer; import org.eclipse.sirius.diagram.DNodeList; import org.eclipse.sirius.diagram.DiagramPackage; import org.eclipse.sirius.diagram.business.api.query.DDiagramElementQuery; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.business.api.query.ViewQuery; import org.eclipse.sirius.diagram.ui.business.internal.query.RequestQuery; import org.eclipse.sirius.diagram.ui.business.internal.view.ShowingViewUtil; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/policies/RegionGraphicalNodeEditPolicy.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/policies/RegionGraphicalNodeEditPolicy.java index 475b32e3b0..c1e168e4d7 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/policies/RegionGraphicalNodeEditPolicy.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/edit/policies/RegionGraphicalNodeEditPolicy.java @@ -17,7 +17,7 @@ import org.eclipse.gef.Request; import org.eclipse.gef.commands.Command; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.sirius.diagram.DDiagramElementContainer; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.graphical.edit.policies.SiriusGraphicalNodeEditPolicy; /** diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/operation/RegionContainerUpdateLayoutOperation.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/operation/RegionContainerUpdateLayoutOperation.java index 053b0a72f5..43f24f2f8e 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/operation/RegionContainerUpdateLayoutOperation.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/operation/RegionContainerUpdateLayoutOperation.java @@ -31,9 +31,9 @@ import org.eclipse.sirius.diagram.BorderedStyle; import org.eclipse.sirius.diagram.DNodeContainer; import org.eclipse.sirius.diagram.WorkspaceImage; import org.eclipse.sirius.diagram.business.api.query.DDiagramElementQuery; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DNodeContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.business.api.view.SiriusGMFHelper; import org.eclipse.sirius.diagram.ui.business.internal.operation.AbstractModelChangeOperation; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramElementContainerEditPart; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/AbstractCanonicalSynchronizer.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/AbstractCanonicalSynchronizer.java index 74e75032b6..846bfb6fe7 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/AbstractCanonicalSynchronizer.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/AbstractCanonicalSynchronizer.java @@ -56,7 +56,7 @@ import org.eclipse.sirius.diagram.DNodeList; import org.eclipse.sirius.diagram.ResizeKind; import org.eclipse.sirius.diagram.business.api.query.DDiagramElementQuery; import org.eclipse.sirius.diagram.business.api.refresh.CanonicalSynchronizer; -import org.eclipse.sirius.diagram.business.internal.query.model.DNodeContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.business.api.query.ViewQuery; import org.eclipse.sirius.diagram.ui.business.api.view.SiriusLayoutDataManager; import org.eclipse.sirius.diagram.ui.business.internal.query.DNodeQuery; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/GMFHelper.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/GMFHelper.java index cfe638fdfb..821dd67614 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/GMFHelper.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/GMFHelper.java @@ -62,8 +62,8 @@ import org.eclipse.sirius.diagram.DNodeContainer; import org.eclipse.sirius.diagram.DNodeList; import org.eclipse.sirius.diagram.WorkspaceImage; import org.eclipse.sirius.diagram.business.api.query.DDiagramElementQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DNodeContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.business.api.query.NodeQuery; import org.eclipse.sirius.diagram.ui.business.api.query.ViewQuery; import org.eclipse.sirius.diagram.ui.business.internal.query.DNodeContainerQuery; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/view/factories/DNodeContainerViewNodeContainerCompartment2ViewFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/view/factories/DNodeContainerViewNodeContainerCompartment2ViewFactory.java index 32d8b47902..0e16f258cf 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/view/factories/DNodeContainerViewNodeContainerCompartment2ViewFactory.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/view/factories/DNodeContainerViewNodeContainerCompartment2ViewFactory.java @@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.notation.Style; import org.eclipse.gmf.runtime.notation.TitleStyle; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.sirius.diagram.DNodeContainer; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeContainerViewNodeContainerCompartment2EditPart; import org.eclipse.sirius.diagram.ui.part.SiriusVisualIDRegistry; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/view/factories/DNodeListViewNodeListCompartmentViewFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/view/factories/DNodeListViewNodeListCompartmentViewFactory.java index c469074e66..f2185f791f 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/view/factories/DNodeListViewNodeListCompartmentViewFactory.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/view/factories/DNodeListViewNodeListCompartmentViewFactory.java @@ -25,7 +25,7 @@ import org.eclipse.gmf.runtime.notation.Style; import org.eclipse.gmf.runtime.notation.TitleStyle; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.sirius.diagram.DNodeList; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.internal.edit.parts.DNodeListViewNodeListCompartmentEditPart; import org.eclipse.sirius.diagram.ui.part.SiriusVisualIDRegistry; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/SizeBothAction.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/SizeBothAction.java index 90ba1e691a..d6c0135cff 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/SizeBothAction.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/SizeBothAction.java @@ -31,7 +31,7 @@ import org.eclipse.gmf.runtime.notation.NotationPackage; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.DNodeContainer; -import org.eclipse.sirius.diagram.business.internal.query.model.DNodeContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramContainerEditPart; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramElementContainerEditPart; import org.eclipse.sirius.diagram.ui.internal.edit.parts.AbstractDNodeContainerCompartmentEditPart; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/visibility/HideDDiagramElementAction.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/visibility/HideDDiagramElementAction.java index 1421a4959f..36e05d9774 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/visibility/HideDDiagramElementAction.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/actions/visibility/HideDDiagramElementAction.java @@ -40,7 +40,7 @@ import org.eclipse.sirius.diagram.DDiagramElementContainer; import org.eclipse.sirius.diagram.business.api.diagramtype.DiagramTypeDescriptorRegistry; import org.eclipse.sirius.diagram.business.api.diagramtype.IDiagramDescriptionProvider; import org.eclipse.sirius.diagram.business.api.diagramtype.IDiagramTypeDescriptor; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; import org.eclipse.sirius.diagram.tools.api.command.IDiagramCommandFactory; import org.eclipse.sirius.diagram.tools.api.command.IDiagramCommandFactoryProvider; import org.eclipse.sirius.diagram.ui.edit.api.part.IDiagramElementEditPart; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/LayersContribution.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/LayersContribution.java index 86ca3dd531..df647be1cb 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/LayersContribution.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/tabbar/LayersContribution.java @@ -31,10 +31,10 @@ import org.eclipse.sirius.common.ui.tools.api.util.ImageProvider; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.business.api.componentization.DiagramComponentizationManager; import org.eclipse.sirius.diagram.business.api.query.DDiagramQuery; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; import org.eclipse.sirius.diagram.description.AdditionalLayer; import org.eclipse.sirius.diagram.description.DiagramDescription; import org.eclipse.sirius.diagram.description.Layer; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin; import org.eclipse.sirius.diagram.ui.provider.Messages; import org.eclipse.sirius.diagram.ui.tools.internal.editor.tabbar.actions.LayersActivationAction; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/ArrangeAllWithAutoSize.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/ArrangeAllWithAutoSize.java index ad71d26232..b490c78850 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/ArrangeAllWithAutoSize.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/ArrangeAllWithAutoSize.java @@ -40,8 +40,8 @@ import org.eclipse.gmf.runtime.notation.View; import org.eclipse.sirius.diagram.DDiagramElement; import org.eclipse.sirius.diagram.DDiagramElementContainer; import org.eclipse.sirius.diagram.DNodeContainer; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DNodeContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.tools.api.layout.PinHelper; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramBorderNodeEditPart; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramElementContainerEditPart; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/AutoSizeAndRegionAwareGraphLayout.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/AutoSizeAndRegionAwareGraphLayout.java index 80dc6f70d5..a2040078c0 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/AutoSizeAndRegionAwareGraphLayout.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/AutoSizeAndRegionAwareGraphLayout.java @@ -45,8 +45,8 @@ import org.eclipse.gmf.runtime.draw2d.ui.internal.graph.VirtualNode; import org.eclipse.sirius.diagram.DDiagramElement; import org.eclipse.sirius.diagram.DDiagramElementContainer; import org.eclipse.sirius.diagram.DNodeContainer; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DNodeContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.edit.api.part.IAbstractDiagramNodeEditPart; import org.eclipse.sirius.diagram.ui.edit.api.part.IDiagramContainerEditPart; import org.eclipse.sirius.diagram.ui.internal.edit.parts.AbstractDNodeContainerCompartmentEditPart; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/provider/BorderItemAwareLayoutProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/provider/BorderItemAwareLayoutProvider.java index 621f0fc40c..60a89de691 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/provider/BorderItemAwareLayoutProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/layout/provider/BorderItemAwareLayoutProvider.java @@ -80,7 +80,7 @@ import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.DDiagramElement; import org.eclipse.sirius.diagram.DNodeContainer; -import org.eclipse.sirius.diagram.business.internal.query.model.DNodeContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.tools.api.layout.PinHelper; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramBorderNodeEditPart; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramNameEditPart; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AdditionalLayerItemProvider.java b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AdditionalLayerItemProvider.java index b3d478bce9..e69e4b917e 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AdditionalLayerItemProvider.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src-gen/org/eclipse/sirius/diagram/description/provider/AdditionalLayerItemProvider.java @@ -30,10 +30,10 @@ import org.eclipse.emf.edit.provider.StyledString; import org.eclipse.emf.edit.provider.StyledString.Style; import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.sirius.business.api.query.IdentifiedElementQuery; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; import org.eclipse.sirius.diagram.description.AdditionalLayer; import org.eclipse.sirius.diagram.description.DescriptionPackage; import org.eclipse.sirius.diagram.description.Layer; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; import org.eclipse.sirius.ext.base.Option; import org.eclipse.sirius.ui.tools.internal.util.EMFCoreUtil; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/tools/api/properties/ContainerMappingImportSelectionWizardItemsBuilder.java b/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/tools/api/properties/ContainerMappingImportSelectionWizardItemsBuilder.java index d2cb917536..d3f62ead62 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/tools/api/properties/ContainerMappingImportSelectionWizardItemsBuilder.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/tools/api/properties/ContainerMappingImportSelectionWizardItemsBuilder.java @@ -17,11 +17,11 @@ import java.util.List; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.sirius.common.tools.api.util.TreeItemWrapper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.ContentHelper; import org.eclipse.sirius.diagram.description.AbstractNodeMapping; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.ContainerMappingImport; import org.eclipse.sirius.diagram.description.DiagramDescription; +import org.eclipse.sirius.diagram.model.business.internal.helper.ContentHelper; import org.eclipse.sirius.viewpoint.description.AbstractMappingImport; import org.eclipse.sirius.viewpoint.description.Viewpoint; diff --git a/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/tools/api/properties/NodeMappingImportSelectionWizardItemsBuilder.java b/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/tools/api/properties/NodeMappingImportSelectionWizardItemsBuilder.java index d4a8683cd2..43ce005251 100644 --- a/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/tools/api/properties/NodeMappingImportSelectionWizardItemsBuilder.java +++ b/plugins/org.eclipse.sirius.diagram.ui/src/org/eclipse/sirius/diagram/ui/tools/api/properties/NodeMappingImportSelectionWizardItemsBuilder.java @@ -18,12 +18,12 @@ import java.util.List; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.sirius.common.tools.api.util.TreeItemWrapper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.ContentHelper; import org.eclipse.sirius.diagram.description.AbstractNodeMapping; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DiagramDescription; import org.eclipse.sirius.diagram.description.NodeMapping; import org.eclipse.sirius.diagram.description.NodeMappingImport; +import org.eclipse.sirius.diagram.model.business.internal.helper.ContentHelper; import org.eclipse.sirius.viewpoint.description.AbstractMappingImport; import org.eclipse.sirius.viewpoint.description.Viewpoint; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/componentization/DiagramComponentizationManager.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/componentization/DiagramComponentizationManager.java index 524f20c7a3..0f17e8c05d 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/componentization/DiagramComponentizationManager.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/componentization/DiagramComponentizationManager.java @@ -25,9 +25,6 @@ import org.eclipse.sirius.business.api.query.ViewpointQuery; import org.eclipse.sirius.common.tools.api.util.EqualityHelper; import org.eclipse.sirius.diagram.business.api.query.DiagramDescriptionQuery; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.DiagramComponentizationHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.ContentHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.ContentLayerHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DiagramDescription; import org.eclipse.sirius.diagram.description.DiagramExtensionDescription; @@ -37,6 +34,9 @@ import org.eclipse.sirius.diagram.description.NodeMapping; import org.eclipse.sirius.diagram.description.tool.ToolGroup; import org.eclipse.sirius.diagram.description.tool.ToolGroupExtension; import org.eclipse.sirius.diagram.description.tool.ToolSection; +import org.eclipse.sirius.diagram.model.business.internal.helper.ContentHelper; +import org.eclipse.sirius.diagram.model.business.internal.helper.ContentLayerHelper; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; import org.eclipse.sirius.viewpoint.description.RepresentationDescription; import org.eclipse.sirius.viewpoint.description.Viewpoint; import org.eclipse.sirius.viewpoint.description.tool.AbstractToolDescription; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/helper/SiriusDiagramHelper.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/helper/SiriusDiagramHelper.java index ed1dd4f275..06652176cf 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/helper/SiriusDiagramHelper.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/helper/SiriusDiagramHelper.java @@ -29,11 +29,11 @@ import org.eclipse.sirius.diagram.DNodeListElement; import org.eclipse.sirius.diagram.DSemanticDiagram; import org.eclipse.sirius.diagram.DragAndDropTarget; import org.eclipse.sirius.diagram.business.api.query.GroupQuery; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.IContainerMappingExt; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.INodeMappingExt; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.ContainerMappingWithInterpreterHelper; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.NodeMappingHelper; import org.eclipse.sirius.diagram.description.DiagramDescription; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.IContainerMappingExt; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.INodeMappingExt; import org.eclipse.sirius.ext.base.Option; import org.eclipse.sirius.tools.api.SiriusPlugin; import org.eclipse.sirius.viewpoint.description.Group; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/helper/decoration/DecorationHelper.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/helper/decoration/DecorationHelper.java index 0bd60399f8..dd84c0cde7 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/helper/decoration/DecorationHelper.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/helper/decoration/DecorationHelper.java @@ -18,9 +18,9 @@ import java.util.List; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.DDiagramElement; import org.eclipse.sirius.diagram.business.internal.helper.decoration.DecorationHelperInternal; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; import org.eclipse.sirius.diagram.description.AdditionalLayer; import org.eclipse.sirius.diagram.description.Layer; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; import org.eclipse.sirius.viewpoint.description.DecorationDescription; import com.google.common.collect.Iterables; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/helper/layers/LayerService.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/helper/layers/LayerService.java index c319ae683b..7bf547126d 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/helper/layers/LayerService.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/helper/layers/LayerService.java @@ -12,8 +12,8 @@ *******************************************************************************/ package org.eclipse.sirius.diagram.business.api.helper.layers; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; import org.eclipse.sirius.diagram.description.DiagramDescription; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; /** * A temporary service. diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/DDiagramQuery.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/DDiagramQuery.java index 1007503c5d..1b6cdd0f31 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/DDiagramQuery.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/DDiagramQuery.java @@ -27,8 +27,8 @@ import org.eclipse.sirius.diagram.DSemanticDiagram; import org.eclipse.sirius.diagram.business.api.componentization.DiagramMappingsManager; import org.eclipse.sirius.diagram.business.api.componentization.DiagramMappingsManagerRegistry; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.LayerHelper; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramInternalQuery; import org.eclipse.sirius.diagram.description.Layer; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramInternalQuery; /** * A class aggregating all the queries (read-only!) having a {@link DDiagram} as a starting point. diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/DiagramDescriptionQuery.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/DiagramDescriptionQuery.java index 553f8a47e6..68f2be7742 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/DiagramDescriptionQuery.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/DiagramDescriptionQuery.java @@ -24,11 +24,11 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.diagram.business.api.diagramtype.DiagramTypeDescriptorRegistry; import org.eclipse.sirius.diagram.business.api.diagramtype.IDiagramTypeDescriptor; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; import org.eclipse.sirius.diagram.description.DiagramDescription; import org.eclipse.sirius.diagram.description.DiagramImportDescription; import org.eclipse.sirius.diagram.description.Layer; import org.eclipse.sirius.diagram.description.tool.ToolSection; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; import org.eclipse.sirius.diagram.tools.api.preferences.SiriusDiagramPreferencesKeys; import org.eclipse.sirius.diagram.tools.internal.DiagramPlugin; import org.eclipse.sirius.ext.base.Option; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/DiagramExtensionDescriptionQuery.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/DiagramExtensionDescriptionQuery.java index eed66b13e7..dfc3b2adb5 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/DiagramExtensionDescriptionQuery.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/DiagramExtensionDescriptionQuery.java @@ -14,10 +14,10 @@ package org.eclipse.sirius.diagram.business.api.query; import java.util.Collection; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.ContentHelper; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DiagramExtensionDescription; import org.eclipse.sirius.diagram.description.NodeMapping; +import org.eclipse.sirius.diagram.model.business.internal.helper.ContentHelper; /** * A class aggregating all the queries (read-only!) having a DiagramDescription as a starting point. diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/IEdgeMappingQuery.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/IEdgeMappingQuery.java index 00ff2c91a4..c9802eb191 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/IEdgeMappingQuery.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/query/IEdgeMappingQuery.java @@ -24,7 +24,7 @@ import org.eclipse.sirius.ext.base.Option; */ public class IEdgeMappingQuery { - private org.eclipse.sirius.diagram.business.internal.metamodel.query.IEdgeMappingQuery internalQuery; + private org.eclipse.sirius.diagram.model.business.internal.query.IEdgeMappingQuery internalQuery; /** * Create a new query. @@ -33,7 +33,7 @@ public class IEdgeMappingQuery { * the element to query. */ public IEdgeMappingQuery(IEdgeMapping iEdgeMapping) { - this.internalQuery = new org.eclipse.sirius.diagram.business.internal.metamodel.query.IEdgeMappingQuery(iEdgeMapping); + this.internalQuery = new org.eclipse.sirius.diagram.model.business.internal.query.IEdgeMappingQuery(iEdgeMapping); } /** diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/refresh/AbstractUniqueRefreshExtension.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/refresh/AbstractUniqueRefreshExtension.java index 93154bdffd..8c2006353a 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/refresh/AbstractUniqueRefreshExtension.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/api/refresh/AbstractUniqueRefreshExtension.java @@ -30,12 +30,12 @@ import org.eclipse.sirius.diagram.DNodeContainer; import org.eclipse.sirius.diagram.DNodeList; import org.eclipse.sirius.diagram.DNodeListElement; import org.eclipse.sirius.diagram.business.internal.helper.refresh.EdgeFilter; -import org.eclipse.sirius.diagram.business.internal.metamodel.operations.model.DDiagramSpecOperations; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DiagramDescription; import org.eclipse.sirius.diagram.description.DiagramElementMapping; import org.eclipse.sirius.diagram.description.EdgeMapping; import org.eclipse.sirius.diagram.description.NodeMapping; +import org.eclipse.sirius.diagram.model.business.internal.operations.DDiagramSpecOperations; import org.eclipse.sirius.diagram.tools.internal.Messages; import org.eclipse.sirius.tools.api.SiriusPlugin; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/componentization/mappings/DiagramDescriptionMappingsManagerImpl.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/componentization/mappings/DiagramDescriptionMappingsManagerImpl.java index b4e0b5544b..28317cfa87 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/componentization/mappings/DiagramDescriptionMappingsManagerImpl.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/componentization/mappings/DiagramDescriptionMappingsManagerImpl.java @@ -22,12 +22,12 @@ import org.eclipse.sirius.diagram.business.api.componentization.DiagramComponent import org.eclipse.sirius.diagram.business.api.componentization.DiagramDescriptionMappingsManager; import org.eclipse.sirius.diagram.business.api.componentization.DiagramDescriptionMappingsManagerListener; import org.eclipse.sirius.diagram.business.api.helper.layers.LayerService; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; import org.eclipse.sirius.diagram.description.AbstractNodeMapping; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DiagramDescription; import org.eclipse.sirius.diagram.description.EdgeMapping; import org.eclipse.sirius.diagram.description.NodeMapping; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; import org.eclipse.sirius.viewpoint.description.Viewpoint; /** diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/componentization/mappings/visitor/MappingsHierarchyVisitor.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/componentization/mappings/visitor/MappingsHierarchyVisitor.java index f72a106dcb..71b754171a 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/componentization/mappings/visitor/MappingsHierarchyVisitor.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/componentization/mappings/visitor/MappingsHierarchyVisitor.java @@ -15,10 +15,10 @@ package org.eclipse.sirius.diagram.business.internal.componentization.mappings.v import java.util.ArrayList; import java.util.Collection; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DiagramElementMapping; import org.eclipse.sirius.diagram.description.NodeMapping; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; /** * A visitor pattern to retrieve mappings children. diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/helper/decoration/DecorationHelperInternal.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/helper/decoration/DecorationHelperInternal.java index 39983e321a..8403ad4fd1 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/helper/decoration/DecorationHelperInternal.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/helper/decoration/DecorationHelperInternal.java @@ -32,12 +32,12 @@ import org.eclipse.sirius.common.tools.api.util.StringUtil; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.DDiagramElement; import org.eclipse.sirius.diagram.EdgeTarget; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; import org.eclipse.sirius.diagram.description.AbstractNodeMapping; import org.eclipse.sirius.diagram.description.DiagramElementMapping; import org.eclipse.sirius.diagram.description.EdgeMapping; import org.eclipse.sirius.diagram.description.Layer; import org.eclipse.sirius.diagram.description.MappingBasedDecoration; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor; import org.eclipse.sirius.tools.api.SiriusPlugin; import org.eclipse.sirius.tools.api.profiler.SiriusTasksKey; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/helper/task/DropinForContainerTaskCommand.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/helper/task/DropinForContainerTaskCommand.java index de9b3ae97d..0f6f020af8 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/helper/task/DropinForContainerTaskCommand.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/helper/task/DropinForContainerTaskCommand.java @@ -21,10 +21,10 @@ import org.eclipse.sirius.diagram.DDiagramElement; import org.eclipse.sirius.diagram.DDiagramElementContainer; import org.eclipse.sirius.diagram.DNodeContainer; import org.eclipse.sirius.diagram.DragAndDropTarget; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.IContainerMappingExt; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.ContainerMappingWithInterpreterHelper; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.IContainerMappingExt; import org.eclipse.sirius.diagram.tools.internal.Messages; import org.eclipse.sirius.ecore.extender.business.api.accessor.exception.FeatureNotFoundException; import org.eclipse.sirius.ecore.extender.business.api.accessor.exception.MetaClassNotFoundException; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/helper/task/DropinForNodeTaskCommand.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/helper/task/DropinForNodeTaskCommand.java index 42144774b4..824faabdbd 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/helper/task/DropinForNodeTaskCommand.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/helper/task/DropinForNodeTaskCommand.java @@ -23,11 +23,11 @@ import org.eclipse.sirius.diagram.DNodeContainer; import org.eclipse.sirius.diagram.DNodeList; import org.eclipse.sirius.diagram.DNodeListElement; import org.eclipse.sirius.diagram.DragAndDropTarget; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.INodeMappingExt; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.NodeMappingHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; import org.eclipse.sirius.diagram.description.AbstractNodeMapping; import org.eclipse.sirius.diagram.description.NodeMapping; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.INodeMappingExt; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; import org.eclipse.sirius.diagram.tools.internal.Messages; import org.eclipse.sirius.tools.api.SiriusPlugin; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/operations/AbstractNodeMappingSpecOperations.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/operations/AbstractNodeMappingSpecOperations.java index ce54cb63f3..1d28e3af77 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/operations/AbstractNodeMappingSpecOperations.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/operations/AbstractNodeMappingSpecOperations.java @@ -41,12 +41,12 @@ import org.eclipse.sirius.diagram.business.api.helper.display.DisplayServiceMana import org.eclipse.sirius.diagram.business.api.helper.graphicalfilters.HideFilterHelper; import org.eclipse.sirius.diagram.business.api.query.DiagramElementMappingQuery; import org.eclipse.sirius.diagram.business.api.query.EObjectQuery; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.INodeMappingExt; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.NodeMappingHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; import org.eclipse.sirius.diagram.description.AbstractNodeMapping; import org.eclipse.sirius.diagram.description.DescriptionPackage; import org.eclipse.sirius.diagram.description.NodeMapping; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.INodeMappingExt; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor; import org.eclipse.sirius.tools.api.SiriusPlugin; import org.eclipse.sirius.tools.api.interpreter.IInterpreterMessages; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/operations/SiriusElementMappingSpecOperations.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/operations/SiriusElementMappingSpecOperations.java index a86fc9aee2..a7cded8cf8 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/operations/SiriusElementMappingSpecOperations.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/description/operations/SiriusElementMappingSpecOperations.java @@ -18,9 +18,9 @@ import org.eclipse.sirius.common.tools.api.interpreter.IInterpreter; import org.eclipse.sirius.common.tools.api.interpreter.IInterpreterSiriusVariables; import org.eclipse.sirius.common.tools.api.util.StringUtil; import org.eclipse.sirius.diagram.business.api.query.DiagramElementMappingQuery; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; import org.eclipse.sirius.diagram.description.DiagramElementMapping; import org.eclipse.sirius.diagram.description.EdgeMappingImport; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; import org.eclipse.sirius.tools.api.SiriusPlugin; import org.eclipse.sirius.viewpoint.DMappingBased; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/BestStyleDescriptionRegistry.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/BestStyleDescriptionRegistry.java index 63b0a0fb56..58187c2c94 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/BestStyleDescriptionRegistry.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/BestStyleDescriptionRegistry.java @@ -36,8 +36,8 @@ import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.business.internal.metamodel.description.operations.ConditionalStyleSpecOperations; import org.eclipse.sirius.diagram.business.internal.query.EAttributeCustomizationQuery; import org.eclipse.sirius.diagram.business.internal.query.StyleDescriptionQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramInternalQuery; import org.eclipse.sirius.diagram.description.DiagramElementMapping; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramInternalQuery; import org.eclipse.sirius.viewpoint.description.ConditionalStyleDescription; import org.eclipse.sirius.viewpoint.description.EAttributeCustomization; import org.eclipse.sirius.viewpoint.description.EReferenceCustomization; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/ContainerMappingWithInterpreterHelper.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/ContainerMappingWithInterpreterHelper.java index 5492b46cd5..8c60bf36dc 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/ContainerMappingWithInterpreterHelper.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/ContainerMappingWithInterpreterHelper.java @@ -41,12 +41,7 @@ import org.eclipse.sirius.diagram.business.api.componentization.DiagramMappingsM import org.eclipse.sirius.diagram.business.api.componentization.DiagramMappingsManagerRegistry; import org.eclipse.sirius.diagram.business.api.query.ContainerMappingQuery; import org.eclipse.sirius.diagram.business.api.query.EObjectQuery; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.IContainerMappingExt; import org.eclipse.sirius.diagram.business.internal.metamodel.description.operations.AbstractNodeMappingSpecOperations; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.ContainerMappingSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.ContentHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingExtHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; import org.eclipse.sirius.diagram.description.AbstractNodeMapping; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.ContainerMappingImport; @@ -56,6 +51,11 @@ import org.eclipse.sirius.diagram.description.EdgeMapping; import org.eclipse.sirius.diagram.description.NodeMapping; import org.eclipse.sirius.diagram.description.style.ContainerStyleDescription; import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.IContainerMappingExt; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.ContainerMappingSpec; +import org.eclipse.sirius.diagram.model.business.internal.helper.ContentHelper; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingExtHelper; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; import org.eclipse.sirius.diagram.tools.internal.Messages; import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor; import org.eclipse.sirius.ext.base.Option; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/EdgeMappingHelper.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/EdgeMappingHelper.java index 6f2b65b576..45b67108dc 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/EdgeMappingHelper.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/EdgeMappingHelper.java @@ -43,16 +43,16 @@ import org.eclipse.sirius.diagram.EdgeStyle; import org.eclipse.sirius.diagram.EdgeTarget; import org.eclipse.sirius.diagram.business.api.query.EdgeMappingQuery; import org.eclipse.sirius.diagram.business.api.query.IEdgeMappingQuery; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.IContainerMappingExt; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.INodeMappingExt; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.EdgeMappingImportWrapper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingExtHelper; import org.eclipse.sirius.diagram.description.AbstractNodeMapping; import org.eclipse.sirius.diagram.description.DescriptionPackage; import org.eclipse.sirius.diagram.description.EdgeMapping; import org.eclipse.sirius.diagram.description.EdgeMappingImport; import org.eclipse.sirius.diagram.description.IEdgeMapping; import org.eclipse.sirius.diagram.description.style.EdgeStyleDescription; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.IContainerMappingExt; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.INodeMappingExt; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.EdgeMappingImportWrapper; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingExtHelper; import org.eclipse.sirius.diagram.tools.internal.Messages; import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor; import org.eclipse.sirius.ext.base.Option; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/GetConditionalStyle.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/GetConditionalStyle.java index 3ee24d83cd..a07f2ca9ef 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/GetConditionalStyle.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/GetConditionalStyle.java @@ -22,7 +22,6 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.business.api.query.IEdgeMappingQuery; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.EdgeMappingImportWrapper; import org.eclipse.sirius.diagram.description.ConditionalContainerStyleDescription; import org.eclipse.sirius.diagram.description.ConditionalEdgeStyleDescription; import org.eclipse.sirius.diagram.description.ConditionalNodeStyleDescription; @@ -33,6 +32,7 @@ import org.eclipse.sirius.diagram.description.EdgeMappingImport; import org.eclipse.sirius.diagram.description.NodeMapping; import org.eclipse.sirius.diagram.description.NodeMappingImport; import org.eclipse.sirius.diagram.description.util.DescriptionSwitch; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.EdgeMappingImportWrapper; import org.eclipse.sirius.diagram.tools.internal.Messages; import org.eclipse.sirius.ext.base.Option; import org.eclipse.sirius.tools.api.SiriusPlugin; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/LayerHelper.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/LayerHelper.java index 445f22a6d9..1524a864ad 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/LayerHelper.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/LayerHelper.java @@ -31,8 +31,6 @@ import org.eclipse.sirius.diagram.DDiagramElementContainer; import org.eclipse.sirius.diagram.DNode; import org.eclipse.sirius.diagram.business.api.componentization.DiagramComponentizationManager; import org.eclipse.sirius.diagram.business.api.componentization.DiagramMappingsManager; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; import org.eclipse.sirius.diagram.description.AdditionalLayer; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DescriptionPackage; @@ -40,6 +38,8 @@ import org.eclipse.sirius.diagram.description.DiagramDescription; import org.eclipse.sirius.diagram.description.DiagramElementMapping; import org.eclipse.sirius.diagram.description.Layer; import org.eclipse.sirius.diagram.description.NodeMapping; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; import org.eclipse.sirius.viewpoint.description.AbstractMappingImport; import org.eclipse.sirius.viewpoint.description.Viewpoint; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/NodeMappingHelper.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/NodeMappingHelper.java index d087b42317..5524671e4b 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/NodeMappingHelper.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/metamodel/helper/NodeMappingHelper.java @@ -27,11 +27,11 @@ import org.eclipse.sirius.diagram.DNodeListElement; import org.eclipse.sirius.diagram.DiagramFactory; import org.eclipse.sirius.diagram.NodeStyle; import org.eclipse.sirius.diagram.ResizeKind; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.INodeMappingExt; import org.eclipse.sirius.diagram.business.internal.metamodel.description.operations.AbstractNodeMappingSpecOperations; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingExtHelper; import org.eclipse.sirius.diagram.description.NodeMapping; import org.eclipse.sirius.diagram.description.style.NodeStyleDescription; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.INodeMappingExt; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingExtHelper; import org.eclipse.sirius.ext.base.Option; import org.eclipse.sirius.ext.base.Options; import org.eclipse.sirius.tools.api.SiriusPlugin; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/migration/ComputedStyleDescriptionCachePackingFileMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/migration/ComputedStyleDescriptionCachePackingFileMigrationParticipant.java index 0e1479d3ef..be6e1f6218 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/migration/ComputedStyleDescriptionCachePackingFileMigrationParticipant.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/migration/ComputedStyleDescriptionCachePackingFileMigrationParticipant.java @@ -21,7 +21,7 @@ import org.eclipse.sirius.business.api.migration.AbstractRepresentationsFileMigr import org.eclipse.sirius.business.api.query.DViewQuery; import org.eclipse.sirius.diagram.ComputedStyleDescriptionRegistry; import org.eclipse.sirius.diagram.DDiagram; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramInternalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramInternalQuery; import org.eclipse.sirius.viewpoint.DAnalysis; import org.eclipse.sirius.viewpoint.DRepresentation; import org.eclipse.sirius.viewpoint.DView; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/migration/TransientLayerMigrationParticipant.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/migration/TransientLayerMigrationParticipant.java index dfd4654629..bafef64cbf 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/migration/TransientLayerMigrationParticipant.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/migration/TransientLayerMigrationParticipant.java @@ -20,8 +20,8 @@ import org.eclipse.emf.common.util.TreeIterator; import org.eclipse.emf.ecore.EObject; import org.eclipse.sirius.business.api.migration.AbstractRepresentationsFileMigrationParticipant; import org.eclipse.sirius.diagram.DDiagram; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; import org.eclipse.sirius.diagram.description.Layer; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; import org.eclipse.sirius.viewpoint.DAnalysis; import org.eclipse.sirius.viewpoint.Decoration; import org.osgi.framework.Version; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/query/AbstractNodeMappingApplicabilityTester.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/query/AbstractNodeMappingApplicabilityTester.java index 730d902ea3..af5362ffa3 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/query/AbstractNodeMappingApplicabilityTester.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/query/AbstractNodeMappingApplicabilityTester.java @@ -25,14 +25,14 @@ import org.eclipse.sirius.diagram.business.api.query.DiagramDescriptionQuery; import org.eclipse.sirius.diagram.business.api.query.DiagramElementMappingQuery; import org.eclipse.sirius.diagram.business.api.query.DiagramExtensionDescriptionQuery; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.DiagramComponentizationHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.ContentHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; import org.eclipse.sirius.diagram.description.AbstractNodeMapping; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DiagramDescription; import org.eclipse.sirius.diagram.description.DiagramElementMapping; import org.eclipse.sirius.diagram.description.DiagramExtensionDescription; import org.eclipse.sirius.diagram.description.NodeMapping; +import org.eclipse.sirius.diagram.model.business.internal.helper.ContentHelper; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; import org.eclipse.sirius.viewpoint.description.Viewpoint; import com.google.common.collect.Iterables; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/refresh/SiriusGMFSynchronizerDispatcher.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/refresh/SiriusGMFSynchronizerDispatcher.java index 54700beb40..68b79ce0b3 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/refresh/SiriusGMFSynchronizerDispatcher.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/refresh/SiriusGMFSynchronizerDispatcher.java @@ -27,7 +27,7 @@ import org.eclipse.sirius.diagram.DDiagramElement; 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.operations.model.DDiagramElementSpecOperations; +import org.eclipse.sirius.diagram.model.business.internal.operations.DDiagramElementSpecOperations; /** * Dispatch a collection of {@link Notification}s to a EMF Command. diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/repair/resource/session/diagram/data/LostNodeData.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/repair/resource/session/diagram/data/LostNodeData.java index 2fc6f1ce83..7443fb8643 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/repair/resource/session/diagram/data/LostNodeData.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/repair/resource/session/diagram/data/LostNodeData.java @@ -21,8 +21,8 @@ import org.eclipse.sirius.diagram.DNodeList; import org.eclipse.sirius.diagram.DNodeListElement; import org.eclipse.sirius.diagram.DSemanticDiagram; import org.eclipse.sirius.diagram.business.api.helper.SiriusDiagramHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; import org.eclipse.sirius.diagram.description.AbstractNodeMapping; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; import org.eclipse.sirius.viewpoint.DSemanticDecorator; import org.eclipse.sirius.viewpoint.description.RepresentationElementMapping; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/sync/DDiagramElementSynchronizer.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/sync/DDiagramElementSynchronizer.java index 4914afd899..bde000df4b 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/sync/DDiagramElementSynchronizer.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/sync/DDiagramElementSynchronizer.java @@ -61,7 +61,6 @@ import org.eclipse.sirius.diagram.business.internal.helper.decoration.Decoration import org.eclipse.sirius.diagram.business.internal.metamodel.helper.DiagramElementMappingHelper; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.MappingWithInterpreterHelper; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.StyleHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.operations.model.DDiagramSpecOperations; import org.eclipse.sirius.diagram.description.AbstractNodeMapping; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DescriptionPackage; @@ -78,6 +77,7 @@ import org.eclipse.sirius.diagram.description.style.LozengeNodeDescription; import org.eclipse.sirius.diagram.description.style.NodeStyleDescription; import org.eclipse.sirius.diagram.description.style.SquareDescription; import org.eclipse.sirius.diagram.description.style.WorkspaceImageDescription; +import org.eclipse.sirius.diagram.model.business.internal.operations.DDiagramSpecOperations; import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor; import org.eclipse.sirius.ext.base.Option; import org.eclipse.sirius.ext.base.Options; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/sync/DDiagramSynchronizer.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/sync/DDiagramSynchronizer.java index ec68f943e1..5b014d755f 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/sync/DDiagramSynchronizer.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/sync/DDiagramSynchronizer.java @@ -72,13 +72,8 @@ import org.eclipse.sirius.diagram.business.api.query.EObjectQuery; import org.eclipse.sirius.diagram.business.api.query.IEdgeMappingQuery; import org.eclipse.sirius.diagram.business.api.refresh.RefreshExtensionService; import org.eclipse.sirius.diagram.business.internal.helper.decoration.DecorationHelperInternal; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.EdgeMappingImportWrapper; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.EdgeMappingHelper; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.LayerHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.operations.model.DDiagramSpecOperations; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramInternalQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.description.AbstractNodeMapping; import org.eclipse.sirius.diagram.description.AdditionalLayer; import org.eclipse.sirius.diagram.description.ContainerMapping; @@ -93,6 +88,11 @@ import org.eclipse.sirius.diagram.description.Layer; import org.eclipse.sirius.diagram.description.MappingBasedDecoration; import org.eclipse.sirius.diagram.description.NodeMapping; import org.eclipse.sirius.diagram.description.NodeMappingImport; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.EdgeMappingImportWrapper; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; +import org.eclipse.sirius.diagram.model.business.internal.operations.DDiagramSpecOperations; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramInternalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.tools.internal.Messages; import org.eclipse.sirius.ecore.extender.business.api.accessor.ModelAccessor; import org.eclipse.sirius.ecore.extender.business.api.accessor.exception.FeatureNotFoundException; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/sync/DEdgeCandidate.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/sync/DEdgeCandidate.java index c2759884a1..487c2150be 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/sync/DEdgeCandidate.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/business/internal/sync/DEdgeCandidate.java @@ -18,10 +18,10 @@ import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.DEdge; import org.eclipse.sirius.diagram.EdgeTarget; import org.eclipse.sirius.diagram.business.api.query.EObjectQuery; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.EdgeMappingImportWrapper; import org.eclipse.sirius.diagram.description.EdgeMapping; import org.eclipse.sirius.diagram.description.EdgeMappingImport; import org.eclipse.sirius.diagram.description.IEdgeMapping; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.EdgeMappingImportWrapper; import org.eclipse.sirius.ext.base.Option; import org.eclipse.sirius.ext.base.cache.KeyCache; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/api/command/ChangeLayerActivationCommand.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/api/command/ChangeLayerActivationCommand.java index 786bd4a482..1c7638274d 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/api/command/ChangeLayerActivationCommand.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/api/command/ChangeLayerActivationCommand.java @@ -29,9 +29,9 @@ import org.eclipse.sirius.common.tools.api.listener.NotificationUtil; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.business.api.helper.decoration.DecorationHelper; import org.eclipse.sirius.diagram.business.api.query.DDiagramQuery; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; import org.eclipse.sirius.diagram.description.AdditionalLayer; import org.eclipse.sirius.diagram.description.Layer; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; import org.eclipse.sirius.diagram.tools.internal.DiagramPlugin; import org.eclipse.sirius.diagram.tools.internal.Messages; import org.eclipse.sirius.diagram.tools.internal.management.UpdateToolRecordingCommand; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/api/command/view/RefreshSiriusElement.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/api/command/view/RefreshSiriusElement.java index 0892a53e26..28536b524e 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/api/command/view/RefreshSiriusElement.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/api/command/view/RefreshSiriusElement.java @@ -52,7 +52,6 @@ import org.eclipse.sirius.diagram.business.api.componentization.DiagramMappingsM import org.eclipse.sirius.diagram.business.api.componentization.DiagramMappingsManagerRegistry; import org.eclipse.sirius.diagram.business.api.helper.display.DisplayServiceManager; import org.eclipse.sirius.diagram.business.api.query.IEdgeMappingQuery; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.extensions.IContainerMappingExt; import org.eclipse.sirius.diagram.business.internal.metamodel.description.operations.AbstractNodeMappingSpecOperations; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.ContainerMappingWithInterpreterHelper; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.EdgeMappingHelper; @@ -62,6 +61,7 @@ import org.eclipse.sirius.diagram.business.internal.metamodel.operations.StyleSp import org.eclipse.sirius.diagram.description.AbstractNodeMapping; import org.eclipse.sirius.diagram.description.EdgeMapping; import org.eclipse.sirius.diagram.description.NodeMapping; +import org.eclipse.sirius.diagram.model.business.internal.description.extensions.IContainerMappingExt; import org.eclipse.sirius.diagram.tools.internal.Messages; import org.eclipse.sirius.diagram.util.DiagramSwitch; import org.eclipse.sirius.ext.base.Option; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/api/layout/PinHelper.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/api/layout/PinHelper.java index 018e2a8bdb..8f01af3bd6 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/api/layout/PinHelper.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/api/layout/PinHelper.java @@ -26,7 +26,7 @@ import org.eclipse.sirius.diagram.DEdge; import org.eclipse.sirius.diagram.business.api.diagramtype.DiagramTypeDescriptorRegistry; import org.eclipse.sirius.diagram.business.api.diagramtype.IDiagramDescriptionProvider; import org.eclipse.sirius.diagram.business.api.diagramtype.IDiagramTypeDescriptor; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; import com.google.common.base.Predicate; import com.google.common.base.Predicates; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/command/builders/ReconnectionCommandBuilder.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/command/builders/ReconnectionCommandBuilder.java index 388db31ac0..5245085aab 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/command/builders/ReconnectionCommandBuilder.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/command/builders/ReconnectionCommandBuilder.java @@ -33,12 +33,12 @@ import org.eclipse.sirius.diagram.DEdge; import org.eclipse.sirius.diagram.EdgeTarget; import org.eclipse.sirius.diagram.business.api.query.EObjectQuery; import org.eclipse.sirius.diagram.business.api.query.IEdgeMappingQuery; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.EdgeMappingImportWrapper; import org.eclipse.sirius.diagram.description.DiagramElementMapping; import org.eclipse.sirius.diagram.description.EdgeMapping; import org.eclipse.sirius.diagram.description.IEdgeMapping; import org.eclipse.sirius.diagram.description.tool.ReconnectEdgeDescription; import org.eclipse.sirius.diagram.description.tool.ReconnectionKind; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.EdgeMappingImportWrapper; import org.eclipse.sirius.diagram.tools.internal.Messages; import org.eclipse.sirius.diagram.tools.internal.command.reconnect.ReconnectSourceNodeCommand; import org.eclipse.sirius.diagram.tools.internal.command.reconnect.SetEdgeActualMappingCommand; diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/command/reconnect/SetEdgeActualMappingCommand.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/command/reconnect/SetEdgeActualMappingCommand.java index 5b295489e3..f987a431e1 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/command/reconnect/SetEdgeActualMappingCommand.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/command/reconnect/SetEdgeActualMappingCommand.java @@ -15,8 +15,8 @@ package org.eclipse.sirius.diagram.tools.internal.command.reconnect; import org.eclipse.emf.transaction.RecordingCommand; import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.sirius.diagram.DEdge; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.EdgeMappingImportWrapper; import org.eclipse.sirius.diagram.description.IEdgeMapping; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.EdgeMappingImportWrapper; import org.eclipse.sirius.diagram.tools.internal.Messages; /** diff --git a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ContainerMappingChildrenPresentationConstraints.java b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ContainerMappingChildrenPresentationConstraints.java index dc80bed6ee..86d37df559 100644 --- a/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ContainerMappingChildrenPresentationConstraints.java +++ b/plugins/org.eclipse.sirius.diagram/src/org/eclipse/sirius/diagram/tools/internal/validation/description/constraints/ContainerMappingChildrenPresentationConstraints.java @@ -18,7 +18,6 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.validation.IValidationContext; import org.eclipse.sirius.business.api.query.EObjectQuery; import org.eclipse.sirius.diagram.business.api.query.ContainerMappingQuery; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DescriptionPackage; import org.eclipse.sirius.diagram.description.NodeMapping; @@ -26,6 +25,7 @@ import org.eclipse.sirius.diagram.description.filter.MappingFilter; import org.eclipse.sirius.diagram.description.style.ContainerStyleDescription; import org.eclipse.sirius.diagram.description.style.FlatContainerStyleDescription; import org.eclipse.sirius.diagram.description.style.WorkspaceImageDescription; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; import org.eclipse.sirius.ext.base.Option; import org.eclipse.sirius.tools.internal.validation.AbstractConstraint; diff --git a/plugins/org.eclipse.sirius.editor.diagram/src/org/eclipse/sirius/diagram/editor/properties/section/description/containermapping/ContainerMappingChildrenPresentationPropertySectionSpec.java b/plugins/org.eclipse.sirius.editor.diagram/src/org/eclipse/sirius/diagram/editor/properties/section/description/containermapping/ContainerMappingChildrenPresentationPropertySectionSpec.java index 8b8c4d36b2..bed73e5840 100644 --- a/plugins/org.eclipse.sirius.editor.diagram/src/org/eclipse/sirius/diagram/editor/properties/section/description/containermapping/ContainerMappingChildrenPresentationPropertySectionSpec.java +++ b/plugins/org.eclipse.sirius.editor.diagram/src/org/eclipse/sirius/diagram/editor/properties/section/description/containermapping/ContainerMappingChildrenPresentationPropertySectionSpec.java @@ -14,9 +14,9 @@ package org.eclipse.sirius.diagram.editor.properties.section.description.contain import org.eclipse.sirius.diagram.ContainerLayout; import org.eclipse.sirius.diagram.business.api.query.ContainerMappingQuery; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.editor.properties.sections.description.containermapping.ContainerMappingChildrenPresentationPropertySection; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; import org.eclipse.sirius.editor.editorPlugin.SiriusEditor; import org.eclipse.sirius.ext.base.Option; import org.eclipse.sirius.ext.base.Options; diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mappings/CompartmentMappingsTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mappings/CompartmentMappingsTests.java index fde6499109..1d319db848 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mappings/CompartmentMappingsTests.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mappings/CompartmentMappingsTests.java @@ -24,9 +24,9 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.sirius.diagram.ContainerLayout; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.DDiagramElement; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DiagramElementMapping; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; import org.eclipse.sirius.ecore.extender.tool.api.ModelUtils; import org.eclipse.sirius.tests.support.api.SiriusDiagramTestCase; import org.eclipse.sirius.tests.support.api.TestsUtil; diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mappings/ImportSpecClassesUnsetTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mappings/ImportSpecClassesUnsetTests.java index 4469829e7a..459afa743f 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mappings/ImportSpecClassesUnsetTests.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/mappings/ImportSpecClassesUnsetTests.java @@ -13,12 +13,6 @@ package org.eclipse.sirius.tests.unit.api.mappings; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.ContainerMappingImportSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.ContainerMappingSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.DiagramDescriptionSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.DiagramImportDescriptionSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.NodeMappingImportSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.NodeMappingSpec; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.ContainerMappingImport; import org.eclipse.sirius.diagram.description.DescriptionFactory; @@ -32,6 +26,12 @@ import org.eclipse.sirius.diagram.description.impl.DiagramDescriptionImpl; import org.eclipse.sirius.diagram.description.impl.DiagramImportDescriptionImpl; import org.eclipse.sirius.diagram.description.impl.NodeMappingImpl; import org.eclipse.sirius.diagram.description.impl.NodeMappingImportImpl; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.ContainerMappingImportSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.ContainerMappingSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.DiagramDescriptionSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.DiagramImportDescriptionSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.NodeMappingImportSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.NodeMappingSpec; import org.eclipse.sirius.viewpoint.description.IdentifiedElement; import junit.framework.TestCase; diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/refresh/ChangeIdAndLabelTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/refresh/ChangeIdAndLabelTests.java index 0f83eafecb..9219e8474b 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/refresh/ChangeIdAndLabelTests.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/refresh/ChangeIdAndLabelTests.java @@ -20,9 +20,9 @@ import org.eclipse.emf.transaction.RecordingCommand; import org.eclipse.sirius.business.api.query.DRepresentationQuery; import org.eclipse.sirius.business.api.session.SessionManager; import org.eclipse.sirius.diagram.DDiagram; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; import org.eclipse.sirius.diagram.description.DiagramDescription; import org.eclipse.sirius.diagram.description.Layer; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; import org.eclipse.sirius.tests.SiriusTestsPlugin; import org.eclipse.sirius.tests.support.api.SiriusDiagramTestCase; import org.eclipse.sirius.tests.unit.diagram.modeler.ecore.EcoreModeler; diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/refresh/StyleCustomizationAndConditionalStyleDescriptionTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/refresh/StyleCustomizationAndConditionalStyleDescriptionTest.java index a2cf8878ae..4ec8cb87eb 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/refresh/StyleCustomizationAndConditionalStyleDescriptionTest.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/api/refresh/StyleCustomizationAndConditionalStyleDescriptionTest.java @@ -25,9 +25,9 @@ import org.eclipse.sirius.business.api.dialect.DialectManager; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.DNode; import org.eclipse.sirius.diagram.WorkspaceImage; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; import org.eclipse.sirius.diagram.description.NodeMapping; import org.eclipse.sirius.diagram.description.style.NodeStyleDescription; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; import org.eclipse.sirius.diagram.ui.tools.api.editor.DDiagramEditor; import org.eclipse.sirius.tests.SiriusTestsPlugin; import org.eclipse.sirius.tests.support.api.EclipseTestsSupportHelper; diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/interpreter/acceleo/mtl/IInterpreterValidationExpressionTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/interpreter/acceleo/mtl/IInterpreterValidationExpressionTest.java index 5286c368d7..a53f6426f8 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/interpreter/acceleo/mtl/IInterpreterValidationExpressionTest.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/common/interpreter/acceleo/mtl/IInterpreterValidationExpressionTest.java @@ -36,8 +36,6 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.sirius.common.tools.api.interpreter.CompoundInterpreter; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.MappingHelper; import org.eclipse.sirius.diagram.description.ConditionalContainerStyleDescription; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DiagramDescription; @@ -46,6 +44,8 @@ import org.eclipse.sirius.diagram.description.EdgeMapping; import org.eclipse.sirius.diagram.description.Layer; import org.eclipse.sirius.diagram.description.tool.ContainerCreationDescription; import org.eclipse.sirius.diagram.description.tool.ContainerDropDescription; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; +import org.eclipse.sirius.diagram.model.business.internal.helper.MappingHelper; import org.eclipse.sirius.diagram.sequence.description.ExecutionMapping; import org.eclipse.sirius.diagram.sequence.description.InstanceRoleMapping; import org.eclipse.sirius.diagram.sequence.description.MessageMapping; diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/compartment/CompartmentsLayoutTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/compartment/CompartmentsLayoutTest.java index af6cd7a13c..69a26741a6 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/compartment/CompartmentsLayoutTest.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/compartment/CompartmentsLayoutTest.java @@ -63,9 +63,9 @@ import org.eclipse.sirius.diagram.DDiagramElementContainer; import org.eclipse.sirius.diagram.DNodeContainer; import org.eclipse.sirius.diagram.DiagramPackage; import org.eclipse.sirius.diagram.LineStyle; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.description.style.ContainerStyleDescription; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.business.internal.edit.helpers.LabelAlignmentHelper; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramContainerEditPart; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramElementContainerEditPart; diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/compartment/CompartmentsTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/compartment/CompartmentsTest.java index 3010208dd7..e734188485 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/compartment/CompartmentsTest.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/compartment/CompartmentsTest.java @@ -21,8 +21,8 @@ import org.eclipse.sirius.diagram.DDiagramElementContainer; import org.eclipse.sirius.diagram.DNodeContainer; import org.eclipse.sirius.diagram.DNodeList; import org.eclipse.sirius.diagram.business.api.query.ContainerMappingQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramElementContainerExperimentalQuery; -import org.eclipse.sirius.diagram.business.internal.query.model.DNodeContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramElementContainerExperimentalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DNodeContainerExperimentalQuery; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramContainerEditPart; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramElementContainerEditPart; import org.eclipse.sirius.diagram.ui.edit.api.part.IDiagramContainerEditPart; diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/decorators/DecoratorsTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/decorators/DecoratorsTest.java index d2677b3bb9..d0a351e973 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/decorators/DecoratorsTest.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/decorators/DecoratorsTest.java @@ -38,8 +38,6 @@ import org.eclipse.sirius.diagram.DNode; import org.eclipse.sirius.diagram.DNodeList; import org.eclipse.sirius.diagram.DNodeListElement; import org.eclipse.sirius.diagram.DSemanticDiagram; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.operations.model.DDiagramSpecOperations; import org.eclipse.sirius.diagram.description.AdditionalLayer; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DiagramDescription; @@ -47,6 +45,8 @@ import org.eclipse.sirius.diagram.description.DiagramElementMapping; import org.eclipse.sirius.diagram.description.Layer; import org.eclipse.sirius.diagram.description.MappingBasedDecoration; import org.eclipse.sirius.diagram.description.NodeMapping; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; +import org.eclipse.sirius.diagram.model.business.internal.operations.DDiagramSpecOperations; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractBorderedDiagramElementEditPart; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramNodeEditPart; import org.eclipse.sirius.diagram.ui.tools.api.part.DiagramEditPartService; diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/decorators/TransientLayerAndDecoratorTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/decorators/TransientLayerAndDecoratorTest.java index afb647b956..dbf1979df5 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/decorators/TransientLayerAndDecoratorTest.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/decorators/TransientLayerAndDecoratorTest.java @@ -31,11 +31,11 @@ import org.eclipse.sirius.business.api.session.SessionStatus; import org.eclipse.sirius.common.tools.internal.resource.ResourceSyncClientNotifier; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.DDiagramElement; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; import org.eclipse.sirius.diagram.description.AdditionalLayer; import org.eclipse.sirius.diagram.description.DiagramDescription; import org.eclipse.sirius.diagram.description.DiagramExtensionDescription; import org.eclipse.sirius.diagram.description.MappingBasedDecoration; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; import org.eclipse.sirius.tests.SiriusTestsPlugin; import org.eclipse.sirius.tests.support.api.OpenedSessionsCondition; import org.eclipse.sirius.tests.support.api.TestsUtil; diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/mapping/EdgeMappingCreationDescriptionTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/mapping/EdgeMappingCreationDescriptionTests.java index 8e57087c0d..1368e815e0 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/mapping/EdgeMappingCreationDescriptionTests.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/mapping/EdgeMappingCreationDescriptionTests.java @@ -20,10 +20,10 @@ import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.sirius.business.api.query.DViewQuery; import org.eclipse.sirius.diagram.DNode; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.ContentLayerHelper; import org.eclipse.sirius.diagram.description.DiagramDescription; import org.eclipse.sirius.diagram.description.EdgeMapping; import org.eclipse.sirius.diagram.description.tool.EdgeCreationDescription; +import org.eclipse.sirius.diagram.model.business.internal.helper.ContentLayerHelper; import org.eclipse.sirius.diagram.tools.api.refresh.BestMappingGetter; import org.eclipse.sirius.tests.SiriusTestsPlugin; import org.eclipse.sirius.tests.support.api.EclipseTestsSupportHelper; diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/migration/ComputedStyleDescriptionCachePackingFileMigrationParticipantTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/migration/ComputedStyleDescriptionCachePackingFileMigrationParticipantTests.java index 88834f914e..7b5894c3ef 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/migration/ComputedStyleDescriptionCachePackingFileMigrationParticipantTests.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/migration/ComputedStyleDescriptionCachePackingFileMigrationParticipantTests.java @@ -20,7 +20,7 @@ import org.eclipse.sirius.business.api.query.DViewQuery; import org.eclipse.sirius.diagram.ComputedStyleDescriptionRegistry; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.business.internal.migration.ComputedStyleDescriptionCachePackingFileMigrationParticipant; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramInternalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramInternalQuery; import org.eclipse.sirius.tests.SiriusTestsPlugin; import org.eclipse.sirius.tests.support.api.EclipseTestsSupportHelper; import org.eclipse.sirius.tests.support.api.SiriusDiagramTestCase; diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/query/DDiagramInternalQueryTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/query/DDiagramInternalQueryTest.java index 6afdb56abc..ce6f018585 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/query/DDiagramInternalQueryTest.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/query/DDiagramInternalQueryTest.java @@ -19,7 +19,7 @@ import org.eclipse.sirius.diagram.DNodeContainer; import org.eclipse.sirius.diagram.DNodeList; import org.eclipse.sirius.diagram.DNodeListElement; import org.eclipse.sirius.diagram.DiagramFactory; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramInternalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramInternalQuery; import com.google.common.collect.Iterables; diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/refresh/DiagramElementMappingHelperTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/refresh/DiagramElementMappingHelperTest.java index ba802d7986..9e1e227e78 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/refresh/DiagramElementMappingHelperTest.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/refresh/DiagramElementMappingHelperTest.java @@ -23,8 +23,8 @@ import org.eclipse.sirius.business.api.session.Session; import org.eclipse.sirius.business.api.session.factory.SessionFactory; import org.eclipse.sirius.diagram.DSemanticDiagram; import org.eclipse.sirius.diagram.business.internal.metamodel.helper.DiagramElementMappingHelper; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; import org.eclipse.sirius.diagram.description.NodeMapping; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; import com.google.common.collect.Iterators; diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/style/WorkspaceImageTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/style/WorkspaceImageTest.java index e55ea03ced..6c54a41df1 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/style/WorkspaceImageTest.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/style/WorkspaceImageTest.java @@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.notation.Size; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.DDiagramElement; import org.eclipse.sirius.diagram.DNode; -import org.eclipse.sirius.diagram.business.internal.query.model.DDiagramInternalQuery; +import org.eclipse.sirius.diagram.model.business.internal.query.DDiagramInternalQuery; import org.eclipse.sirius.diagram.ui.tools.api.figure.WorkspaceImageFigure; import org.eclipse.sirius.diagram.ui.tools.api.layout.LayoutUtils; import org.eclipse.sirius.tests.SiriusTestsPlugin; diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/CreateViewWithMappingImportTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/CreateViewWithMappingImportTests.java index c89658cf7b..3f7101b5c5 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/CreateViewWithMappingImportTests.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/CreateViewWithMappingImportTests.java @@ -29,7 +29,6 @@ import org.eclipse.sirius.diagram.DiagramPackage; import org.eclipse.sirius.diagram.DragAndDropTarget; import org.eclipse.sirius.diagram.EdgeTarget; import org.eclipse.sirius.diagram.business.api.query.IEdgeMappingQuery; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.EdgeMappingImportWrapper; import org.eclipse.sirius.diagram.description.AdditionalLayer; import org.eclipse.sirius.diagram.description.ContainerMapping; import org.eclipse.sirius.diagram.description.DiagramElementMapping; @@ -39,6 +38,7 @@ import org.eclipse.sirius.diagram.description.EdgeMappingImport; import org.eclipse.sirius.diagram.description.Layer; import org.eclipse.sirius.diagram.description.NodeMapping; import org.eclipse.sirius.diagram.description.tool.CreateView; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.EdgeMappingImportWrapper; import org.eclipse.sirius.tests.SiriusTestsPlugin; import org.eclipse.sirius.tests.support.api.SiriusDiagramTestCase; import org.eclipse.sirius.tests.support.api.TestsUtil; diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/PaletteManagerWithLayersTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/PaletteManagerWithLayersTest.java index 245904a14b..7d1e727ec2 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/PaletteManagerWithLayersTest.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/diagram/tools/palette/PaletteManagerWithLayersTest.java @@ -20,8 +20,8 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.emf.common.util.EList; import org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor; import org.eclipse.jface.action.IAction; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; import org.eclipse.sirius.diagram.description.Layer; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; import org.eclipse.sirius.diagram.tools.internal.DiagramPlugin; import org.eclipse.sirius.diagram.tools.internal.management.UpdateToolRecordingCommand; import org.eclipse.sirius.diagram.ui.tools.api.graphical.edit.palette.PaletteManager; diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/perf/diagram/refresh/DiagramSynchronizerMappingScaleTest.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/perf/diagram/refresh/DiagramSynchronizerMappingScaleTest.java index 0ff13a09ae..515b8501e5 100644 --- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/perf/diagram/refresh/DiagramSynchronizerMappingScaleTest.java +++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/unit/perf/diagram/refresh/DiagramSynchronizerMappingScaleTest.java @@ -14,9 +14,9 @@ package org.eclipse.sirius.tests.unit.perf.diagram.refresh; import org.eclipse.emf.transaction.RecordingCommand; import org.eclipse.emf.transaction.TransactionalEditingDomain; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.ContentHelper; import org.eclipse.sirius.diagram.description.DiagramDescription; import org.eclipse.sirius.diagram.description.NodeMapping; +import org.eclipse.sirius.diagram.model.business.internal.helper.ContentHelper; import org.eclipse.sirius.tests.unit.diagram.refresh.AbstractSynchronizerTest; import org.eclipse.sirius.tools.internal.SiriusCopierHelper; diff --git a/plugins/org.eclipse.sirius.tests.sample.migration.design/src/org/eclipse/sirius/tests/sample/migration/design/Draw2dToSiriusModelTransformer.java b/plugins/org.eclipse.sirius.tests.sample.migration.design/src/org/eclipse/sirius/tests/sample/migration/design/Draw2dToSiriusModelTransformer.java index 74fe44536a..a0d029c551 100644 --- a/plugins/org.eclipse.sirius.tests.sample.migration.design/src/org/eclipse/sirius/tests/sample/migration/design/Draw2dToSiriusModelTransformer.java +++ b/plugins/org.eclipse.sirius.tests.sample.migration.design/src/org/eclipse/sirius/tests/sample/migration/design/Draw2dToSiriusModelTransformer.java @@ -43,9 +43,9 @@ import org.eclipse.sirius.common.tools.api.resource.FileProvider; import org.eclipse.sirius.diagram.DDiagramElement; import org.eclipse.sirius.diagram.DEdge; import org.eclipse.sirius.diagram.DSemanticDiagram; -import org.eclipse.sirius.diagram.business.internal.metamodel.helper.model.LayerModelHelper; import org.eclipse.sirius.diagram.description.Layer; import org.eclipse.sirius.diagram.description.filter.FilterDescription; +import org.eclipse.sirius.diagram.model.business.internal.helper.LayerModelHelper; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramEdgeEditPart; import org.eclipse.sirius.diagram.ui.edit.api.part.AbstractDiagramNameEditPart; import org.eclipse.sirius.diagram.ui.edit.api.part.IAbstractDiagramNodeEditPart; diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/DoubleClickToolNavigationOperationTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/DoubleClickToolNavigationOperationTest.java index bc103e420f..1b07530a9e 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/DoubleClickToolNavigationOperationTest.java +++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/DoubleClickToolNavigationOperationTest.java @@ -18,12 +18,12 @@ import org.eclipse.emf.edit.command.AbstractOverrideableCommand; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart; import org.eclipse.sirius.diagram.DDiagram; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.LayerSpec; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.tool.spec.ToolSectionSpec; import org.eclipse.sirius.diagram.description.DiagramElementMapping; import org.eclipse.sirius.diagram.description.tool.DoubleClickDescription; import org.eclipse.sirius.diagram.description.tool.ElementDoubleClickVariable; import org.eclipse.sirius.diagram.description.tool.ToolFactory; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.LayerSpec; +import org.eclipse.sirius.diagram.model.business.internal.description.tool.spec.ToolSectionSpec; import org.eclipse.sirius.editor.tools.internal.presentation.CustomSiriusEditor; import org.eclipse.sirius.tests.support.api.ICondition; import org.eclipse.sirius.tests.support.api.TestsUtil; diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/EdgeCopyPasteFormatTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/EdgeCopyPasteFormatTest.java index 5865d3c5f6..81340a1591 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/EdgeCopyPasteFormatTest.java +++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/layout/EdgeCopyPasteFormatTest.java @@ -21,7 +21,7 @@ import org.eclipse.gmf.runtime.notation.RoutingStyle; import org.eclipse.gmf.runtime.notation.Size; import org.eclipse.sirius.diagram.DDiagram; import org.eclipse.sirius.diagram.EdgeStyle; -import org.eclipse.sirius.diagram.business.internal.metamodel.spec.DEdgeSpec; +import org.eclipse.sirius.diagram.model.business.internal.spec.DEdgeSpec; import org.eclipse.sirius.diagram.ui.internal.edit.parts.DEdgeEditPart; import org.eclipse.sirius.diagram.ui.internal.edit.parts.DEdgeNameEditPart; import org.eclipse.sirius.diagram.ui.provider.Messages; diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/MessageExtensionTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/MessageExtensionTest.java index 8b7a06ce2a..c68fece05e 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/MessageExtensionTest.java +++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/sequence/MessageExtensionTest.java @@ -21,9 +21,9 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.notation.Edge; import org.eclipse.sirius.business.api.preferences.SiriusPreferencesKeys; import org.eclipse.sirius.diagram.DEdge; -import org.eclipse.sirius.diagram.business.internal.metamodel.description.spec.EdgeMappingImportWrapper; import org.eclipse.sirius.diagram.description.EdgeMapping; import org.eclipse.sirius.diagram.description.IEdgeMapping; +import org.eclipse.sirius.diagram.model.business.internal.description.spec.EdgeMappingImportWrapper; import org.eclipse.sirius.diagram.sequence.business.internal.elements.ISequenceElementAccessor; import org.eclipse.sirius.diagram.sequence.business.internal.elements.ISequenceEvent; import org.eclipse.sirius.diagram.sequence.business.internal.elements.Message; |