diff options
| author | Maxime Porhel | 2016-06-09 15:25:09 +0000 |
|---|---|---|
| committer | Maxime Porhel | 2016-06-16 06:41:18 +0000 |
| commit | 68cc588eaa6dabe84e7b3b15c753cf415220b474 (patch) | |
| tree | 88ca6a0f565c73f672f70aae5df4eca77aac12cd | |
| parent | aefc3d01274adfa3688afbe4cdb88d8a8800295a (diff) | |
| download | org.eclipse.sirius-68cc588eaa6dabe84e7b3b15c753cf415220b474.tar.gz org.eclipse.sirius-68cc588eaa6dabe84e7b3b15c753cf415220b474.tar.xz org.eclipse.sirius-68cc588eaa6dabe84e7b3b15c753cf415220b474.zip | |
[495811] Make DiagramDescription.allLayer not changeable
This feature is derived and the implementation returns an unmodifiable
list like the other allThings() methods on DiagramDescription.
This commit sets the changeable attribute to false.
Bug: 495811
Change-Id: Id17220d1b82da2c116f274fac6e68149ca1aca3c
Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
5 files changed, 4 insertions, 17 deletions
diff --git a/plugins/org.eclipse.sirius.diagram/model/diagram.ecore b/plugins/org.eclipse.sirius.diagram/model/diagram.ecore index a86efa7754..856e5849d8 100644 --- a/plugins/org.eclipse.sirius.diagram/model/diagram.ecore +++ b/plugins/org.eclipse.sirius.diagram/model/diagram.ecore @@ -1083,7 +1083,8 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="additionalLayers" upperBound="-1" eType="#//description/AdditionalLayer" containment="true" eKeys="../../org.eclipse.sirius/model/viewpoint.ecore#//description/IdentifiedElement/name"/> <eStructuralFeatures xsi:type="ecore:EReference" name="allLayers" upperBound="-1" - eType="#//description/Layer" volatile="true" transient="true" derived="true"/> + eType="#//description/Layer" changeable="false" volatile="true" transient="true" + derived="true"/> <eStructuralFeatures xsi:type="ecore:EReference" name="allActivatedTools" upperBound="-1" eType="ecore:EClass ../../org.eclipse.sirius/model/viewpoint.ecore#//description/tool/AbstractToolDescription" volatile="true" transient="true" derived="true"/> diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/DiagramDescription.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/DiagramDescription.java index b3349c7b63..320046a1e8 100644 --- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/DiagramDescription.java +++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/DiagramDescription.java @@ -519,7 +519,7 @@ public interface DiagramDescription extends DragAndDropTargetDescription, Repres * * @return the value of the '<em>All Layers</em>' reference list. * @see org.eclipse.sirius.diagram.description.DescriptionPackage#getDiagramDescription_AllLayers() - * @model transient="true" volatile="true" derived="true" + * @model transient="true" changeable="false" volatile="true" derived="true" * @generated */ EList<Layer> getAllLayers(); diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionPackageImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionPackageImpl.java index 600989f16f..68c912a015 100644 --- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionPackageImpl.java +++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DescriptionPackageImpl.java @@ -1812,7 +1812,7 @@ public class DescriptionPackageImpl extends EPackageImpl implements DescriptionP !EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); getDiagramDescription_AdditionalLayers().getEKeys().add(theDescriptionPackage_1.getIdentifiedElement_Name()); initEReference(getDiagramDescription_AllLayers(), this.getLayer(), null, "allLayers", null, 0, -1, DiagramDescription.class, EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, //$NON-NLS-1$ - EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, + !EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, EPackageImpl.IS_UNIQUE, EPackageImpl.IS_DERIVED, EPackageImpl.IS_ORDERED); initEReference(getDiagramDescription_AllActivatedTools(), theToolPackage_1.getAbstractToolDescription(), null, "allActivatedTools", null, 0, -1, DiagramDescription.class, //$NON-NLS-1$ EPackageImpl.IS_TRANSIENT, EPackageImpl.IS_VOLATILE, EPackageImpl.IS_CHANGEABLE, !EPackageImpl.IS_COMPOSITE, EPackageImpl.IS_RESOLVE_PROXIES, !EPackageImpl.IS_UNSETTABLE, diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramDescriptionImpl.java index 8fe63c3ab5..b4c8996809 100644 --- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramDescriptionImpl.java +++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramDescriptionImpl.java @@ -1903,10 +1903,6 @@ public class DiagramDescriptionImpl extends DragAndDropTargetDescriptionImpl imp getAdditionalLayers().clear(); getAdditionalLayers().addAll((Collection<? extends AdditionalLayer>) newValue); return; - case DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_LAYERS: - getAllLayers().clear(); - getAllLayers().addAll((Collection<? extends Layer>) newValue); - return; case DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_ACTIVATED_TOOLS: getAllActivatedTools().clear(); getAllActivatedTools().addAll((Collection<? extends AbstractToolDescription>) newValue); @@ -2016,9 +2012,6 @@ public class DiagramDescriptionImpl extends DragAndDropTargetDescriptionImpl imp case DescriptionPackage.DIAGRAM_DESCRIPTION__ADDITIONAL_LAYERS: getAdditionalLayers().clear(); return; - case DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_LAYERS: - getAllLayers().clear(); - return; case DescriptionPackage.DIAGRAM_DESCRIPTION__ALL_ACTIVATED_TOOLS: getAllActivatedTools().clear(); return; diff --git a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramImportDescriptionImpl.java b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramImportDescriptionImpl.java index 0cab2e6188..4385178c2c 100644 --- a/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramImportDescriptionImpl.java +++ b/plugins/org.eclipse.sirius.diagram/src-gen/org/eclipse/sirius/diagram/description/impl/DiagramImportDescriptionImpl.java @@ -1945,10 +1945,6 @@ public class DiagramImportDescriptionImpl extends DocumentedElementImpl implemen getAdditionalLayers().clear(); getAdditionalLayers().addAll((Collection<? extends AdditionalLayer>) newValue); return; - case DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ALL_LAYERS: - getAllLayers().clear(); - getAllLayers().addAll((Collection<? extends Layer>) newValue); - return; case DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ALL_ACTIVATED_TOOLS: getAllActivatedTools().clear(); getAllActivatedTools().addAll((Collection<? extends AbstractToolDescription>) newValue); @@ -2061,9 +2057,6 @@ public class DiagramImportDescriptionImpl extends DocumentedElementImpl implemen case DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ADDITIONAL_LAYERS: getAdditionalLayers().clear(); return; - case DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ALL_LAYERS: - getAllLayers().clear(); - return; case DescriptionPackage.DIAGRAM_IMPORT_DESCRIPTION__ALL_ACTIVATED_TOOLS: getAllActivatedTools().clear(); return; |
