Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Redor2013-12-09 07:38:49 -0500
committerGerrit Code Review @ Eclipse.org2013-12-10 07:45:12 -0500
commitb30568b550ec5d40abe272847d11a7a1017a2f5f (patch)
tree5d23d414fe95a45505d1905d034400ca207c898f
parent2fe20261bfb4373d54edd1482d8c7c20a281644c (diff)
downloadorg.eclipse.sirius-b30568b550ec5d40abe272847d11a7a1017a2f5f.tar.gz
org.eclipse.sirius-b30568b550ec5d40abe272847d11a7a1017a2f5f.tar.xz
org.eclipse.sirius-b30568b550ec5d40abe272847d11a7a1017a2f5f.zip
[422957] Remove deprecated getAllActivatedEdgeMappings from
DiagramDescription and Layer. The internal methods getAllActivatedEdgeMappings in ContentHelper are deprecated and always return an empty list. This is dead code, so the corresponding elements in meta-model are removed. Change-Id: I0d5be7364160c315eed2c685f5b4b0b4fc7cf7b2 Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/DescriptionPackage.java9
-rw-r--r--plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/SequenceDiagramDescriptionSpec.java11
-rw-r--r--plugins/org.eclipse.sirius.doc/doc/Release Notes.html7
-rw-r--r--plugins/org.eclipse.sirius.doc/doc/Release Notes.textile1
-rw-r--r--plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/diagramdescription/DiagramDescriptionAllActivatedEdgeMappingsFilter.java43
-rw-r--r--plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/layer/LayerAllActivatedEdgeMappingsFilter.java43
-rw-r--r--plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/diagramdescription/DiagramDescriptionAllActivatedEdgeMappingsPropertySection.java96
-rw-r--r--plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/layer/LayerAllActivatedEdgeMappingsPropertySection.java95
-rw-r--r--plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DiagramDescriptionItemProvider.java14
-rw-r--r--plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DiagramImportDescriptionItemProvider.java14
-rw-r--r--plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/LayerItemProvider.java13
-rw-r--r--plugins/org.eclipse.sirius/model/viewpoint.ecore14
-rw-r--r--plugins/org.eclipse.sirius/model/viewpoint.genmodel2
-rw-r--r--plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java192
-rw-r--r--plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DiagramDescription.java19
-rw-r--r--plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Layer.java19
-rw-r--r--plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java76
-rw-r--r--plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DiagramDescriptionImpl.java24
-rw-r--r--plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DiagramImportDescriptionImpl.java28
-rw-r--r--plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/LayerImpl.java24
-rw-r--r--plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/spec/AdditionalLayerSpec.java10
-rw-r--r--plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/spec/DiagramDescriptionSpec.java10
-rw-r--r--plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/spec/LayerSpec.java10
-rw-r--r--plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/helper/ContentHelper.java45
24 files changed, 88 insertions, 731 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/DescriptionPackage.java b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/DescriptionPackage.java
index 7e70dfa6eb..94d12926b5 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/DescriptionPackage.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src-gen/org/eclipse/sirius/diagram/sequence/description/DescriptionPackage.java
@@ -181,15 +181,6 @@ public interface DescriptionPackage extends EPackage {
int SEQUENCE_DIAGRAM_DESCRIPTION__ALL_EDGE_MAPPINGS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_EDGE_MAPPINGS;
/**
- * The feature id for the '<em><b>All Activated Edge Mappings</b></em>'
- * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int SEQUENCE_DIAGRAM_DESCRIPTION__ALL_ACTIVATED_EDGE_MAPPINGS = org.eclipse.sirius.viewpoint.description.DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_ACTIVATED_EDGE_MAPPINGS;
-
- /**
* The feature id for the '<em><b>All Node Mappings</b></em>' reference
* list. <!-- begin-user-doc --> <!-- end-user-doc -->
*
diff --git a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/SequenceDiagramDescriptionSpec.java b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/SequenceDiagramDescriptionSpec.java
index 46df7274cd..641e679934 100644
--- a/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/SequenceDiagramDescriptionSpec.java
+++ b/plugins/org.eclipse.sirius.diagram.sequence/src/org/eclipse/sirius/diagram/sequence/business/internal/metamodel/description/SequenceDiagramDescriptionSpec.java
@@ -89,17 +89,6 @@ public class SequenceDiagramDescriptionSpec extends SequenceDiagramDescriptionIm
/**
* {@inheritDoc}
*
- * @see org.eclipse.sirius.viewpoint.description.impl.DiagramDescriptionImpl#getAllActivatedEdgeMappings()
- */
- @SuppressWarnings("deprecation")
- @Override
- public EList<EdgeMapping> getAllActivatedEdgeMappings() {
- return ContentHelper.getAllActivatedEdgeMappings(this);
- }
-
- /**
- * {@inheritDoc}
- *
* @see org.eclipse.sirius.viewpoint.description.impl.DiagramDescriptionImpl#getAllContainerMappings()
*/
@Override
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release Notes.html
index 885b5daf69..37c2c77934 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release Notes.html
@@ -236,6 +236,11 @@
<code>ICommandFactory</code>. And
<code>AbstractCommandFactory</code> now implements this method.
</li>
+ <li>The unused reference
+ <code>allActivatedEdgeMappings</code> from
+ <code>Layer</code> and
+ <code>DiagramDescription</code> has been removed from the viewpoint.ecore meta-model. This reference always returns empty list.
+ </li>
</ul>
<h4 id="Changesinorg.eclipse.sirius.diagram">Changes in
<code>org.eclipse.sirius.diagram</code>
@@ -549,4 +554,4 @@ void removeSelectedView(DView view);
</li>
</ul>
</body>
-</html>
+</html> \ No newline at end of file
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile b/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile
index fb569b53ca..432638c70a 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile
@@ -62,6 +62,7 @@ h4. Changes in @org.eclipse.sirius@
* The deprecated method @SessionFactory.createSession(DAnalysis)@ has been removed. It is not intended to be used, but it can be replaced by @SessionFactory.INSTANCE.createSession(analysis.eResource().getURI(), new NullProgressMonitor())@.
* The method @buildDoExecuteDetailsOperation(DSemanticDecorator, RepresentationCreationDescription, String) has been pull up from @ITableCommandFactory@, @ITreeCommandFactory@ and @IDiagramCommandFactory@ to @ICommandFactory@.
* The method @getUserInterfaceCallBack()@ has been pull up from @ITableCommandFactory@ and @ITreeCommandFactory@ to @ICommandFactory@. And @AbstractCommandFactory@ now implements this method.
+* The unused reference @allActivatedEdgeMappings@ from @Layer@ and @DiagramDescription@ has been removed from the viewpoint.ecore meta-model. This reference always returns empty list.
h4. Changes in @org.eclipse.sirius.diagram@
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/diagramdescription/DiagramDescriptionAllActivatedEdgeMappingsFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/diagramdescription/DiagramDescriptionAllActivatedEdgeMappingsFilter.java
deleted file mode 100644
index 0e4ae815eb..0000000000
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/diagramdescription/DiagramDescriptionAllActivatedEdgeMappingsFilter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2013 THALES GLOBAL SERVICES.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * Contributors:
- * Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.sirius.editor.properties.filters.description.diagramdescription;
-
-// Start of user code specific imports
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
-import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
-
-// End of user code specific imports
-
-/**
- * A filter for the allActivatedEdgeMappings property section.
- */
-public class DiagramDescriptionAllActivatedEdgeMappingsFilter extends ViewpointPropertyFilter {
-
- /**
- * {@inheritDoc}
- */
- protected EStructuralFeature getFeature() {
- return DescriptionPackage.eINSTANCE.getDiagramDescription_AllActivatedEdgeMappings();
- }
-
- /**
- * {@inheritDoc}
- */
- protected boolean isRightInputType(Object arg0) {
- return arg0 instanceof org.eclipse.sirius.viewpoint.description.DiagramDescription;
- }
-
- // Start of user code user methods
-
- // End of user code user methods
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/layer/LayerAllActivatedEdgeMappingsFilter.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/layer/LayerAllActivatedEdgeMappingsFilter.java
deleted file mode 100644
index ecb8b0d645..0000000000
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/filters/description/layer/LayerAllActivatedEdgeMappingsFilter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2013 THALES GLOBAL SERVICES.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * Contributors:
- * Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.sirius.editor.properties.filters.description.layer;
-
-// Start of user code specific imports
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.sirius.editor.properties.filters.common.ViewpointPropertyFilter;
-import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
-
-// End of user code specific imports
-
-/**
- * A filter for the allActivatedEdgeMappings property section.
- */
-public class LayerAllActivatedEdgeMappingsFilter extends ViewpointPropertyFilter {
-
- /**
- * {@inheritDoc}
- */
- protected EStructuralFeature getFeature() {
- return DescriptionPackage.eINSTANCE.getLayer_AllActivatedEdgeMappings();
- }
-
- /**
- * {@inheritDoc}
- */
- protected boolean isRightInputType(Object arg0) {
- return arg0 instanceof org.eclipse.sirius.viewpoint.description.Layer;
- }
-
- // Start of user code user methods
-
- // End of user code user methods
-
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/diagramdescription/DiagramDescriptionAllActivatedEdgeMappingsPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/diagramdescription/DiagramDescriptionAllActivatedEdgeMappingsPropertySection.java
deleted file mode 100644
index 475e38c83f..0000000000
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/diagramdescription/DiagramDescriptionAllActivatedEdgeMappingsPropertySection.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2013 THALES GLOBAL SERVICES.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * Contributors:
- * Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.sirius.editor.properties.sections.description.diagramdescription;
-
-// Start of user code imports
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
-import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-// End of user code imports
-
-/**
- * A section for the allActivatedEdgeMappings property of a DiagramDescription
- * object.
- */
-public class DiagramDescriptionAllActivatedEdgeMappingsPropertySection extends AbstractEditorDialogPropertySection {
- /**
- * @see org.eclipse.sirius.editor.properties.sections.AbstractEditorDialogPropertySection#getDefaultLabelText()
- */
- protected String getDefaultLabelText() {
- return "AllActivatedEdgeMappings"; //$NON-NLS-1$
- }
-
- /**
- * @see org.eclipse.sirius.editor.properties.sections.AbstractEditorDialogPropertySection#getLabelText()
- */
- protected String getLabelText() {
- String labelText;
- labelText = super.getLabelText() + ":"; //$NON-NLS-1$
- // Start of user code get label text
-
- // End of user code get label text
- return labelText;
- }
-
- /**
- * @see org.eclipse.sirius.editor.properties.sections.AbstractEditorDialogPropertySection#getFeature()
- */
- protected EReference getFeature() {
- return DescriptionPackage.eINSTANCE.getDiagramDescription_AllActivatedEdgeMappings();
- }
-
- /**
- * @see org.eclipse.sirius.editor.properties.sections.AbstractEditorDialogPropertySection#getFeatureAsText()
- */
- protected String getFeatureAsText() {
- String string = new String();
-
- if (eObject.eGet(getFeature()) != null) {
- List<?> values = (List<?>) eObject.eGet(getFeature());
- for (Iterator<?> iterator = values.iterator(); iterator.hasNext();) {
- EObject eObj = (EObject) iterator.next();
- string += getAdapterFactoryLabelProvider(eObj).getText(eObj);
- if (iterator.hasNext())
- string += ", ";
- }
- }
-
- return string;
- }
-
- /**
- * @see org.eclipse.sirius.editor.properties.sections.AbstractEditorDialogPropertySection#isEqual(java.util.List)
- */
- protected boolean isEqual(List<?> newList) {
- return newList.equals(eObject.eGet(getFeature()));
- }
-
- /**
- * {@inheritDoc}
- */
- public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
- super.createControls(parent, tabbedPropertySheetPage);
- // Start of user code create controls
-
- // End of user code create controls
- }
-
- // Start of user code user operations
-
- // End of user code user operations
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/layer/LayerAllActivatedEdgeMappingsPropertySection.java b/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/layer/LayerAllActivatedEdgeMappingsPropertySection.java
deleted file mode 100644
index 22e7053f3f..0000000000
--- a/plugins/org.eclipse.sirius.editor/src-gen/org/eclipse/sirius/editor/properties/sections/description/layer/LayerAllActivatedEdgeMappingsPropertySection.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2013 THALES GLOBAL SERVICES.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * Contributors:
- * Obeo - initial API and implementation
- *******************************************************************************/
-package org.eclipse.sirius.editor.properties.sections.description.layer;
-
-// Start of user code imports
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.sirius.editor.properties.sections.common.AbstractEditorDialogPropertySection;
-import org.eclipse.sirius.viewpoint.description.DescriptionPackage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-// End of user code imports
-
-/**
- * A section for the allActivatedEdgeMappings property of a Layer object.
- */
-public class LayerAllActivatedEdgeMappingsPropertySection extends AbstractEditorDialogPropertySection {
- /**
- * @see org.eclipse.sirius.editor.properties.sections.AbstractEditorDialogPropertySection#getDefaultLabelText()
- */
- protected String getDefaultLabelText() {
- return "AllActivatedEdgeMappings"; //$NON-NLS-1$
- }
-
- /**
- * @see org.eclipse.sirius.editor.properties.sections.AbstractEditorDialogPropertySection#getLabelText()
- */
- protected String getLabelText() {
- String labelText;
- labelText = super.getLabelText() + ":"; //$NON-NLS-1$
- // Start of user code get label text
-
- // End of user code get label text
- return labelText;
- }
-
- /**
- * @see org.eclipse.sirius.editor.properties.sections.AbstractEditorDialogPropertySection#getFeature()
- */
- protected EReference getFeature() {
- return DescriptionPackage.eINSTANCE.getLayer_AllActivatedEdgeMappings();
- }
-
- /**
- * @see org.eclipse.sirius.editor.properties.sections.AbstractEditorDialogPropertySection#getFeatureAsText()
- */
- protected String getFeatureAsText() {
- String string = new String();
-
- if (eObject.eGet(getFeature()) != null) {
- List<?> values = (List<?>) eObject.eGet(getFeature());
- for (Iterator<?> iterator = values.iterator(); iterator.hasNext();) {
- EObject eObj = (EObject) iterator.next();
- string += getAdapterFactoryLabelProvider(eObj).getText(eObj);
- if (iterator.hasNext())
- string += ", ";
- }
- }
-
- return string;
- }
-
- /**
- * @see org.eclipse.sirius.editor.properties.sections.AbstractEditorDialogPropertySection#isEqual(java.util.List)
- */
- protected boolean isEqual(List<?> newList) {
- return newList.equals(eObject.eGet(getFeature()));
- }
-
- /**
- * {@inheritDoc}
- */
- public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
- super.createControls(parent, tabbedPropertySheetPage);
- // Start of user code create controls
-
- // End of user code create controls
- }
-
- // Start of user code user operations
-
- // End of user code user operations
-} \ No newline at end of file
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DiagramDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DiagramDescriptionItemProvider.java
index ceb2dd773b..c0b4239eb5 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DiagramDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DiagramDescriptionItemProvider.java
@@ -79,7 +79,6 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
addShowOnStartupPropertyDescriptor(object);
addPasteDescriptionsPropertyDescriptor(object);
addAllEdgeMappingsPropertyDescriptor(object);
- addAllActivatedEdgeMappingsPropertyDescriptor(object);
addAllNodeMappingsPropertyDescriptor(object);
addAllContainerMappingsPropertyDescriptor(object);
addAllToolsPropertyDescriptor(object);
@@ -123,19 +122,6 @@ public class DiagramDescriptionItemProvider extends DragAndDropTargetDescription
}
/**
- * This adds a property descriptor for the All Activated Edge Mappings
- * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addAllActivatedEdgeMappingsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
- getString("_UI_DiagramDescription_allActivatedEdgeMappings_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allActivatedEdgeMappings_feature", "_UI_DiagramDescription_type"),
- DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__ALL_ACTIVATED_EDGE_MAPPINGS, false, false, false, null, null, null));
- }
-
- /**
* This adds a property descriptor for the All Node Mappings feature. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DiagramImportDescriptionItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DiagramImportDescriptionItemProvider.java
index 850f9ec16a..94f5ef0a4e 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DiagramImportDescriptionItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/DiagramImportDescriptionItemProvider.java
@@ -76,7 +76,6 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
addDropDescriptionsPropertyDescriptor(object);
addPasteDescriptionsPropertyDescriptor(object);
addAllEdgeMappingsPropertyDescriptor(object);
- addAllActivatedEdgeMappingsPropertyDescriptor(object);
addAllNodeMappingsPropertyDescriptor(object);
addAllContainerMappingsPropertyDescriptor(object);
addAllToolsPropertyDescriptor(object);
@@ -197,19 +196,6 @@ public class DiagramImportDescriptionItemProvider extends DocumentedElementItemP
}
/**
- * This adds a property descriptor for the All Activated Edge Mappings
- * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addAllActivatedEdgeMappingsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
- getString("_UI_DiagramDescription_allActivatedEdgeMappings_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_DiagramDescription_allActivatedEdgeMappings_feature", "_UI_DiagramDescription_type"),
- DescriptionPackage.Literals.DIAGRAM_DESCRIPTION__ALL_ACTIVATED_EDGE_MAPPINGS, false, false, false, null, null, null));
- }
-
- /**
* This adds a property descriptor for the All Node Mappings feature. <!--
* begin-user-doc --> <!-- end-user-doc -->
*
diff --git a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/LayerItemProvider.java b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/LayerItemProvider.java
index 0ef53ee050..b7423316b4 100644
--- a/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/LayerItemProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src-gen/org/eclipse/sirius/viewpoint/description/provider/LayerItemProvider.java
@@ -78,7 +78,6 @@ public class LayerItemProvider extends DocumentedElementItemProvider implements
addReusedToolsPropertyDescriptor(object);
addIconPropertyDescriptor(object);
addAllEdgeMappingsPropertyDescriptor(object);
- addAllActivatedEdgeMappingsPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
@@ -180,18 +179,6 @@ public class LayerItemProvider extends DocumentedElementItemProvider implements
}
/**
- * This adds a property descriptor for the All Activated Edge Mappings
- * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- protected void addAllActivatedEdgeMappingsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
- getString("_UI_Layer_allActivatedEdgeMappings_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Layer_allActivatedEdgeMappings_feature", "_UI_Layer_type"),
- DescriptionPackage.Literals.LAYER__ALL_ACTIVATED_EDGE_MAPPINGS, false, false, false, null, null, null));
- }
-
- /**
* This specifies how to implement {@link #getChildren} and is used to
* deduce an appropriate feature for an
* {@link org.eclipse.emf.edit.command.AddCommand},
diff --git a/plugins/org.eclipse.sirius/model/viewpoint.ecore b/plugins/org.eclipse.sirius/model/viewpoint.ecore
index b8b7986a1b..53e4f1db52 100644
--- a/plugins/org.eclipse.sirius/model/viewpoint.ecore
+++ b/plugins/org.eclipse.sirius/model/viewpoint.ecore
@@ -1619,13 +1619,6 @@
<details key="documentation" value="All edge mappings (including import edge ampping) of this simple mapping."/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="allActivatedEdgeMappings"
- upperBound="-1" eType="#//description/EdgeMapping" changeable="false" volatile="true"
- transient="true" derived="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="All edge mappings (including import edge ampping) of this simple mapping."/>
- </eAnnotations>
- </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="allNodeMappings" upperBound="-1"
eType="#//description/NodeMapping" changeable="false" volatile="true" transient="true"
derived="true">
@@ -2592,13 +2585,6 @@
<details key="documentation" value="All edge mappings (including import edge mapping) of this simple mapping."/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="allActivatedEdgeMappings"
- upperBound="-1" eType="#//description/EdgeMapping" changeable="false" volatile="true"
- transient="true" derived="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="All edge mappings (including import edge ampping) of this simple mapping."/>
- </eAnnotations>
- </eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="customization" eType="#//description/Customization"
containment="true"/>
</eClassifiers>
diff --git a/plugins/org.eclipse.sirius/model/viewpoint.genmodel b/plugins/org.eclipse.sirius/model/viewpoint.genmodel
index 22866ef503..dc0864cc5b 100644
--- a/plugins/org.eclipse.sirius/model/viewpoint.genmodel
+++ b/plugins/org.eclipse.sirius/model/viewpoint.genmodel
@@ -615,7 +615,6 @@
<genClasses ecoreClass="viewpoint.ecore#//description/DiagramDescription">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference viewpoint.ecore#//description/DiagramDescription/filters"/>
<genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference viewpoint.ecore#//description/DiagramDescription/allEdgeMappings"/>
- <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference viewpoint.ecore#//description/DiagramDescription/allActivatedEdgeMappings"/>
<genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference viewpoint.ecore#//description/DiagramDescription/allNodeMappings"/>
<genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference viewpoint.ecore#//description/DiagramDescription/allContainerMappings"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference viewpoint.ecore#//description/DiagramDescription/validationSet"/>
@@ -976,7 +975,6 @@
<genFeatures createChild="false" propertyCategory="Advanced" propertyDescription="Optional icon for the layer."
ecoreFeature="ecore:EAttribute viewpoint.ecore#//description/Layer/icon"/>
<genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference viewpoint.ecore#//description/Layer/allEdgeMappings"/>
- <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference viewpoint.ecore#//description/Layer/allActivatedEdgeMappings"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference viewpoint.ecore#//description/Layer/customization"/>
</genClasses>
<genClasses ecoreClass="viewpoint.ecore#//description/AdditionalLayer">
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java
index ca3d051746..3c010373f2 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DescriptionPackage.java
@@ -1092,22 +1092,13 @@ public interface DescriptionPackage extends EPackage {
int DIAGRAM_DESCRIPTION__ALL_EDGE_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 10;
/**
- * The feature id for the '<em><b>All Activated Edge Mappings</b></em>'
- * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int DIAGRAM_DESCRIPTION__ALL_ACTIVATED_EDGE_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 11;
-
- /**
* The feature id for the '<em><b>All Node Mappings</b></em>' reference
* list. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__ALL_NODE_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 12;
+ int DIAGRAM_DESCRIPTION__ALL_NODE_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 11;
/**
* The feature id for the '<em><b>All Container Mappings</b></em>' reference
@@ -1116,7 +1107,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__ALL_CONTAINER_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 13;
+ int DIAGRAM_DESCRIPTION__ALL_CONTAINER_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 12;
/**
* The feature id for the '<em><b>Validation Set</b></em>' containment
@@ -1125,7 +1116,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__VALIDATION_SET = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 14;
+ int DIAGRAM_DESCRIPTION__VALIDATION_SET = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 13;
/**
* The feature id for the '<em><b>Concerns</b></em>' containment reference.
@@ -1134,7 +1125,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__CONCERNS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 15;
+ int DIAGRAM_DESCRIPTION__CONCERNS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 14;
/**
* The feature id for the '<em><b>Information Sections</b></em>' containment
@@ -1143,7 +1134,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__INFORMATION_SECTIONS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 16;
+ int DIAGRAM_DESCRIPTION__INFORMATION_SECTIONS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 15;
/**
* The feature id for the '<em><b>All Tools</b></em>' reference list. <!--
@@ -1152,7 +1143,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__ALL_TOOLS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 17;
+ int DIAGRAM_DESCRIPTION__ALL_TOOLS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 16;
/**
* The feature id for the '<em><b>Domain Class</b></em>' attribute. <!--
@@ -1161,7 +1152,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__DOMAIN_CLASS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 18;
+ int DIAGRAM_DESCRIPTION__DOMAIN_CLASS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 17;
/**
* The feature id for the '<em><b>Precondition Expression</b></em>'
@@ -1170,7 +1161,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__PRECONDITION_EXPRESSION = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 19;
+ int DIAGRAM_DESCRIPTION__PRECONDITION_EXPRESSION = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 18;
/**
* The feature id for the '<em><b>Default Concern</b></em>' reference. <!--
@@ -1179,7 +1170,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__DEFAULT_CONCERN = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 20;
+ int DIAGRAM_DESCRIPTION__DEFAULT_CONCERN = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 19;
/**
* The feature id for the '<em><b>Root Expression</b></em>' attribute. <!--
@@ -1188,7 +1179,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__ROOT_EXPRESSION = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 21;
+ int DIAGRAM_DESCRIPTION__ROOT_EXPRESSION = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 20;
/**
* The feature id for the '<em><b>Init</b></em>' reference. <!--
@@ -1197,7 +1188,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__INIT = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 22;
+ int DIAGRAM_DESCRIPTION__INIT = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 21;
/**
* The feature id for the '<em><b>Layout</b></em>' containment reference.
@@ -1206,7 +1197,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__LAYOUT = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 23;
+ int DIAGRAM_DESCRIPTION__LAYOUT = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 22;
/**
* The feature id for the '<em><b>Diagram Initialisation</b></em>'
@@ -1215,7 +1206,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__DIAGRAM_INITIALISATION = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 24;
+ int DIAGRAM_DESCRIPTION__DIAGRAM_INITIALISATION = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 23;
/**
* The feature id for the '<em><b>Default Layer</b></em>' containment
@@ -1224,7 +1215,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__DEFAULT_LAYER = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 25;
+ int DIAGRAM_DESCRIPTION__DEFAULT_LAYER = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 24;
/**
* The feature id for the '<em><b>Additional Layers</b></em>' containment
@@ -1233,7 +1224,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__ADDITIONAL_LAYERS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 26;
+ int DIAGRAM_DESCRIPTION__ADDITIONAL_LAYERS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 25;
/**
* The feature id for the '<em><b>All Layers</b></em>' reference list. <!--
@@ -1242,7 +1233,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__ALL_LAYERS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 27;
+ int DIAGRAM_DESCRIPTION__ALL_LAYERS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 26;
/**
* The feature id for the '<em><b>All Activated Tools</b></em>' reference
@@ -1251,7 +1242,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__ALL_ACTIVATED_TOOLS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 28;
+ int DIAGRAM_DESCRIPTION__ALL_ACTIVATED_TOOLS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 27;
/**
* The feature id for the '<em><b>Node Mappings</b></em>' containment
@@ -1260,7 +1251,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__NODE_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 29;
+ int DIAGRAM_DESCRIPTION__NODE_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 28;
/**
* The feature id for the '<em><b>Edge Mappings</b></em>' containment
@@ -1269,7 +1260,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__EDGE_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 30;
+ int DIAGRAM_DESCRIPTION__EDGE_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 29;
/**
* The feature id for the '<em><b>Edge Mapping Imports</b></em>' containment
@@ -1278,7 +1269,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__EDGE_MAPPING_IMPORTS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 31;
+ int DIAGRAM_DESCRIPTION__EDGE_MAPPING_IMPORTS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 30;
/**
* The feature id for the '<em><b>Container Mappings</b></em>' containment
@@ -1287,7 +1278,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__CONTAINER_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 32;
+ int DIAGRAM_DESCRIPTION__CONTAINER_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 31;
/**
* The feature id for the '<em><b>Reused Mappings</b></em>' reference list.
@@ -1296,7 +1287,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__REUSED_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 33;
+ int DIAGRAM_DESCRIPTION__REUSED_MAPPINGS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 32;
/**
* The feature id for the '<em><b>Tool Section</b></em>' containment
@@ -1305,7 +1296,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__TOOL_SECTION = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 34;
+ int DIAGRAM_DESCRIPTION__TOOL_SECTION = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 33;
/**
* The feature id for the '<em><b>Reused Tools</b></em>' reference list.
@@ -1314,7 +1305,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__REUSED_TOOLS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 35;
+ int DIAGRAM_DESCRIPTION__REUSED_TOOLS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 34;
/**
* The feature id for the '<em><b>Enable Popup Bars</b></em>' attribute.
@@ -1324,7 +1315,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION__ENABLE_POPUP_BARS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 36;
+ int DIAGRAM_DESCRIPTION__ENABLE_POPUP_BARS = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 35;
/**
* The number of structural features of the '<em>Diagram Description</em>'
@@ -1333,7 +1324,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_DESCRIPTION_FEATURE_COUNT = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 37;
+ int DIAGRAM_DESCRIPTION_FEATURE_COUNT = DRAG_AND_DROP_TARGET_DESCRIPTION_FEATURE_COUNT + 36;
/**
* The feature id for the '<em><b>Documentation</b></em>' attribute. <!--
@@ -1445,22 +1436,13 @@ public interface DescriptionPackage extends EPackage {
int DIAGRAM_IMPORT_DESCRIPTION__ALL_EDGE_MAPPINGS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 3;
/**
- * The feature id for the '<em><b>All Activated Edge Mappings</b></em>'
- * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int DIAGRAM_IMPORT_DESCRIPTION__ALL_ACTIVATED_EDGE_MAPPINGS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 4;
-
- /**
* The feature id for the '<em><b>All Node Mappings</b></em>' reference
* list. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__ALL_NODE_MAPPINGS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 5;
+ int DIAGRAM_IMPORT_DESCRIPTION__ALL_NODE_MAPPINGS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>All Container Mappings</b></em>' reference
@@ -1469,7 +1451,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__ALL_CONTAINER_MAPPINGS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 6;
+ int DIAGRAM_IMPORT_DESCRIPTION__ALL_CONTAINER_MAPPINGS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 5;
/**
* The feature id for the '<em><b>Validation Set</b></em>' containment
@@ -1478,7 +1460,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__VALIDATION_SET = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 7;
+ int DIAGRAM_IMPORT_DESCRIPTION__VALIDATION_SET = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 6;
/**
* The feature id for the '<em><b>Concerns</b></em>' containment reference.
@@ -1487,7 +1469,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__CONCERNS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 8;
+ int DIAGRAM_IMPORT_DESCRIPTION__CONCERNS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 7;
/**
* The feature id for the '<em><b>Information Sections</b></em>' containment
@@ -1496,7 +1478,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__INFORMATION_SECTIONS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 9;
+ int DIAGRAM_IMPORT_DESCRIPTION__INFORMATION_SECTIONS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 8;
/**
* The feature id for the '<em><b>All Tools</b></em>' reference list. <!--
@@ -1505,7 +1487,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__ALL_TOOLS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 10;
+ int DIAGRAM_IMPORT_DESCRIPTION__ALL_TOOLS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 9;
/**
* The feature id for the '<em><b>Domain Class</b></em>' attribute. <!--
@@ -1514,7 +1496,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__DOMAIN_CLASS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 11;
+ int DIAGRAM_IMPORT_DESCRIPTION__DOMAIN_CLASS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 10;
/**
* The feature id for the '<em><b>Precondition Expression</b></em>'
@@ -1523,7 +1505,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__PRECONDITION_EXPRESSION = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 12;
+ int DIAGRAM_IMPORT_DESCRIPTION__PRECONDITION_EXPRESSION = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 11;
/**
* The feature id for the '<em><b>Default Concern</b></em>' reference. <!--
@@ -1532,7 +1514,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__DEFAULT_CONCERN = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 13;
+ int DIAGRAM_IMPORT_DESCRIPTION__DEFAULT_CONCERN = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 12;
/**
* The feature id for the '<em><b>Root Expression</b></em>' attribute. <!--
@@ -1541,7 +1523,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__ROOT_EXPRESSION = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 14;
+ int DIAGRAM_IMPORT_DESCRIPTION__ROOT_EXPRESSION = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 13;
/**
* The feature id for the '<em><b>Init</b></em>' reference. <!--
@@ -1550,7 +1532,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__INIT = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 15;
+ int DIAGRAM_IMPORT_DESCRIPTION__INIT = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 14;
/**
* The feature id for the '<em><b>Layout</b></em>' containment reference.
@@ -1559,7 +1541,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__LAYOUT = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 16;
+ int DIAGRAM_IMPORT_DESCRIPTION__LAYOUT = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 15;
/**
* The feature id for the '<em><b>Diagram Initialisation</b></em>'
@@ -1568,7 +1550,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__DIAGRAM_INITIALISATION = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 17;
+ int DIAGRAM_IMPORT_DESCRIPTION__DIAGRAM_INITIALISATION = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 16;
/**
* The feature id for the '<em><b>Default Layer</b></em>' containment
@@ -1577,7 +1559,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__DEFAULT_LAYER = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 18;
+ int DIAGRAM_IMPORT_DESCRIPTION__DEFAULT_LAYER = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 17;
/**
* The feature id for the '<em><b>Additional Layers</b></em>' containment
@@ -1586,7 +1568,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__ADDITIONAL_LAYERS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 19;
+ int DIAGRAM_IMPORT_DESCRIPTION__ADDITIONAL_LAYERS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 18;
/**
* The feature id for the '<em><b>All Layers</b></em>' reference list. <!--
@@ -1595,7 +1577,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__ALL_LAYERS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 20;
+ int DIAGRAM_IMPORT_DESCRIPTION__ALL_LAYERS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 19;
/**
* The feature id for the '<em><b>All Activated Tools</b></em>' reference
@@ -1604,7 +1586,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__ALL_ACTIVATED_TOOLS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 21;
+ int DIAGRAM_IMPORT_DESCRIPTION__ALL_ACTIVATED_TOOLS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 20;
/**
* The feature id for the '<em><b>Node Mappings</b></em>' containment
@@ -1613,7 +1595,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__NODE_MAPPINGS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 22;
+ int DIAGRAM_IMPORT_DESCRIPTION__NODE_MAPPINGS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 21;
/**
* The feature id for the '<em><b>Edge Mappings</b></em>' containment
@@ -1622,7 +1604,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__EDGE_MAPPINGS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 23;
+ int DIAGRAM_IMPORT_DESCRIPTION__EDGE_MAPPINGS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 22;
/**
* The feature id for the '<em><b>Edge Mapping Imports</b></em>' containment
@@ -1631,7 +1613,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__EDGE_MAPPING_IMPORTS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 24;
+ int DIAGRAM_IMPORT_DESCRIPTION__EDGE_MAPPING_IMPORTS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 23;
/**
* The feature id for the '<em><b>Container Mappings</b></em>' containment
@@ -1640,7 +1622,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__CONTAINER_MAPPINGS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 25;
+ int DIAGRAM_IMPORT_DESCRIPTION__CONTAINER_MAPPINGS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 24;
/**
* The feature id for the '<em><b>Reused Mappings</b></em>' reference list.
@@ -1649,7 +1631,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__REUSED_MAPPINGS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 26;
+ int DIAGRAM_IMPORT_DESCRIPTION__REUSED_MAPPINGS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 25;
/**
* The feature id for the '<em><b>Tool Section</b></em>' containment
@@ -1658,7 +1640,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__TOOL_SECTION = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 27;
+ int DIAGRAM_IMPORT_DESCRIPTION__TOOL_SECTION = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 26;
/**
* The feature id for the '<em><b>Reused Tools</b></em>' reference list.
@@ -1667,7 +1649,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__REUSED_TOOLS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 28;
+ int DIAGRAM_IMPORT_DESCRIPTION__REUSED_TOOLS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 27;
/**
* The feature id for the '<em><b>Enable Popup Bars</b></em>' attribute.
@@ -1677,7 +1659,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__ENABLE_POPUP_BARS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 29;
+ int DIAGRAM_IMPORT_DESCRIPTION__ENABLE_POPUP_BARS = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 28;
/**
* The feature id for the '<em><b>Imported Diagram</b></em>' reference. <!--
@@ -1686,7 +1668,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION__IMPORTED_DIAGRAM = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 30;
+ int DIAGRAM_IMPORT_DESCRIPTION__IMPORTED_DIAGRAM = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 29;
/**
* The number of structural features of the '
@@ -1696,7 +1678,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int DIAGRAM_IMPORT_DESCRIPTION_FEATURE_COUNT = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 31;
+ int DIAGRAM_IMPORT_DESCRIPTION_FEATURE_COUNT = REPRESENTATION_IMPORT_DESCRIPTION_FEATURE_COUNT + 30;
/**
* The feature id for the '<em><b>Name</b></em>' attribute. <!--
@@ -4117,22 +4099,13 @@ public interface DescriptionPackage extends EPackage {
int LAYER__ALL_EDGE_MAPPINGS = DOCUMENTED_ELEMENT_FEATURE_COUNT + 13;
/**
- * The feature id for the '<em><b>All Activated Edge Mappings</b></em>'
- * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int LAYER__ALL_ACTIVATED_EDGE_MAPPINGS = DOCUMENTED_ELEMENT_FEATURE_COUNT + 14;
-
- /**
* The feature id for the '<em><b>Customization</b></em>' containment
* reference. <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @generated
* @ordered
*/
- int LAYER__CUSTOMIZATION = DOCUMENTED_ELEMENT_FEATURE_COUNT + 15;
+ int LAYER__CUSTOMIZATION = DOCUMENTED_ELEMENT_FEATURE_COUNT + 14;
/**
* The number of structural features of the '<em>Layer</em>' class. <!--
@@ -4141,7 +4114,7 @@ public interface DescriptionPackage extends EPackage {
* @generated
* @ordered
*/
- int LAYER_FEATURE_COUNT = DOCUMENTED_ELEMENT_FEATURE_COUNT + 16;
+ int LAYER_FEATURE_COUNT = DOCUMENTED_ELEMENT_FEATURE_COUNT + 15;
/**
* The meta object id for the '
@@ -4291,15 +4264,6 @@ public interface DescriptionPackage extends EPackage {
int ADDITIONAL_LAYER__ALL_EDGE_MAPPINGS = LAYER__ALL_EDGE_MAPPINGS;
/**
- * The feature id for the '<em><b>All Activated Edge Mappings</b></em>'
- * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int ADDITIONAL_LAYER__ALL_ACTIVATED_EDGE_MAPPINGS = LAYER__ALL_ACTIVATED_EDGE_MAPPINGS;
-
- /**
* The feature id for the '<em><b>Customization</b></em>' containment
* reference. <!-- begin-user-doc --> <!-- end-user-doc -->
*
@@ -5795,20 +5759,6 @@ public interface DescriptionPackage extends EPackage {
/**
* Returns the meta object for the reference list '
- * {@link org.eclipse.sirius.viewpoint.description.DiagramDescription#getAllActivatedEdgeMappings
- * <em>All Activated Edge Mappings</em>}'. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @return the meta object for the reference list '
- * <em>All Activated Edge Mappings</em>'.
- * @see org.eclipse.sirius.viewpoint.description.DiagramDescription#getAllActivatedEdgeMappings()
- * @see #getDiagramDescription()
- * @generated
- */
- EReference getDiagramDescription_AllActivatedEdgeMappings();
-
- /**
- * Returns the meta object for the reference list '
* {@link org.eclipse.sirius.viewpoint.description.DiagramDescription#getAllNodeMappings
* <em>All Node Mappings</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
* -->
@@ -7667,20 +7617,6 @@ public interface DescriptionPackage extends EPackage {
EReference getLayer_AllEdgeMappings();
/**
- * Returns the meta object for the reference list '
- * {@link org.eclipse.sirius.viewpoint.description.Layer#getAllActivatedEdgeMappings
- * <em>All Activated Edge Mappings</em>}'. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
- * @return the meta object for the reference list '
- * <em>All Activated Edge Mappings</em>'.
- * @see org.eclipse.sirius.viewpoint.description.Layer#getAllActivatedEdgeMappings()
- * @see #getLayer()
- * @generated
- */
- EReference getLayer_AllActivatedEdgeMappings();
-
- /**
* Returns the meta object for the containment reference '
* {@link org.eclipse.sirius.viewpoint.description.Layer#getCustomization
* <em>Customization</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -8852,15 +8788,6 @@ public interface DescriptionPackage extends EPackage {
EReference DIAGRAM_DESCRIPTION__ALL_EDGE_MAPPINGS = eINSTANCE.getDiagramDescription_AllEdgeMappings();
/**
- * The meta object literal for the '
- * <em><b>All Activated Edge Mappings</b></em>' reference list feature.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- EReference DIAGRAM_DESCRIPTION__ALL_ACTIVATED_EDGE_MAPPINGS = eINSTANCE.getDiagramDescription_AllActivatedEdgeMappings();
-
- /**
* The meta object literal for the '<em><b>All Node Mappings</b></em>'
* reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
*
@@ -10318,15 +10245,6 @@ public interface DescriptionPackage extends EPackage {
EReference LAYER__ALL_EDGE_MAPPINGS = eINSTANCE.getLayer_AllEdgeMappings();
/**
- * The meta object literal for the '
- * <em><b>All Activated Edge Mappings</b></em>' reference list feature.
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
- EReference LAYER__ALL_ACTIVATED_EDGE_MAPPINGS = eINSTANCE.getLayer_AllActivatedEdgeMappings();
-
- /**
* The meta object literal for the '<em><b>Customization</b></em>'
* containment reference feature. <!-- begin-user-doc --> <!--
* end-user-doc -->
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DiagramDescription.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DiagramDescription.java
index 10ea9b23e1..08bee2a623 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DiagramDescription.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/DiagramDescription.java
@@ -38,9 +38,6 @@ import org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
* {@link org.eclipse.sirius.viewpoint.description.DiagramDescription#getAllEdgeMappings
* <em>All Edge Mappings</em>}</li>
* <li>
- * {@link org.eclipse.sirius.viewpoint.description.DiagramDescription#getAllActivatedEdgeMappings
- * <em>All Activated Edge Mappings</em>}</li>
- * <li>
* {@link org.eclipse.sirius.viewpoint.description.DiagramDescription#getAllNodeMappings
* <em>All Node Mappings</em>}</li>
* <li>
@@ -153,22 +150,6 @@ public interface DiagramDescription extends DragAndDropTargetDescription, Repres
EList<EdgeMapping> getAllEdgeMappings();
/**
- * Returns the value of the '<em><b>All Activated Edge Mappings</b></em>'
- * reference list. The list contents are of type
- * {@link org.eclipse.sirius.viewpoint.description.EdgeMapping}. <!--
- * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> All
- * edge mappings (including import edge ampping) of this simple mapping.
- * <!-- end-model-doc -->
- *
- * @return the value of the '<em>All Activated Edge Mappings</em>' reference
- * list.
- * @see org.eclipse.sirius.viewpoint.description.DescriptionPackage#getDiagramDescription_AllActivatedEdgeMappings()
- * @model transient="true" changeable="false" volatile="true" derived="true"
- * @generated
- */
- EList<EdgeMapping> getAllActivatedEdgeMappings();
-
- /**
* Returns the value of the '<em><b>All Node Mappings</b></em>' reference
* list. The list contents are of type
* {@link org.eclipse.sirius.viewpoint.description.NodeMapping}. <!--
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Layer.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Layer.java
index c4aa9e9a20..7d6d99ddbe 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Layer.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/Layer.java
@@ -46,9 +46,6 @@ import org.eclipse.sirius.viewpoint.description.tool.ToolSection;
* </em>}</li>
* <li>{@link org.eclipse.sirius.viewpoint.description.Layer#getAllEdgeMappings
* <em>All Edge Mappings</em>}</li>
- * <li>
- * {@link org.eclipse.sirius.viewpoint.description.Layer#getAllActivatedEdgeMappings
- * <em>All Activated Edge Mappings</em>}</li>
* <li>{@link org.eclipse.sirius.viewpoint.description.Layer#getCustomization
* <em>Customization</em>}</li>
* </ul>
@@ -253,22 +250,6 @@ public interface Layer extends DocumentedElement, EndUserDocumentedElement, Iden
EList<EdgeMapping> getAllEdgeMappings();
/**
- * Returns the value of the '<em><b>All Activated Edge Mappings</b></em>'
- * reference list. The list contents are of type
- * {@link org.eclipse.sirius.viewpoint.description.EdgeMapping}. <!--
- * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> All
- * edge mappings (including import edge ampping) of this simple mapping.
- * <!-- end-model-doc -->
- *
- * @return the value of the '<em>All Activated Edge Mappings</em>' reference
- * list.
- * @see org.eclipse.sirius.viewpoint.description.DescriptionPackage#getLayer_AllActivatedEdgeMappings()
- * @model transient="true" changeable="false" volatile="true" derived="true"
- * @generated
- */
- EList<EdgeMapping> getAllActivatedEdgeMappings();
-
- /**
* Returns the value of the '<em><b>Customization</b></em>' containment
* reference. <!-- begin-user-doc -->
* <p>
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java
index 86b33c18c8..aa20ef2587 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DescriptionPackageImpl.java
@@ -1076,17 +1076,8 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
*
* @generated
*/
- public EReference getDiagramDescription_AllActivatedEdgeMappings() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
public EReference getDiagramDescription_AllNodeMappings() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(3);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(2);
}
/**
@@ -1095,7 +1086,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_AllContainerMappings() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(4);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(3);
}
/**
@@ -1104,7 +1095,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_ValidationSet() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(5);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(4);
}
/**
@@ -1113,7 +1104,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_Concerns() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(6);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(5);
}
/**
@@ -1122,7 +1113,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_InformationSections() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(7);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(6);
}
/**
@@ -1131,7 +1122,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_AllTools() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(8);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(7);
}
/**
@@ -1140,7 +1131,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EAttribute getDiagramDescription_DomainClass() {
- return (EAttribute) diagramDescriptionEClass.getEStructuralFeatures().get(9);
+ return (EAttribute) diagramDescriptionEClass.getEStructuralFeatures().get(8);
}
/**
@@ -1149,7 +1140,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EAttribute getDiagramDescription_PreconditionExpression() {
- return (EAttribute) diagramDescriptionEClass.getEStructuralFeatures().get(10);
+ return (EAttribute) diagramDescriptionEClass.getEStructuralFeatures().get(9);
}
/**
@@ -1158,7 +1149,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_DefaultConcern() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(11);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(10);
}
/**
@@ -1167,7 +1158,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EAttribute getDiagramDescription_RootExpression() {
- return (EAttribute) diagramDescriptionEClass.getEStructuralFeatures().get(12);
+ return (EAttribute) diagramDescriptionEClass.getEStructuralFeatures().get(11);
}
/**
@@ -1176,7 +1167,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_Init() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(13);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(12);
}
/**
@@ -1185,7 +1176,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_Layout() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(14);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(13);
}
/**
@@ -1194,7 +1185,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_DiagramInitialisation() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(15);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(14);
}
/**
@@ -1203,7 +1194,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_DefaultLayer() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(16);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(15);
}
/**
@@ -1212,7 +1203,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_AdditionalLayers() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(17);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(16);
}
/**
@@ -1221,7 +1212,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_AllLayers() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(18);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(17);
}
/**
@@ -1230,7 +1221,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_AllActivatedTools() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(19);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(18);
}
/**
@@ -1239,7 +1230,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_NodeMappings() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(20);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(19);
}
/**
@@ -1248,7 +1239,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_EdgeMappings() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(21);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(20);
}
/**
@@ -1257,7 +1248,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_EdgeMappingImports() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(22);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(21);
}
/**
@@ -1266,7 +1257,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_ContainerMappings() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(23);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(22);
}
/**
@@ -1275,7 +1266,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_ReusedMappings() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(24);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(23);
}
/**
@@ -1284,7 +1275,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_ToolSection() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(25);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(24);
}
/**
@@ -1293,7 +1284,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EReference getDiagramDescription_ReusedTools() {
- return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(26);
+ return (EReference) diagramDescriptionEClass.getEStructuralFeatures().get(25);
}
/**
@@ -1302,7 +1293,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
* @generated
*/
public EAttribute getDiagramDescription_EnablePopupBars() {
- return (EAttribute) diagramDescriptionEClass.getEStructuralFeatures().get(27);
+ return (EAttribute) diagramDescriptionEClass.getEStructuralFeatures().get(26);
}
/**
@@ -2327,17 +2318,8 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
*
* @generated
*/
- public EReference getLayer_AllActivatedEdgeMappings() {
- return (EReference) layerEClass.getEStructuralFeatures().get(11);
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
public EReference getLayer_Customization() {
- return (EReference) layerEClass.getEStructuralFeatures().get(12);
+ return (EReference) layerEClass.getEStructuralFeatures().get(11);
}
/**
@@ -3126,7 +3108,6 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
diagramDescriptionEClass = createEClass(DIAGRAM_DESCRIPTION);
createEReference(diagramDescriptionEClass, DIAGRAM_DESCRIPTION__FILTERS);
createEReference(diagramDescriptionEClass, DIAGRAM_DESCRIPTION__ALL_EDGE_MAPPINGS);
- createEReference(diagramDescriptionEClass, DIAGRAM_DESCRIPTION__ALL_ACTIVATED_EDGE_MAPPINGS);
createEReference(diagramDescriptionEClass, DIAGRAM_DESCRIPTION__ALL_NODE_MAPPINGS);
createEReference(diagramDescriptionEClass, DIAGRAM_DESCRIPTION__ALL_CONTAINER_MAPPINGS);
createEReference(diagramDescriptionEClass, DIAGRAM_DESCRIPTION__VALIDATION_SET);
@@ -3297,7 +3278,6 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
createEReference(layerEClass, LAYER__DECORATION_DESCRIPTIONS_SET);
createEAttribute(layerEClass, LAYER__ICON);
createEReference(layerEClass, LAYER__ALL_EDGE_MAPPINGS);
- createEReference(layerEClass, LAYER__ALL_ACTIVATED_EDGE_MAPPINGS);
createEReference(layerEClass, LAYER__CUSTOMIZATION);
additionalLayerEClass = createEClass(ADDITIONAL_LAYER);
@@ -3601,8 +3581,6 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
getDiagramDescription_Filters().getEKeys().add(this.getIdentifiedElement_Name());
initEReference(getDiagramDescription_AllEdgeMappings(), this.getEdgeMapping(), null, "allEdgeMappings", null, 0, -1, DiagramDescription.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE,
!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
- initEReference(getDiagramDescription_AllActivatedEdgeMappings(), this.getEdgeMapping(), null, "allActivatedEdgeMappings", null, 0, -1, DiagramDescription.class, IS_TRANSIENT, IS_VOLATILE,
- !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
initEReference(getDiagramDescription_AllNodeMappings(), this.getNodeMapping(), null, "allNodeMappings", null, 0, -1, DiagramDescription.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE,
!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
initEReference(getDiagramDescription_AllContainerMappings(), this.getContainerMapping(), null, "allContainerMappings", null, 0, -1, DiagramDescription.class, IS_TRANSIENT, IS_VOLATILE,
@@ -4015,8 +3993,6 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP
IS_ORDERED);
initEReference(getLayer_AllEdgeMappings(), this.getEdgeMapping(), null, "allEdgeMappings", null, 0, -1, Layer.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE,
IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
- initEReference(getLayer_AllActivatedEdgeMappings(), this.getEdgeMapping(), null, "allActivatedEdgeMappings", null, 0, -1, Layer.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE,
- !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
initEReference(getLayer_Customization(), this.getCustomization(), null, "customization", null, 0, 1, Layer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DiagramDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DiagramDescriptionImpl.java
index f85a4596d0..b93817bf35 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DiagramDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DiagramDescriptionImpl.java
@@ -89,9 +89,6 @@ import org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
* {@link org.eclipse.sirius.viewpoint.description.impl.DiagramDescriptionImpl#getAllEdgeMappings
* <em>All Edge Mappings</em>}</li>
* <li>
- * {@link org.eclipse.sirius.viewpoint.description.impl.DiagramDescriptionImpl#getAllActivatedEdgeMappings
- * <em>All Activated Edge Mappings</em>}</li>
- * <li>
* {@link org.eclipse.sirius.viewpoint.description.impl.DiagramDescriptionImpl#getAllNodeMappings
* <em>All Node Mappings</em>}</li>
* <li>
@@ -834,23 +831,6 @@ public class DiagramDescriptionImpl extends DragAndDropTargetDescriptionImpl imp
*
* @generated
*/
- public EList<EdgeMapping> getAllActivatedEdgeMappings() {
- // TODO: implement this method to return the 'All Activated Edge
- // Mappings' reference list
- // Ensure that you remove @generated or mark it @generated NOT
- // The list is expected to implement
- // org.eclipse.emf.ecore.util.InternalEList and
- // org.eclipse.emf.ecore.EStructuralFeature.Setting
- // so it's likely that an appropriate subclass of
- // org.eclipse.emf.ecore.util.EcoreEList should be used.
- throw new UnsupportedOperationException();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
public EList<NodeMapping> getAllNodeMappings() {
// TODO: implement this method to return the 'All Node Mappings'
// reference list
@@ -1685,8 +1665,6 @@ public class DiagramDescriptionImpl extends DragAndDropTargetDescriptionImpl imp
return getFilters();
case DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_EDGE_MAPPINGS:
return getAllEdgeMappings();
- case DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_ACTIVATED_EDGE_MAPPINGS:
- return getAllActivatedEdgeMappings();
case DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_NODE_MAPPINGS:
return getAllNodeMappings();
case DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_CONTAINER_MAPPINGS:
@@ -2017,8 +1995,6 @@ public class DiagramDescriptionImpl extends DragAndDropTargetDescriptionImpl imp
return filters != null && !filters.isEmpty();
case DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_EDGE_MAPPINGS:
return !getAllEdgeMappings().isEmpty();
- case DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_ACTIVATED_EDGE_MAPPINGS:
- return !getAllActivatedEdgeMappings().isEmpty();
case DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_NODE_MAPPINGS:
return !getAllNodeMappings().isEmpty();
case DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_CONTAINER_MAPPINGS:
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DiagramImportDescriptionImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DiagramImportDescriptionImpl.java
index 8b8a03d42d..a55ceac5f5 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DiagramImportDescriptionImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/DiagramImportDescriptionImpl.java
@@ -90,9 +90,6 @@ import org.eclipse.sirius.viewpoint.description.validation.ValidationSet;
* {@link org.eclipse.sirius.viewpoint.description.impl.DiagramImportDescriptionImpl#getAllEdgeMappings
* <em>All Edge Mappings</em>}</li>
* <li>
- * {@link org.eclipse.sirius.viewpoint.description.impl.DiagramImportDescriptionImpl#getAllActivatedEdgeMappings
- * <em>All Activated Edge Mappings</em>}</li>
- * <li>
* {@link org.eclipse.sirius.viewpoint.description.impl.DiagramImportDescriptionImpl#getAllNodeMappings
* <em>All Node Mappings</em>}</li>
* <li>
@@ -829,23 +826,6 @@ public class DiagramImportDescriptionImpl extends DocumentedElementImpl implemen
*
* @generated
*/
- public EList<EdgeMapping> getAllActivatedEdgeMappings() {
- // TODO: implement this method to return the 'All Activated Edge
- // Mappings' reference list
- // Ensure that you remove @generated or mark it @generated NOT
- // The list is expected to implement
- // org.eclipse.emf.ecore.util.InternalEList and
- // org.eclipse.emf.ecore.EStructuralFeature.Setting
- // so it's likely that an appropriate subclass of
- // org.eclipse.emf.ecore.util.EcoreEList should be used.
- throw new UnsupportedOperationException();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
public EList<NodeMapping> getAllNodeMappings() {
// TODO: implement this method to return the 'All Node Mappings'
// reference list
@@ -1718,8 +1698,6 @@ public class DiagramImportDescriptionImpl extends DocumentedElementImpl implemen
return getFilters();
case DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ALL_EDGE_MAPPINGS:
return getAllEdgeMappings();
- case DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ALL_ACTIVATED_EDGE_MAPPINGS:
- return getAllActivatedEdgeMappings();
case DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ALL_NODE_MAPPINGS:
return getAllNodeMappings();
case DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ALL_CONTAINER_MAPPINGS:
@@ -2061,8 +2039,6 @@ public class DiagramImportDescriptionImpl extends DocumentedElementImpl implemen
return filters != null && !filters.isEmpty();
case DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ALL_EDGE_MAPPINGS:
return !getAllEdgeMappings().isEmpty();
- case DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ALL_ACTIVATED_EDGE_MAPPINGS:
- return !getAllActivatedEdgeMappings().isEmpty();
case DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ALL_NODE_MAPPINGS:
return !getAllNodeMappings().isEmpty();
case DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ALL_CONTAINER_MAPPINGS:
@@ -2166,8 +2142,6 @@ public class DiagramImportDescriptionImpl extends DocumentedElementImpl implemen
return DescriptionPackage.DIAGRAM_DESCRIPTION__FILTERS;
case DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ALL_EDGE_MAPPINGS:
return DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_EDGE_MAPPINGS;
- case DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ALL_ACTIVATED_EDGE_MAPPINGS:
- return DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_ACTIVATED_EDGE_MAPPINGS;
case DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ALL_NODE_MAPPINGS:
return DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_NODE_MAPPINGS;
case DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ALL_CONTAINER_MAPPINGS:
@@ -2272,8 +2246,6 @@ public class DiagramImportDescriptionImpl extends DocumentedElementImpl implemen
return DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__FILTERS;
case DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_EDGE_MAPPINGS:
return DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ALL_EDGE_MAPPINGS;
- case DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_ACTIVATED_EDGE_MAPPINGS:
- return DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ALL_ACTIVATED_EDGE_MAPPINGS;
case DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_NODE_MAPPINGS:
return DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ALL_NODE_MAPPINGS;
case DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_CONTAINER_MAPPINGS:
diff --git a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/LayerImpl.java b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/LayerImpl.java
index ae2a23c501..142fec9140 100644
--- a/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/LayerImpl.java
+++ b/plugins/org.eclipse.sirius/src-gen/org/eclipse/sirius/viewpoint/description/impl/LayerImpl.java
@@ -81,9 +81,6 @@ import org.eclipse.sirius.viewpoint.description.tool.ToolSection;
* {@link org.eclipse.sirius.viewpoint.description.impl.LayerImpl#getAllEdgeMappings
* <em>All Edge Mappings</em>}</li>
* <li>
- * {@link org.eclipse.sirius.viewpoint.description.impl.LayerImpl#getAllActivatedEdgeMappings
- * <em>All Activated Edge Mappings</em>}</li>
- * <li>
* {@link org.eclipse.sirius.viewpoint.description.impl.LayerImpl#getCustomization
* <em>Customization</em>}</li>
* </ul>
@@ -568,23 +565,6 @@ public class LayerImpl extends DocumentedElementImpl implements Layer {
*
* @generated
*/
- public EList<EdgeMapping> getAllActivatedEdgeMappings() {
- // TODO: implement this method to return the 'All Activated Edge
- // Mappings' reference list
- // Ensure that you remove @generated or mark it @generated NOT
- // The list is expected to implement
- // org.eclipse.emf.ecore.util.InternalEList and
- // org.eclipse.emf.ecore.EStructuralFeature.Setting
- // so it's likely that an appropriate subclass of
- // org.eclipse.emf.ecore.util.EcoreEList should be used.
- throw new UnsupportedOperationException();
- }
-
- /**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated
- */
public Customization getCustomization() {
if (customization != null && customization.eIsProxy()) {
InternalEObject oldCustomization = (InternalEObject) customization;
@@ -714,8 +694,6 @@ public class LayerImpl extends DocumentedElementImpl implements Layer {
return getIcon();
case DescriptionPackage.LAYER__ALL_EDGE_MAPPINGS:
return getAllEdgeMappings();
- case DescriptionPackage.LAYER__ALL_ACTIVATED_EDGE_MAPPINGS:
- return getAllActivatedEdgeMappings();
case DescriptionPackage.LAYER__CUSTOMIZATION:
if (resolve)
return getCustomization();
@@ -870,8 +848,6 @@ public class LayerImpl extends DocumentedElementImpl implements Layer {
return ICON_EDEFAULT == null ? icon != null : !ICON_EDEFAULT.equals(icon);
case DescriptionPackage.LAYER__ALL_EDGE_MAPPINGS:
return !getAllEdgeMappings().isEmpty();
- case DescriptionPackage.LAYER__ALL_ACTIVATED_EDGE_MAPPINGS:
- return !getAllActivatedEdgeMappings().isEmpty();
case DescriptionPackage.LAYER__CUSTOMIZATION:
return customization != null;
}
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/spec/AdditionalLayerSpec.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/spec/AdditionalLayerSpec.java
index f1fb3d364d..c155671e10 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/spec/AdditionalLayerSpec.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/spec/AdditionalLayerSpec.java
@@ -77,14 +77,4 @@ public class AdditionalLayerSpec extends AdditionalLayerImpl {
public EList<EdgeMapping> getAllEdgeMappings() {
return ContentHelper.getAllEdgeMappings(this);
}
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.sirius.viewpoint.description.impl.LayerImpl#getAllActivatedEdgeMappings()
- */
- @Override
- public EList<EdgeMapping> getAllActivatedEdgeMappings() {
- return ContentHelper.getAllActivatedEdgeMappings(this);
- }
}
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/spec/DiagramDescriptionSpec.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/spec/DiagramDescriptionSpec.java
index e0a32041fe..a6c81fd5f3 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/spec/DiagramDescriptionSpec.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/spec/DiagramDescriptionSpec.java
@@ -88,16 +88,6 @@ public class DiagramDescriptionSpec extends DiagramDescriptionImpl {
/**
* {@inheritDoc}
*
- * @see org.eclipse.sirius.viewpoint.description.impl.DiagramDescriptionImpl#getAllActivatedEdgeMappings()
- */
- @Override
- public EList<EdgeMapping> getAllActivatedEdgeMappings() {
- return ContentHelper.getAllActivatedEdgeMappings(this);
- }
-
- /**
- * {@inheritDoc}
- *
* @see org.eclipse.sirius.viewpoint.description.impl.DiagramDescriptionImpl#getAllContainerMappings()
*/
@Override
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/spec/LayerSpec.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/spec/LayerSpec.java
index 50f303d8ea..69f12deafb 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/spec/LayerSpec.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/description/spec/LayerSpec.java
@@ -77,14 +77,4 @@ public class LayerSpec extends LayerImpl {
public EList<EdgeMapping> getAllEdgeMappings() {
return ContentHelper.getAllEdgeMappings(this);
}
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.sirius.viewpoint.description.impl.LayerImpl#getAllActivatedEdgeMappings()
- */
- @Override
- public EList<EdgeMapping> getAllActivatedEdgeMappings() {
- return ContentHelper.getAllActivatedEdgeMappings(this);
- }
}
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/helper/ContentHelper.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/helper/ContentHelper.java
index 88ff788552..4e9bf12777 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/helper/ContentHelper.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/metamodel/helper/ContentHelper.java
@@ -100,29 +100,6 @@ public final class ContentHelper {
}
/**
- * Return all the activated edge mappings of this diagram, including :
- * <UL>
- * <LI></LI>
- * <LI></LI>
- * <LI></LI>
- * <LI></LI>
- * </UL>
- * .
- *
- * @param diagramDescription
- * The diagram description
- * @return all the activated edge mappings
- * @deprecated return nothing cause we can't find active mapping only with a
- * description
- */
- @Deprecated
- public static EList<EdgeMapping> getAllActivatedEdgeMappings(final DiagramDescription diagramDescription) {
- final Collection<EdgeMapping> result = new ArrayList<EdgeMapping>();
- return new EcoreEList.UnmodifiableEList<EdgeMapping>((InternalEObject) diagramDescription, DescriptionPackage.eINSTANCE.getDiagramDescription_AllActivatedEdgeMappings(), result.size(),
- result.toArray());
- }
-
- /**
* Get all edge mappings (including wrap EdgeMappingImport) used in a
* designer diagram description on one particular layer.
*
@@ -151,28 +128,6 @@ public final class ContentHelper {
}
/**
- * Return all the activated edge mappings of this layer, including :
- * <UL>
- * <LI></LI>
- * <LI></LI>
- * <LI></LI>
- * <LI></LI>
- * </UL>
- * .
- *
- * @param layer
- * The layer description
- * @return all the activated edge mappings
- * @deprecated return nothing cause we can't find active mapping only with a
- * description
- */
- @Deprecated
- public static EList<EdgeMapping> getAllActivatedEdgeMappings(final Layer layer) {
- final Collection<EdgeMapping> result = new ArrayList<EdgeMapping>();
- return new EcoreEList.UnmodifiableEList<EdgeMapping>((InternalEObject) layer, DescriptionPackage.eINSTANCE.getLayer_AllActivatedEdgeMappings(), result.size(), result.toArray());
- }
-
- /**
* DO NOT USE except in property sections or DiagramComponentizationManager.
*
* Get all edge mappings used in a designer diagram extension description on

Back to the top