Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaged Elaasar2017-05-05 12:42:01 -0400
committerRemi Schnekenburger2017-05-09 07:33:03 -0400
commit03de49ebeb3439f297786a1c9cec78f25c9bf17d (patch)
treee836c72f21c8c26c193cea4ca6e2fb8cd770cadc /plugins/infra/core
parentbbdfe743cf57c470c505c8f62e42a4ae4bd2db41 (diff)
downloadorg.eclipse.papyrus-03de49ebeb3439f297786a1c9cec78f25c9bf17d.tar.gz
org.eclipse.papyrus-03de49ebeb3439f297786a1c9cec78f25c9bf17d.tar.xz
org.eclipse.papyrus-03de49ebeb3439f297786a1c9cec78f25c9bf17d.zip
Bug 515567 - Support of default viewpoints for an architecture context,
and a fix for returning the default viewpoints for a model's context when the model's architecture viewpoint preferences are not set Change-Id: I9b3925b3c6efef7094ea4360aef4bbc7a97a54e2 Signed-off-by: Maged Elaasar <melaasar@gmail.com>
Diffstat (limited to 'plugins/infra/core')
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/plugin.properties1
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureContextItemProvider.java23
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureEditPlugin.java2
-rwxr-xr-xplugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore_diagram24
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel3
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureContext.java17
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitecturePackage.java62
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureContextImpl.java34
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitecturePackageImpl.java27
11 files changed, 176 insertions, 23 deletions
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF
index 2363c7fcc17..96da8b2ada6 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF
@@ -13,5 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+ org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport
Bundle-ActivationPolicy: lazy
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/plugin.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/plugin.properties
index 5d7cba4a261..8f6dd5c922f 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/plugin.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/plugin.properties
@@ -62,3 +62,4 @@ _UI_ArchitectureContext_conversionCommandClass_feature = Conversion Command Clas
_UI_ArchitectureDescription_contextId_feature = Context Id
_UI_ArchitectureDescriptionPreferences_viewpointIds_feature = Viewpoint Ids
_UI_Unknown_feature = Unspecified
+_UI_ArchitectureContext_defaultViewpoints_feature = Default Viewpoints
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureContextItemProvider.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureContextItemProvider.java
index 1e9f24753a2..378af28ead4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureContextItemProvider.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureContextItemProvider.java
@@ -58,6 +58,7 @@ public class ArchitectureContextItemProvider extends ADElementItemProvider {
if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
+ addDefaultViewpointsPropertyDescriptor(object);
addElementTypesPropertyDescriptor(object);
addIdPropertyDescriptor(object);
addIconPropertyDescriptor(object);
@@ -69,6 +70,28 @@ public class ArchitectureContextItemProvider extends ADElementItemProvider {
}
/**
+ * This adds a property descriptor for the Default Viewpoints feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addDefaultViewpointsPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_ArchitectureContext_defaultViewpoints_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ArchitectureContext_defaultViewpoints_feature", "_UI_ArchitectureContext_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ ArchitecturePackage.Literals.ARCHITECTURE_CONTEXT__DEFAULT_VIEWPOINTS,
+ true,
+ false,
+ true,
+ null,
+ null,
+ null));
+ }
+
+ /**
* This adds a property descriptor for the Element Types feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureEditPlugin.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureEditPlugin.java
index 0a04f5a2e05..cfb7b83ef67 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureEditPlugin.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/src-gen/org/eclipse/papyrus/infra/core/architecture/provider/ArchitectureEditPlugin.java
@@ -19,6 +19,7 @@ import java.net.URL;
import org.eclipse.emf.common.EMFPlugin;
import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
import org.eclipse.papyrus.infra.types.provider.TypesConfigurationsEditPlugin;
/**
@@ -54,6 +55,7 @@ public final class ArchitectureEditPlugin extends EMFPlugin {
super
(new ResourceLocator [] {
TypesConfigurationsEditPlugin.INSTANCE,
+ EcoreEditPlugin.INSTANCE,
});
}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore
index 937f5812966..a38c49a14a4 100755
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore
@@ -55,6 +55,8 @@
eSuperTypes="#//ADElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="viewpoints" upperBound="-1"
eType="#//ArchitectureViewpoint" containment="true" eOpposite="#//ArchitectureViewpoint/context"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="defaultViewpoints" upperBound="-1"
+ eType="#//ArchitectureViewpoint"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="elementTypes" upperBound="-1"
eType="ecore:EClass ../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.ecore#//ElementTypeSetConfiguration"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="domain" lowerBound="1"
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore_diagram b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore_diagram
index 0009a025822..1e395cf448b 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore_diagram
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore_diagram
@@ -100,7 +100,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_jpuwMreqEearJ4erliAKEg"/>
</children>
<element xmi:type="ecore:EClass" href="Architecture.ecore#//ArchitectureViewpoint"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jptiEbeqEearJ4erliAKEg" x="513" y="486"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jptiEbeqEearJ4erliAKEg" x="513" y="486" width="172"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_jpvXQLeqEearJ4erliAKEg" type="2001" fontName="Lucida Grande">
<children xmi:type="notation:DecorationNode" xmi:id="_jpvXQreqEearJ4erliAKEg" type="5001"/>
@@ -311,7 +311,7 @@
<edges xmi:type="notation:Connector" xmi:id="_jwkYALeqEearJ4erliAKEg" type="4004" source="_jptiELeqEearJ4erliAKEg" target="_jpWVsLeqEearJ4erliAKEg" routing="Rectilinear">
<styles xmi:type="notation:FontStyle" xmi:id="_jwkYAbeqEearJ4erliAKEg" fontName="Lucida Grande"/>
<element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwkYAreqEearJ4erliAKEg" points="[10, -59, 290, 423]$[10, -419, 290, 63]$[-236, -419, 44, 63]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwkYAreqEearJ4erliAKEg" points="[31, -59, 353, 423]$[31, -419, 353, 63]$[-278, -419, 44, 63]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy1o5LeqEearJ4erliAKEg" id="(0.7672413793103449,1.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy1o5beqEearJ4erliAKEg" id="(0.6666666666666666,0.0)"/>
</edges>
@@ -331,20 +331,20 @@
<edges xmi:type="notation:Connector" xmi:id="_jwrswLeqEearJ4erliAKEg" type="4004" source="_jpvXQLeqEearJ4erliAKEg" target="_jpWVsLeqEearJ4erliAKEg" routing="Rectilinear">
<styles xmi:type="notation:FontStyle" xmi:id="_jwrswbeqEearJ4erliAKEg" fontName="Lucida Grande"/>
<element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwrswreqEearJ4erliAKEg" points="[29, 0, 78, 482]$[29, 40, 78, 522]$[290, 40, 339, 522]$[290, -437, 339, 45]$[17, -437, 66, 45]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwrswreqEearJ4erliAKEg" points="[29, 0, 78, 482]$[29, 40, 78, 522]$[344, 40, 393, 522]$[344, -437, 393, 45]$[17, -437, 66, 45]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy2P8reqEearJ4erliAKEg" id="(0.49523809523809526,1.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jy2P87eqEearJ4erliAKEg" id="(0.5,0.0)"/>
</edges>
<edges xmi:type="notation:Connector" xmi:id="_jwuwELeqEearJ4erliAKEg" type="4003" source="_jpv-VreqEearJ4erliAKEg" target="_jptiELeqEearJ4erliAKEg" routing="Rectilinear">
<children xmi:type="notation:DecorationNode" xmi:id="_jwuwE7eqEearJ4erliAKEg" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_jwuwFLeqEearJ4erliAKEg" x="101" y="31"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_jwuwFLeqEearJ4erliAKEg" x="171" y="31"/>
</children>
<children xmi:type="notation:DecorationNode" xmi:id="_jwuwFbeqEearJ4erliAKEg" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_jwuwFreqEearJ4erliAKEg" x="27" y="19"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_jwuwFreqEearJ4erliAKEg" x="24" y="28"/>
</children>
<styles xmi:type="notation:FontStyle" xmi:id="_jwuwEbeqEearJ4erliAKEg" fontName="Lucida Grande"/>
<element xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureContext/viewpoints"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwuwEreqEearJ4erliAKEg" points="[100, -46, -26, -211]$[136, -46, 10, -211]$[136, 165, 10, 0]"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jwuwEreqEearJ4erliAKEg" points="[100, -69, -55, -261]$[208, -69, 53, -261]$[208, 192, 53, 0]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jyylkLeqEearJ4erliAKEg" id="(0.4953271028037383,1.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jyylkbeqEearJ4erliAKEg" id="(0.5344827586206896,0.0)"/>
</edges>
@@ -362,4 +362,16 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jyzzsbeqEearJ4erliAKEg" id="(0.7851239669421488,1.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jyzzsreqEearJ4erliAKEg" id="(0.4953271028037383,0.0)"/>
</edges>
+ <edges xmi:type="notation:Connector" xmi:id="_nPrvwDGnEeeThtX0CLDTfA" type="4002" source="_jpv-VreqEearJ4erliAKEg" target="_jptiELeqEearJ4erliAKEg" routing="Rectilinear">
+ <children xmi:type="notation:DecorationNode" xmi:id="_nPsW0DGnEeeThtX0CLDTfA" type="6001">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_nPsW0TGnEeeThtX0CLDTfA" x="124" y="46"/>
+ </children>
+ <children xmi:type="notation:DecorationNode" xmi:id="_nPsW0jGnEeeThtX0CLDTfA" type="6003">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_nPsW0zGnEeeThtX0CLDTfA" x="11" y="28"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_nPrvwTGnEeeThtX0CLDTfA" fontName=".SF NS Text"/>
+ <element xmi:type="ecore:EReference" href="Architecture.ecore#//ArchitectureContext/defaultViewpoints"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nPrvwjGnEeeThtX0CLDTfA" points="[22, 3, -41, -263]$[58, 3, -5, -263]$[58, 237, -5, -29]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nPxPUDGnEeeThtX0CLDTfA" id="(0.8888888888888888,0.6341463414634146)"/>
+ </edges>
</notation:Diagram>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel
index 60b6d2b8e5a..39222c3cd03 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel
@@ -6,7 +6,7 @@
modelPluginID="org.eclipse.papyrus.infra.core.architecture" modelName="Architecture"
nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
testsDirectory="/org.eclipse.papyrus.infra.core.architecture.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"
- complianceLevel="8.0" copyrightFields="false" usedGenPackages="../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types"
+ complianceLevel="8.0" copyrightFields="false" usedGenPackages="../../org.eclipse.papyrus.infra.types/model/ElementTypesConfigurations.genmodel#//types ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"
operationReflection="true" importOrganizing="true">
<foreignModel>Architecture.ecore</foreignModel>
<genPackages prefix="Architecture" basePackage="org.eclipse.papyrus.infra.core"
@@ -47,6 +47,7 @@
</genClasses>
<genClasses image="false" ecoreClass="Architecture.ecore#//ArchitectureContext">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureContext/viewpoints"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureContext/defaultViewpoints"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureContext/elementTypes"/>
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference Architecture.ecore#//ArchitectureContext/domain"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureContext/id"/>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureContext.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureContext.java
index 877547958ca..07e12882f88 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureContext.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureContext.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
* </p>
* <ul>
* <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getViewpoints <em>Viewpoints</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getDefaultViewpoints <em>Default Viewpoints</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getElementTypes <em>Element Types</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getDomain <em>Domain</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getId <em>Id</em>}</li>
@@ -59,6 +60,22 @@ public interface ArchitectureContext extends ADElement {
EList<ArchitectureViewpoint> getViewpoints();
/**
+ * Returns the value of the '<em><b>Default Viewpoints</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Default Viewpoints</em>' reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Default Viewpoints</em>' reference list.
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext_DefaultViewpoints()
+ * @model
+ * @generated
+ */
+ EList<ArchitectureViewpoint> getDefaultViewpoints();
+
+ /**
* Returns the value of the '<em><b>Element Types</b></em>' reference list.
* The list contents are of type {@link org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration}.
* <!-- begin-user-doc -->
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitecturePackage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitecturePackage.java
index fab9b3a260c..57c57d19be4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitecturePackage.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitecturePackage.java
@@ -251,13 +251,22 @@ public interface ArchitecturePackage extends EPackage {
int ARCHITECTURE_CONTEXT__VIEWPOINTS = AD_ELEMENT_FEATURE_COUNT + 0;
/**
+ * The feature id for the '<em><b>Default Viewpoints</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ARCHITECTURE_CONTEXT__DEFAULT_VIEWPOINTS = AD_ELEMENT_FEATURE_COUNT + 1;
+
+ /**
* The feature id for the '<em><b>Element Types</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int ARCHITECTURE_CONTEXT__ELEMENT_TYPES = AD_ELEMENT_FEATURE_COUNT + 1;
+ int ARCHITECTURE_CONTEXT__ELEMENT_TYPES = AD_ELEMENT_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Domain</b></em>' container reference.
@@ -266,7 +275,7 @@ public interface ArchitecturePackage extends EPackage {
* @generated
* @ordered
*/
- int ARCHITECTURE_CONTEXT__DOMAIN = AD_ELEMENT_FEATURE_COUNT + 2;
+ int ARCHITECTURE_CONTEXT__DOMAIN = AD_ELEMENT_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Id</b></em>' attribute.
@@ -275,7 +284,7 @@ public interface ArchitecturePackage extends EPackage {
* @generated
* @ordered
*/
- int ARCHITECTURE_CONTEXT__ID = AD_ELEMENT_FEATURE_COUNT + 3;
+ int ARCHITECTURE_CONTEXT__ID = AD_ELEMENT_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>Icon</b></em>' attribute.
@@ -284,7 +293,7 @@ public interface ArchitecturePackage extends EPackage {
* @generated
* @ordered
*/
- int ARCHITECTURE_CONTEXT__ICON = AD_ELEMENT_FEATURE_COUNT + 4;
+ int ARCHITECTURE_CONTEXT__ICON = AD_ELEMENT_FEATURE_COUNT + 5;
/**
* The feature id for the '<em><b>Extension Prefix</b></em>' attribute.
@@ -293,7 +302,7 @@ public interface ArchitecturePackage extends EPackage {
* @generated
* @ordered
*/
- int ARCHITECTURE_CONTEXT__EXTENSION_PREFIX = AD_ELEMENT_FEATURE_COUNT + 5;
+ int ARCHITECTURE_CONTEXT__EXTENSION_PREFIX = AD_ELEMENT_FEATURE_COUNT + 6;
/**
* The feature id for the '<em><b>Creation Command Class</b></em>' attribute.
@@ -302,7 +311,7 @@ public interface ArchitecturePackage extends EPackage {
* @generated
* @ordered
*/
- int ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS = AD_ELEMENT_FEATURE_COUNT + 6;
+ int ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS = AD_ELEMENT_FEATURE_COUNT + 7;
/**
* The feature id for the '<em><b>Conversion Command Class</b></em>' attribute.
@@ -311,7 +320,7 @@ public interface ArchitecturePackage extends EPackage {
* @generated
* @ordered
*/
- int ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS = AD_ELEMENT_FEATURE_COUNT + 7;
+ int ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS = AD_ELEMENT_FEATURE_COUNT + 8;
/**
* The number of structural features of the '<em>Context</em>' class.
@@ -320,7 +329,7 @@ public interface ArchitecturePackage extends EPackage {
* @generated
* @ordered
*/
- int ARCHITECTURE_CONTEXT_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 8;
+ int ARCHITECTURE_CONTEXT_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 9;
/**
* The number of operations of the '<em>Context</em>' class.
@@ -378,6 +387,15 @@ public interface ArchitecturePackage extends EPackage {
int ARCHITECTURE_DESCRIPTION_LANGUAGE__VIEWPOINTS = ARCHITECTURE_CONTEXT__VIEWPOINTS;
/**
+ * The feature id for the '<em><b>Default Viewpoints</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ARCHITECTURE_DESCRIPTION_LANGUAGE__DEFAULT_VIEWPOINTS = ARCHITECTURE_CONTEXT__DEFAULT_VIEWPOINTS;
+
+ /**
* The feature id for the '<em><b>Element Types</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -842,6 +860,15 @@ public interface ArchitecturePackage extends EPackage {
int ARCHITECTURE_FRAMEWORK__VIEWPOINTS = ARCHITECTURE_CONTEXT__VIEWPOINTS;
/**
+ * The feature id for the '<em><b>Default Viewpoints</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ARCHITECTURE_FRAMEWORK__DEFAULT_VIEWPOINTS = ARCHITECTURE_CONTEXT__DEFAULT_VIEWPOINTS;
+
+ /**
* The feature id for the '<em><b>Element Types</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1298,6 +1325,17 @@ public interface ArchitecturePackage extends EPackage {
EReference getArchitectureContext_Viewpoints();
/**
+ * Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getDefaultViewpoints <em>Default Viewpoints</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Default Viewpoints</em>'.
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getDefaultViewpoints()
+ * @see #getArchitectureContext()
+ * @generated
+ */
+ EReference getArchitectureContext_DefaultViewpoints();
+
+ /**
* Returns the meta object for the reference list '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getElementTypes <em>Element Types</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1690,6 +1728,14 @@ public interface ArchitecturePackage extends EPackage {
EReference ARCHITECTURE_CONTEXT__VIEWPOINTS = eINSTANCE.getArchitectureContext_Viewpoints();
/**
+ * The meta object literal for the '<em><b>Default Viewpoints</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference ARCHITECTURE_CONTEXT__DEFAULT_VIEWPOINTS = eINSTANCE.getArchitectureContext_DefaultViewpoints();
+
+ /**
* The meta object literal for the '<em><b>Element Types</b></em>' reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureContextImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureContextImpl.java
index dd657900c50..cbf5b3a4db4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureContextImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureContextImpl.java
@@ -43,6 +43,7 @@ import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
* </p>
* <ul>
* <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureContextImpl#getViewpoints <em>Viewpoints</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureContextImpl#getDefaultViewpoints <em>Default Viewpoints</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureContextImpl#getElementTypes <em>Element Types</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureContextImpl#getDomain <em>Domain</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureContextImpl#getId <em>Id</em>}</li>
@@ -66,6 +67,16 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
protected EList<ArchitectureViewpoint> viewpoints;
/**
+ * The cached value of the '{@link #getDefaultViewpoints() <em>Default Viewpoints</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDefaultViewpoints()
+ * @generated
+ * @ordered
+ */
+ protected EList<ArchitectureViewpoint> defaultViewpoints;
+
+ /**
* The cached value of the '{@link #getElementTypes() <em>Element Types</em>}' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -191,6 +202,18 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
* <!-- end-user-doc -->
* @generated
*/
+ public EList<ArchitectureViewpoint> getDefaultViewpoints() {
+ if (defaultViewpoints == null) {
+ defaultViewpoints = new EObjectResolvingEList<ArchitectureViewpoint>(ArchitectureViewpoint.class, this, ArchitecturePackage.ARCHITECTURE_CONTEXT__DEFAULT_VIEWPOINTS);
+ }
+ return defaultViewpoints;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EList<ElementTypeSetConfiguration> getElementTypes() {
if (elementTypes == null) {
elementTypes = new EObjectResolvingEList<ElementTypeSetConfiguration>(ElementTypeSetConfiguration.class, this, ArchitecturePackage.ARCHITECTURE_CONTEXT__ELEMENT_TYPES);
@@ -403,6 +426,8 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
switch (featureID) {
case ArchitecturePackage.ARCHITECTURE_CONTEXT__VIEWPOINTS:
return getViewpoints();
+ case ArchitecturePackage.ARCHITECTURE_CONTEXT__DEFAULT_VIEWPOINTS:
+ return getDefaultViewpoints();
case ArchitecturePackage.ARCHITECTURE_CONTEXT__ELEMENT_TYPES:
return getElementTypes();
case ArchitecturePackage.ARCHITECTURE_CONTEXT__DOMAIN:
@@ -434,6 +459,10 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
getViewpoints().clear();
getViewpoints().addAll((Collection<? extends ArchitectureViewpoint>)newValue);
return;
+ case ArchitecturePackage.ARCHITECTURE_CONTEXT__DEFAULT_VIEWPOINTS:
+ getDefaultViewpoints().clear();
+ getDefaultViewpoints().addAll((Collection<? extends ArchitectureViewpoint>)newValue);
+ return;
case ArchitecturePackage.ARCHITECTURE_CONTEXT__ELEMENT_TYPES:
getElementTypes().clear();
getElementTypes().addAll((Collection<? extends ElementTypeSetConfiguration>)newValue);
@@ -471,6 +500,9 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
case ArchitecturePackage.ARCHITECTURE_CONTEXT__VIEWPOINTS:
getViewpoints().clear();
return;
+ case ArchitecturePackage.ARCHITECTURE_CONTEXT__DEFAULT_VIEWPOINTS:
+ getDefaultViewpoints().clear();
+ return;
case ArchitecturePackage.ARCHITECTURE_CONTEXT__ELEMENT_TYPES:
getElementTypes().clear();
return;
@@ -506,6 +538,8 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
switch (featureID) {
case ArchitecturePackage.ARCHITECTURE_CONTEXT__VIEWPOINTS:
return viewpoints != null && !viewpoints.isEmpty();
+ case ArchitecturePackage.ARCHITECTURE_CONTEXT__DEFAULT_VIEWPOINTS:
+ return defaultViewpoints != null && !defaultViewpoints.isEmpty();
case ArchitecturePackage.ARCHITECTURE_CONTEXT__ELEMENT_TYPES:
return elementTypes != null && !elementTypes.isEmpty();
case ArchitecturePackage.ARCHITECTURE_CONTEXT__DOMAIN:
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitecturePackageImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitecturePackageImpl.java
index c8232cc099a..b9359bb040a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitecturePackageImpl.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitecturePackageImpl.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.ecore.EGenericType;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecore.impl.EPackageImpl;
import org.eclipse.papyrus.infra.core.architecture.ADElement;
import org.eclipse.papyrus.infra.core.architecture.ArchitectureContext;
@@ -167,6 +168,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
// Initialize simple dependencies
ElementTypesConfigurationsPackage.eINSTANCE.eClass();
+ EcorePackage.eINSTANCE.eClass();
// Create package meta-data objects
theArchitecturePackage.createPackageContents();
@@ -440,7 +442,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
* <!-- end-user-doc -->
* @generated
*/
- public EReference getArchitectureContext_ElementTypes() {
+ public EReference getArchitectureContext_DefaultViewpoints() {
return (EReference)architectureContextEClass.getEStructuralFeatures().get(1);
}
@@ -449,8 +451,17 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
* <!-- end-user-doc -->
* @generated
*/
+ public EReference getArchitectureContext_ElementTypes() {
+ return (EReference)architectureContextEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EAttribute getArchitectureContext_Id() {
- return (EAttribute)architectureContextEClass.getEStructuralFeatures().get(3);
+ return (EAttribute)architectureContextEClass.getEStructuralFeatures().get(4);
}
/**
@@ -459,7 +470,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
* @generated
*/
public EAttribute getArchitectureContext_Icon() {
- return (EAttribute)architectureContextEClass.getEStructuralFeatures().get(4);
+ return (EAttribute)architectureContextEClass.getEStructuralFeatures().get(5);
}
/**
@@ -468,7 +479,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
* @generated
*/
public EAttribute getArchitectureContext_ExtensionPrefix() {
- return (EAttribute)architectureContextEClass.getEStructuralFeatures().get(5);
+ return (EAttribute)architectureContextEClass.getEStructuralFeatures().get(6);
}
/**
@@ -477,7 +488,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
* @generated
*/
public EAttribute getArchitectureContext_CreationCommandClass() {
- return (EAttribute)architectureContextEClass.getEStructuralFeatures().get(6);
+ return (EAttribute)architectureContextEClass.getEStructuralFeatures().get(7);
}
/**
@@ -486,7 +497,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
* @generated
*/
public EAttribute getArchitectureContext_ConversionCommandClass() {
- return (EAttribute)architectureContextEClass.getEStructuralFeatures().get(7);
+ return (EAttribute)architectureContextEClass.getEStructuralFeatures().get(8);
}
/**
@@ -495,7 +506,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
* @generated
*/
public EReference getArchitectureContext_Domain() {
- return (EReference)architectureContextEClass.getEStructuralFeatures().get(2);
+ return (EReference)architectureContextEClass.getEStructuralFeatures().get(3);
}
/**
@@ -606,6 +617,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
architectureContextEClass = createEClass(ARCHITECTURE_CONTEXT);
createEReference(architectureContextEClass, ARCHITECTURE_CONTEXT__VIEWPOINTS);
+ createEReference(architectureContextEClass, ARCHITECTURE_CONTEXT__DEFAULT_VIEWPOINTS);
createEReference(architectureContextEClass, ARCHITECTURE_CONTEXT__ELEMENT_TYPES);
createEReference(architectureContextEClass, ARCHITECTURE_CONTEXT__DOMAIN);
createEAttribute(architectureContextEClass, ARCHITECTURE_CONTEXT__ID);
@@ -699,6 +711,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
initEClass(architectureContextEClass, ArchitectureContext.class, "ArchitectureContext", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEReference(getArchitectureContext_Viewpoints(), this.getArchitectureViewpoint(), this.getArchitectureViewpoint_Context(), "viewpoints", null, 0, -1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getArchitectureContext_DefaultViewpoints(), this.getArchitectureViewpoint(), null, "defaultViewpoints", null, 0, -1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEReference(getArchitectureContext_ElementTypes(), theElementTypesConfigurationsPackage.getElementTypeSetConfiguration(), null, "elementTypes", null, 0, -1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEReference(getArchitectureContext_Domain(), this.getArchitectureDomain(), this.getArchitectureDomain_Contexts(), "domain", null, 1, 1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEAttribute(getArchitectureContext_Id(), ecorePackage.getEString(), "id", null, 1, 1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

Back to the top