Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2015-05-26 12:23:27 +0000
committerCamille Letavernier2015-05-26 12:24:30 +0000
commit4fa64b5ebe6397e5bc2c428994b475162e52fc68 (patch)
tree4f0bc44067744570a5c061bfc5868c83f8b95532 /plugins/infra/viewpoints
parentc912527dcd35093a244c2cfafea1b7acb9287d1f (diff)
downloadorg.eclipse.papyrus-4fa64b5ebe6397e5bc2c428994b475162e52fc68.tar.gz
org.eclipse.papyrus-4fa64b5ebe6397e5bc2c428994b475162e52fc68.tar.xz
org.eclipse.papyrus-4fa64b5ebe6397e5bc2c428994b475162e52fc68.zip
460336: [ViewPoint] Validation error on a standard one class diagram
https://bugs.eclipse.org/bugs/show_bug.cgi?id=460336 - Fix the metamodel (Make configuration optional) & regenerate code Change-Id: I8656a83d4ce2fdbf27d1804162ca1270d479299f Signed-off-by: Camille Letavernier <camille.letavernier@cea.fr> Reviewed-on: https://git.eclipse.org/r/42201
Diffstat (limited to 'plugins/infra/viewpoints')
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF6
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.ecore5
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.genmodel2
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/PapyrusViewStyle.java4
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/PapyrusViewStyleImpl.java2
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/StylePackageImpl.java15
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleAdapterFactory.java29
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleSwitch.java3
8 files changed, 35 insertions, 31 deletions
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF
index beadc3ddac2..549dcbfc378 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF
@@ -28,9 +28,7 @@ Bundle-Version: 1.1.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.policy.Activato
- r
-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.policy;singl
- eton:=true
+Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.policy.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.policy;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.ecore b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.ecore
index 8c1d4d3616d..e5b84a950e0 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.ecore
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.ecore
@@ -3,8 +3,7 @@
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="style" nsURI="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style"
nsPrefix="style">
<eClassifiers xsi:type="ecore:EClass" name="PapyrusViewStyle" eSuperTypes="../../org.eclipse.gmf.runtime.notation/model/notation.ecore#//Style">
- <eStructuralFeatures xsi:type="ecore:EReference" name="owner" lowerBound="1" eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="configuration" lowerBound="1"
- eType="ecore:EClass ../../org.eclipse.papyrus.infra.viewpoints.configuration/model/configuration.ecore#//PapyrusView"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="owner" lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="configuration" eType="ecore:EClass ../../org.eclipse.papyrus.infra.viewpoints.configuration/model/configuration.ecore#//PapyrusView"/>
</eClassifiers>
</ecore:EPackage>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.genmodel b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.genmodel
index 0a33165e081..0ee548a293e 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.genmodel
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/model/style.genmodel
@@ -4,7 +4,7 @@
modelDirectory="/org.eclipse.papyrus.infra.viewpoints.policy/src-gen" modelPluginID="org.eclipse.papyrus.infra.viewpoints.policy"
modelName="Style" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false"
- language="" usedGenPackages="../../org.eclipse.papyrus.infra.viewpoints.configuration/model/configuration.genmodel#//configuration platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.viewpoints.iso42010/model/iso42010.genmodel#//iso42010 ../../org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation"
+ language="" usedGenPackages="../../org.eclipse.papyrus.infra.viewpoints.configuration/model/configuration.genmodel#//configuration platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.viewpoints.iso42010/model/iso42010.genmodel#//iso42010 ../../org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation ../../org.eclipse.papyrus.infra.constraints/Model/Constraints.genmodel#//constraints"
operationReflection="true" importOrganizing="true">
<foreignModel>style.ecore</foreignModel>
<genPackages prefix="Style" basePackage="org.eclipse.papyrus.infra.viewpoints" resource="XMI"
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/PapyrusViewStyle.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/PapyrusViewStyle.java
index 18e66e3544d..6691161a5ae 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/PapyrusViewStyle.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/PapyrusViewStyle.java
@@ -24,11 +24,11 @@ import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle#getOwner <em>Owner</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.viewpoints.style.PapyrusViewStyle#getConfiguration <em>Configuration</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.papyrus.infra.viewpoints.style.StylePackage#getPapyrusViewStyle()
* @model
@@ -74,7 +74,7 @@ public interface PapyrusViewStyle extends Style {
* @return the value of the '<em>Configuration</em>' reference.
* @see #setConfiguration(PapyrusView)
* @see org.eclipse.papyrus.infra.viewpoints.style.StylePackage#getPapyrusViewStyle_Configuration()
- * @model required="true"
+ * @model
* @generated
*/
PapyrusView getConfiguration();
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/PapyrusViewStyleImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/PapyrusViewStyleImpl.java
index 99ded0b51f3..626aaccdb61 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/PapyrusViewStyleImpl.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/PapyrusViewStyleImpl.java
@@ -29,11 +29,11 @@ import org.eclipse.papyrus.infra.viewpoints.style.StylePackage;
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.infra.viewpoints.style.impl.PapyrusViewStyleImpl#getOwner <em>Owner</em>}</li>
* <li>{@link org.eclipse.papyrus.infra.viewpoints.style.impl.PapyrusViewStyleImpl#getConfiguration <em>Configuration</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/StylePackageImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/StylePackageImpl.java
index e887babc919..f1239025ea5 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/StylePackageImpl.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/impl/StylePackageImpl.java
@@ -41,10 +41,15 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
private EClass papyrusViewStyleEClass = null;
/**
- * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+ * Creates an instance of the model <b>Package</b>, registered with
+ * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
* package URI value.
* <p>
- * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * Note: the correct way to create the package is via the static
+ * factory method {@link #init init()}, which also performs
+ * initialization of the package, or returns the registered package,
+ * if one already exists.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see org.eclipse.emf.ecore.EPackage.Registry
* @see org.eclipse.papyrus.infra.viewpoints.style.StylePackage#eNS_URI
@@ -67,7 +72,9 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link StylePackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+ * This method is used to initialize {@link StylePackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @see #eNS_URI
* @see #createPackageContents()
@@ -214,7 +221,7 @@ public class StylePackageImpl extends EPackageImpl implements StylePackage {
initEClass(papyrusViewStyleEClass, PapyrusViewStyle.class, "PapyrusViewStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getPapyrusViewStyle_Owner(), theEcorePackage.getEObject(), null, "owner", null, 1, 1, PapyrusViewStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
- initEReference(getPapyrusViewStyle_Configuration(), theConfigurationPackage.getPapyrusView(), null, "configuration", null, 1, 1, PapyrusViewStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+ initEReference(getPapyrusViewStyle_Configuration(), theConfigurationPackage.getPapyrusView(), null, "configuration", null, 0, 1, PapyrusViewStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Create resource
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleAdapterFactory.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleAdapterFactory.java
index 41de55be99e..7232969113e 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleAdapterFactory.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleAdapterFactory.java
@@ -80,23 +80,22 @@ public class StyleAdapterFactory extends AdapterFactoryImpl {
*
* @generated
*/
- protected StyleSwitch<Adapter> modelSwitch =
- new StyleSwitch<Adapter>() {
- @Override
- public Adapter casePapyrusViewStyle(PapyrusViewStyle object) {
- return createPapyrusViewStyleAdapter();
- }
+ protected StyleSwitch<Adapter> modelSwitch = new StyleSwitch<Adapter>() {
+ @Override
+ public Adapter casePapyrusViewStyle(PapyrusViewStyle object) {
+ return createPapyrusViewStyleAdapter();
+ }
- @Override
- public Adapter caseStyle(Style object) {
- return createStyleAdapter();
- }
+ @Override
+ public Adapter caseStyle(Style object) {
+ return createStyleAdapter();
+ }
- @Override
- public Adapter defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
+ @Override
+ public Adapter defaultCase(EObject object) {
+ return createEObjectAdapter();
+ }
+ };
/**
* Creates an adapter for the <code>target</code>.
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleSwitch.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleSwitch.java
index 1360b53bf54..a4f548f64aa 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleSwitch.java
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src-gen/org/eclipse/papyrus/infra/viewpoints/style/util/StyleSwitch.java
@@ -61,7 +61,8 @@ public class StyleSwitch<T> extends Switch<T> {
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
- * @parameter ePackage the package in question.
+ * @param ePackage
+ * the package in question.
* @return whether this is a switch for the given package.
* @generated
*/

Back to the top