Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2021-02-02 19:33:18 +0000
committerChristian W. Damus2021-02-02 19:33:18 +0000
commit92e142158c995a8f463441aa3740df055ebb3e4b (patch)
tree68f9dbc5b33f10f621e8d3632d77e69c1124cd53
parent9c891c50bf9b41a80c1e4de32e86e3a24f2b5342 (diff)
downloadorg.eclipse.papyrus-bugs/570856-af-constraints.tar.gz
org.eclipse.papyrus-bugs/570856-af-constraints.tar.xz
org.eclipse.papyrus-bugs/570856-af-constraints.zip
Bug 570856: [Toolsmiths][AF] Improve messages for command-class constraintsbugs/570856-af-constraints
- rename 'ceationCommandExists' constraint operations as 'creationCommandExists' - maintain API compatibility with strong deprecations Change-Id: If6027a9cb10498d38fa39dbe546343dacd8ccb46 Signed-off-by: Christian W. Damus <give.a.damus@gmail.com>
-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.genmodel8
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureContext.java12
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitecturePackage.java59
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureContextImpl.java9
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitecturePackageImpl.java8
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureValidator.java33
-rwxr-xr-xplugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.genmodel6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PapyrusDiagram.java12
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java39
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java9
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java8
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationValidator.java24
14 files changed, 166 insertions, 65 deletions
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 b8f9a5ebba3..e2ece965b4d 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
@@ -200,7 +200,7 @@
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="The superclass of architectural description languages or architecture frameworks. It defines a collection of viewpoints on models."/>
</eAnnotations>
- <eOperations name="ceationCommandClassExists" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+ <eOperations name="creationCommandClassExists" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
<eParameters name="diagnostics" unique="false" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDiagnosticChain"/>
<eParameters name="context" unique="false">
<eGenericType eClassifier="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EMap">
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 1ecbf150e50..c91703510e0 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
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" Copyright (c) 2017 CEA LIST and others.&#xA;&#xA; All rights reserved. This program and the accompanying materials&#xA; are made available under the terms of the Eclipse Public License 2.0&#xA; which accompanies this distribution, and is available at&#xA; https://www.eclipse.org/legal/epl-2.0/&#xA;&#xA; SPDX-License-Identifier: EPL-2.0&#xA;&#xA; Contributors:&#xA; Maged Elaasar - Initial API and implementation"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2021 CEA LIST and others.&#xA;&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License 2.0&#xA;which accompanies this distribution, and is available at&#xA;https://www.eclipse.org/legal/epl-2.0/&#xA;&#xA;SPDX-License-Identifier: EPL-2.0&#xA;&#xA;Contributors:&#xA;Maged Elaasar - Initial API and implementation"
modelDirectory="/org.eclipse.papyrus.infra.core.architecture/src-gen" editDirectory="/org.eclipse.papyrus.infra.core.architecture.edit/src-gen"
editorDirectory="/org.eclipse.papyrus.infra.core.architecture.editor/src-gen"
modelPluginID="org.eclipse.papyrus.infra.core.architecture" modelName="Architecture"
@@ -89,9 +89,9 @@
ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureContext/creationCommandClass"/>
<genFeatures createChild="false" propertyCategory="Context" propertyDescription="The fully qualified name of a command that refactors models that switched to this context. The command must implement the org.eclipse.papyrus.infra.architecture.commands.IModelConversionCommand inteface"
ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureContext/conversionCommandClass"/>
- <genOperations ecoreOperation="Architecture.ecore#//ArchitectureContext/ceationCommandClassExists">
- <genParameters ecoreParameter="Architecture.ecore#//ArchitectureContext/ceationCommandClassExists/diagnostics"/>
- <genParameters ecoreParameter="Architecture.ecore#//ArchitectureContext/ceationCommandClassExists/context"/>
+ <genOperations ecoreOperation="Architecture.ecore#//ArchitectureContext/creationCommandClassExists">
+ <genParameters ecoreParameter="Architecture.ecore#//ArchitectureContext/creationCommandClassExists/diagnostics"/>
+ <genParameters ecoreParameter="Architecture.ecore#//ArchitectureContext/creationCommandClassExists/context"/>
</genOperations>
<genOperations ecoreOperation="Architecture.ecore#//ArchitectureContext/conversionCommandClassExists">
<genParameters ecoreParameter="Architecture.ecore#//ArchitectureContext/conversionCommandClassExists/diagnostics"/>
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 0ca5eb64e29..eb658097769 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
@@ -10,7 +10,7 @@
*
* Contributors:
* Maged Elaasar - Initial API and implementation
- * Christian W. Damus - bug 539694
+ * Christian W. Damus - bugs 539694, 570856
*
*
*/
@@ -201,7 +201,15 @@ public interface ArchitectureContext extends ADElement {
* @model diagnosticsUnique="false" contextUnique="false"
* @generated
*/
- boolean ceationCommandClassExists(DiagnosticChain diagnostics, Map<Object, Object> context);
+ boolean creationCommandClassExists(DiagnosticChain diagnostics, Map<Object, Object> context);
+
+ /**
+ * @deprecated since the 3.1 release, use the {@link #creationCommandClassExists(DiagnosticChain, Map)} API, instead.
+ */
+ @Deprecated(since = "3.1", forRemoval = true)
+ default boolean ceationCommandClassExists(DiagnosticChain diagnostics, Map<Object, Object> context) {
+ return creationCommandClassExists(diagnostics, context);
+ }
/**
* <!-- 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 a8a8b6b5d66..ffe3463410b 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
@@ -1,5 +1,5 @@
/**
-* Copyright (c) 2017 CEA LIST.
+* Copyright (c) 2017, 2021 CEA LIST, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -10,6 +10,7 @@
*
* Contributors:
* Maged Elaasar - Initial API and implementation
+ * Christian W. Damus - bug 570856
*
*
*/
@@ -374,13 +375,19 @@ public interface ArchitecturePackage extends EPackage {
int ARCHITECTURE_CONTEXT_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 7;
/**
- * The operation id for the '<em>Ceation Command Class Exists</em>' operation.
+ * The operation id for the '<em>Creation Command Class Exists</em>' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int ARCHITECTURE_CONTEXT___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = AD_ELEMENT_OPERATION_COUNT + 0;
+ int ARCHITECTURE_CONTEXT___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = AD_ELEMENT_OPERATION_COUNT + 0;
+
+ /**
+ * @deprecated since the 3.1 release, use {@link #ARCHITECTURE_CONTEXT___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP}, instead.
+ */
+ @Deprecated(since = "3.1", forRemoval = true)
+ int ARCHITECTURE_CONTEXT___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = ARCHITECTURE_CONTEXT___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP;
/**
* The operation id for the '<em>Conversion Command Class Exists</em>' operation.
@@ -564,15 +571,21 @@ public interface ArchitecturePackage extends EPackage {
int ARCHITECTURE_DESCRIPTION_LANGUAGE_FEATURE_COUNT = ARCHITECTURE_CONTEXT_FEATURE_COUNT + 4;
/**
- * The operation id for the '<em>Ceation Command Class Exists</em>' operation.
+ * The operation id for the '<em>Creation Command Class Exists</em>' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int ARCHITECTURE_DESCRIPTION_LANGUAGE___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = ARCHITECTURE_CONTEXT___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP;
+ int ARCHITECTURE_DESCRIPTION_LANGUAGE___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = ARCHITECTURE_CONTEXT___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP;
/**
+ * @deprecated since the 3.1 release, use {@link #ARCHITECTURE_DESCRIPTION_LANGUAGE___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP}, instead.
+ */
+ @Deprecated(since = "3.1", forRemoval = true)
+ int ARCHITECTURE_DESCRIPTION_LANGUAGE___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = ARCHITECTURE_DESCRIPTION_LANGUAGE___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP;
+
+ /**
* The operation id for the '<em>Conversion Command Class Exists</em>' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1091,13 +1104,19 @@ public interface ArchitecturePackage extends EPackage {
int ARCHITECTURE_FRAMEWORK_FEATURE_COUNT = ARCHITECTURE_CONTEXT_FEATURE_COUNT + 0;
/**
- * The operation id for the '<em>Ceation Command Class Exists</em>' operation.
+ * The operation id for the '<em>Creation Command Class Exists</em>' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int ARCHITECTURE_FRAMEWORK___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = ARCHITECTURE_CONTEXT___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP;
+ int ARCHITECTURE_FRAMEWORK___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = ARCHITECTURE_CONTEXT___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP;
+
+ /**
+ * @deprecated since the 3.1 release, use {@link #ARCHITECTURE_FRAMEWORK___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP}, instead.
+ */
+ @Deprecated
+ int ARCHITECTURE_FRAMEWORK___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = ARCHITECTURE_FRAMEWORK___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP;
/**
* The operation id for the '<em>Conversion Command Class Exists</em>' operation.
@@ -1607,16 +1626,24 @@ public interface ArchitecturePackage extends EPackage {
EAttribute getArchitectureContext_ConversionCommandClass();
/**
- * Returns the meta object for the '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#ceationCommandClassExists(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Ceation Command Class Exists</em>}' operation.
+ * Returns the meta object for the '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#creationCommandClassExists(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Creation Command Class Exists</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the '<em>Ceation Command Class Exists</em>' operation.
- * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#ceationCommandClassExists(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * @return the meta object for the '<em>Creation Command Class Exists</em>' operation.
+ * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#creationCommandClassExists(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* @generated
*/
- EOperation getArchitectureContext__CeationCommandClassExists__DiagnosticChain_Map();
+ EOperation getArchitectureContext__CreationCommandClassExists__DiagnosticChain_Map();
/**
+ * @deprecated since the 3.1 release, use {@link #getArchitectureContext__CreationCommandClassExists__DiagnosticChain_Map()}, instead.
+ */
+ @Deprecated(since = "3.1", forRemoval = true)
+ default EOperation getArchitectureContext__CeationCommandClassExists__DiagnosticChain_Map() {
+ return getArchitectureContext__CreationCommandClassExists__DiagnosticChain_Map();
+ }
+
+ /**
* Returns the meta object for the '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#conversionCommandClassExists(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Conversion Command Class Exists</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -2030,12 +2057,18 @@ public interface ArchitecturePackage extends EPackage {
EAttribute ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS = eINSTANCE.getArchitectureContext_ConversionCommandClass();
/**
- * The meta object literal for the '<em><b>Ceation Command Class Exists</b></em>' operation.
+ * The meta object literal for the '<em><b>Creation Command Class Exists</b></em>' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EOperation ARCHITECTURE_CONTEXT___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getArchitectureContext__CeationCommandClassExists__DiagnosticChain_Map();
+ EOperation ARCHITECTURE_CONTEXT___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getArchitectureContext__CreationCommandClassExists__DiagnosticChain_Map();
+
+ /**
+ * @deprecated since the 3.1 release, use {@link #ARCHITECTURE_CONTEXT___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP}, instead.
+ */
+ @Deprecated(since = "3.1", forRemoval = true)
+ EOperation ARCHITECTURE_CONTEXT___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = ARCHITECTURE_CONTEXT___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP;
/**
* The meta object literal for the '<em><b>Conversion Command Class Exists</b></em>' operation.
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 bd2f7121ecd..5648bbf393d 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
@@ -283,7 +283,8 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
* <!-- end-user-doc -->
* @generated NOT
*/
- public boolean ceationCommandClassExists(DiagnosticChain diagnostics, Map<Object, Object> context) {
+ @Override
+ public boolean creationCommandClassExists(DiagnosticChain diagnostics, Map<Object, Object> context) {
if (creationCommandClass != null) {
boolean exists = false;
@@ -302,7 +303,7 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
(new BasicDiagnostic
(Diagnostic.ERROR,
ArchitectureValidator.DIAGNOSTIC_SOURCE,
- ArchitectureValidator.ARCHITECTURE_CONTEXT__CEATION_COMMAND_CLASS_EXISTS,
+ ArchitectureValidator.ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS_EXISTS,
ArchitecturePlugin.INSTANCE.getString(problem, new Object[] { EObjectValidator.getObjectLabel(this, context), expectedInterface }),
new Object [] { this, ArchitecturePackage.Literals.ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS }));
}
@@ -569,8 +570,8 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A
@SuppressWarnings("unchecked")
public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
switch (operationID) {
- case ArchitecturePackage.ARCHITECTURE_CONTEXT___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP:
- return ceationCommandClassExists((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+ case ArchitecturePackage.ARCHITECTURE_CONTEXT___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP:
+ return creationCommandClassExists((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
case ArchitecturePackage.ARCHITECTURE_CONTEXT___CONVERSION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP:
return conversionCommandClassExists((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
}
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 e42484855f9..bbf05ac35f9 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
@@ -10,7 +10,7 @@
*
* Contributors:
* Maged Elaasar - Initial API and implementation
- * Christian W. Damus - bug 539694
+ * Christian W. Damus - bugs 539694, 570856
*
*
*/
@@ -565,7 +565,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
* @generated
*/
@Override
- public EOperation getArchitectureContext__CeationCommandClassExists__DiagnosticChain_Map() {
+ public EOperation getArchitectureContext__CreationCommandClassExists__DiagnosticChain_Map() {
return architectureContextEClass.getEOperations().get(0);
}
@@ -731,7 +731,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
createEAttribute(architectureContextEClass, ARCHITECTURE_CONTEXT__EXTENSION_PREFIX);
createEAttribute(architectureContextEClass, ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS);
createEAttribute(architectureContextEClass, ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS);
- createEOperation(architectureContextEClass, ARCHITECTURE_CONTEXT___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP);
+ createEOperation(architectureContextEClass, ARCHITECTURE_CONTEXT___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP);
createEOperation(architectureContextEClass, ARCHITECTURE_CONTEXT___CONVERSION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP);
architectureFrameworkEClass = createEClass(ARCHITECTURE_FRAMEWORK);
@@ -832,7 +832,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur
initEAttribute(getArchitectureContext_CreationCommandClass(), ecorePackage.getEString(), "creationCommandClass", null, 1, 1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEAttribute(getArchitectureContext_ConversionCommandClass(), ecorePackage.getEString(), "conversionCommandClass", null, 0, 1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- EOperation op = initEOperation(getArchitectureContext__CeationCommandClassExists__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "ceationCommandClassExists", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+ EOperation op = initEOperation(getArchitectureContext__CreationCommandClassExists__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "creationCommandClassExists", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
addEParameter(op, theEcorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, !IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
EGenericType g1 = createEGenericType(theEcorePackage.getEMap());
EGenericType g2 = createEGenericType(theEcorePackage.getEJavaObject());
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureValidator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureValidator.java
index d780dd7b778..5db9da82d97 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureValidator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureValidator.java
@@ -10,7 +10,7 @@
*
* Contributors:
* Maged Elaasar - Initial API and implementation
- * Christian W. Damus - bug 539694
+ * Christian W. Damus - bugs 539694, 570856
*
*
*/
@@ -55,12 +55,19 @@ public class ArchitectureValidator extends EObjectValidator {
public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.infra.core.architecture"; //$NON-NLS-1$
/**
- * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Ceation Command Class Exists' of 'Context'.
+ * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Creation Command Class Exists' of 'Context'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- public static final int ARCHITECTURE_CONTEXT__CEATION_COMMAND_CLASS_EXISTS = 1;
+ public static final int ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS_EXISTS = 1;
+
+
+ /**
+ * @deprecated since the 3.1 release, use {@link #ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS_EXISTS}, instead.
+ */
+ @Deprecated(since = "3.1", forRemoval = true)
+ public static final int ARCHITECTURE_CONTEXT__CEATION_COMMAND_CLASS_EXISTS = ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS_EXISTS;
/**
* The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Conversion Command Class Exists' of 'Context'.
@@ -178,7 +185,7 @@ public class ArchitectureValidator extends EObjectValidator {
if (result || diagnostics != null) result &= validate_UniqueID(architectureDescriptionLanguage, diagnostics, context);
if (result || diagnostics != null) result &= validate_EveryKeyUnique(architectureDescriptionLanguage, diagnostics, context);
if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(architectureDescriptionLanguage, diagnostics, context);
- if (result || diagnostics != null) result &= validateArchitectureContext_ceationCommandClassExists(architectureDescriptionLanguage, diagnostics, context);
+ if (result || diagnostics != null) result &= validateArchitectureContext_creationCommandClassExists(architectureDescriptionLanguage, diagnostics, context);
if (result || diagnostics != null) result &= validateArchitectureContext_conversionCommandClassExists(architectureDescriptionLanguage, diagnostics, context);
return result;
}
@@ -234,22 +241,30 @@ public class ArchitectureValidator extends EObjectValidator {
if (result || diagnostics != null) result &= validate_UniqueID(architectureContext, diagnostics, context);
if (result || diagnostics != null) result &= validate_EveryKeyUnique(architectureContext, diagnostics, context);
if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(architectureContext, diagnostics, context);
- if (result || diagnostics != null) result &= validateArchitectureContext_ceationCommandClassExists(architectureContext, diagnostics, context);
+ if (result || diagnostics != null) result &= validateArchitectureContext_creationCommandClassExists(architectureContext, diagnostics, context);
if (result || diagnostics != null) result &= validateArchitectureContext_conversionCommandClassExists(architectureContext, diagnostics, context);
return result;
}
/**
- * Validates the ceationCommandClassExists constraint of '<em>Context</em>'.
+ * Validates the creationCommandClassExists constraint of '<em>Context</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- public boolean validateArchitectureContext_ceationCommandClassExists(ArchitectureContext architectureContext, DiagnosticChain diagnostics, Map<Object, Object> context) {
- return architectureContext.ceationCommandClassExists(diagnostics, context);
+ public boolean validateArchitectureContext_creationCommandClassExists(ArchitectureContext architectureContext, DiagnosticChain diagnostics, Map<Object, Object> context) {
+ return architectureContext.creationCommandClassExists(diagnostics, context);
}
/**
+ * @deprecated since the 3.1 release, use the {@link #validateArchitectureContext_creationCommandClassExists(ArchitectureContext, DiagnosticChain, Map)} API, instead.
+ */
+ @Deprecated(since = "3.1", forRemoval = true)
+ public boolean validateArchitectureContext_ceationCommandClassExists(ArchitectureContext architectureContext, DiagnosticChain diagnostics, Map<Object, Object> context) {
+ return architectureContext.creationCommandClassExists(diagnostics, context);
+ }
+
+ /**
* Validates the conversionCommandClassExists constraint of '<em>Context</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -274,7 +289,7 @@ public class ArchitectureValidator extends EObjectValidator {
if (result || diagnostics != null) result &= validate_UniqueID(architectureFramework, diagnostics, context);
if (result || diagnostics != null) result &= validate_EveryKeyUnique(architectureFramework, diagnostics, context);
if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(architectureFramework, diagnostics, context);
- if (result || diagnostics != null) result &= validateArchitectureContext_ceationCommandClassExists(architectureFramework, diagnostics, context);
+ if (result || diagnostics != null) result &= validateArchitectureContext_creationCommandClassExists(architectureFramework, diagnostics, context);
if (result || diagnostics != null) result &= validateArchitectureContext_conversionCommandClassExists(architectureFramework, diagnostics, context);
return result;
}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore
index 45e6868b017..79ceeed2c7d 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore
@@ -6,7 +6,7 @@
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="A representation kind that depicts elements form a UML model as a diagram"/>
</eAnnotations>
- <eOperations name="ceationCommandClassExists" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+ <eOperations name="creationCommandClassExists" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
<eParameters name="diagnostics" unique="false" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDiagnosticChain"/>
<eParameters name="context" unique="false">
<eGenericType eClassifier="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EMap">
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.genmodel b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.genmodel
index c6cd987f595..67a13743e7c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.genmodel
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.genmodel
@@ -31,9 +31,9 @@
ecoreFeature="ecore:EAttribute GmfDiagRepresentation.ecore#//PapyrusDiagram/creationCommandClass"/>
<genFeatures notify="false" createChild="false" propertyCategory="Diagram" propertyDescription="A set of palette configurations used by the diagram (typically found in .paletteconfiguration files)"
propertySortChoices="true" ecoreFeature="ecore:EReference GmfDiagRepresentation.ecore#//PapyrusDiagram/palettes"/>
- <genOperations ecoreOperation="GmfDiagRepresentation.ecore#//PapyrusDiagram/ceationCommandClassExists">
- <genParameters ecoreParameter="GmfDiagRepresentation.ecore#//PapyrusDiagram/ceationCommandClassExists/diagnostics"/>
- <genParameters ecoreParameter="GmfDiagRepresentation.ecore#//PapyrusDiagram/ceationCommandClassExists/context"/>
+ <genOperations ecoreOperation="GmfDiagRepresentation.ecore#//PapyrusDiagram/creationCommandClassExists">
+ <genParameters ecoreParameter="GmfDiagRepresentation.ecore#//PapyrusDiagram/creationCommandClassExists/diagnostics"/>
+ <genParameters ecoreParameter="GmfDiagRepresentation.ecore#//PapyrusDiagram/creationCommandClassExists/context"/>
</genOperations>
</genClasses>
<genClasses ecoreClass="GmfDiagRepresentation.ecore#//ChildRule">
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PapyrusDiagram.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PapyrusDiagram.java
index 6707b8807ee..870f632b8e6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PapyrusDiagram.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PapyrusDiagram.java
@@ -10,7 +10,7 @@
*
* Contributors:
* Maged Elaasar - Initial API and implementation
- * Christian W. Damus - bug 539694
+ * Christian W. Damus - bugs 539694, 570856
*
*
*/
@@ -178,6 +178,14 @@ public interface PapyrusDiagram extends PapyrusRepresentationKind {
* @model diagnosticsUnique="false" contextUnique="false"
* @generated
*/
- boolean ceationCommandClassExists(DiagnosticChain diagnostics, Map<Object, Object> context);
+ boolean creationCommandClassExists(DiagnosticChain diagnostics, Map<Object, Object> context);
+
+ /**
+ * @deprecated since the 3.1 release, use the {@link #creationCommandClassExists(DiagnosticChain, Map)} API, instead.
+ */
+ @Deprecated(since = "3.1", forRemoval = true)
+ default boolean ceationCommandClassExists(DiagnosticChain diagnostics, Map<Object, Object> context) {
+ return creationCommandClassExists(diagnostics, context);
+ }
} // PapyrusDiagram
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java
index 7c54ae8648f..d4c9f7e4f4d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2017 CEA LIST.
+ * Copyright (c) 2017, 2021 CEA LIST, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -10,6 +10,7 @@
*
* Contributors:
* Maged Elaasar - Initial API and implementation
+ * Christian W. Damus - bug 570856
*
*
*/
@@ -253,13 +254,19 @@ public interface RepresentationPackage extends EPackage {
int PAPYRUS_DIAGRAM_FEATURE_COUNT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 6;
/**
- * The operation id for the '<em>Ceation Command Class Exists</em>' operation.
+ * The operation id for the '<em>Creation Command Class Exists</em>' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int PAPYRUS_DIAGRAM___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_OPERATION_COUNT + 0;
+ int PAPYRUS_DIAGRAM___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_OPERATION_COUNT + 0;
+
+ /**
+ * @deprecated since the 3.1 release, use {@link #PAPYRUS_DIAGRAM___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP}, instead.
+ */
+ @Deprecated(since = "3.1", forRemoval = true)
+ int PAPYRUS_DIAGRAM___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = PAPYRUS_DIAGRAM___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP;
/**
* The number of operations of the '<em>Papyrus Diagram</em>' class.
@@ -587,14 +594,22 @@ public interface RepresentationPackage extends EPackage {
EReference getPapyrusDiagram_Palettes();
/**
- * Returns the meta object for the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#ceationCommandClassExists(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Ceation Command Class Exists</em>}' operation.
+ * Returns the meta object for the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#creationCommandClassExists(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Creation Command Class Exists</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the '<em>Ceation Command Class Exists</em>' operation.
- * @see org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#ceationCommandClassExists(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * @return the meta object for the '<em>Creation Command Class Exists</em>' operation.
+ * @see org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#creationCommandClassExists(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* @generated
*/
- EOperation getPapyrusDiagram__CeationCommandClassExists__DiagnosticChain_Map();
+ EOperation getPapyrusDiagram__CreationCommandClassExists__DiagnosticChain_Map();
+
+ /**
+ * @deprecated since the 3.1 release, use the {@link #getPapyrusDiagram__CreationCommandClassExists__DiagnosticChain_Map()} API, instead.
+ */
+ @Deprecated(since = "3.1", forRemoval = true)
+ default EOperation getPapyrusDiagram__CeationCommandClassExists__DiagnosticChain_Map() {
+ return getPapyrusDiagram__CreationCommandClassExists__DiagnosticChain_Map();
+ }
/**
* Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule <em>Child Rule</em>}'.
@@ -838,12 +853,18 @@ public interface RepresentationPackage extends EPackage {
EReference PAPYRUS_DIAGRAM__PALETTES = eINSTANCE.getPapyrusDiagram_Palettes();
/**
- * The meta object literal for the '<em><b>Ceation Command Class Exists</b></em>' operation.
+ * The meta object literal for the '<em><b>Creation Command Class Exists</b></em>' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EOperation PAPYRUS_DIAGRAM___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getPapyrusDiagram__CeationCommandClassExists__DiagnosticChain_Map();
+ EOperation PAPYRUS_DIAGRAM___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getPapyrusDiagram__CreationCommandClassExists__DiagnosticChain_Map();
+
+ /**
+ * @deprecated since the 3.1 release, use {@link #PAPYRUS_DIAGRAM___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP}, instead.
+ */
+ @Deprecated(since = "3.1", forRemoval = true)
+ EOperation PAPYRUS_DIAGRAM___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = PAPYRUS_DIAGRAM___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP;
/**
* The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.ChildRuleImpl <em>Child Rule</em>}' class.
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java
index d49a01a82f7..112eb56dbe5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java
@@ -251,7 +251,8 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
* <!-- end-user-doc -->
* @generated NOT
*/
- public boolean ceationCommandClassExists(DiagnosticChain diagnostics, Map<Object, Object> context) {
+ @Override
+ public boolean creationCommandClassExists(DiagnosticChain diagnostics, Map<Object, Object> context) {
if (creationCommandClass != null) {
boolean exists = false;
@@ -270,7 +271,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
(new BasicDiagnostic
(Diagnostic.ERROR,
RepresentationValidator.DIAGNOSTIC_SOURCE,
- RepresentationValidator.PAPYRUS_DIAGRAM__CEATION_COMMAND_CLASS_EXISTS,
+ RepresentationValidator.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS_EXISTS,
RepresentationPlugin.INSTANCE.getString(problem, new Object[] { EObjectValidator.getObjectLabel(this, context), expectedInterface }),
new Object [] { this, RepresentationPackage.Literals.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS }));
}
@@ -415,8 +416,8 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements
@SuppressWarnings("unchecked")
public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
switch (operationID) {
- case RepresentationPackage.PAPYRUS_DIAGRAM___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP:
- return ceationCommandClassExists((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+ case RepresentationPackage.PAPYRUS_DIAGRAM___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP:
+ return creationCommandClassExists((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
}
return super.eInvoke(operationID, arguments);
}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java
index 31cd5312856..32c9e97ec8b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java
@@ -10,7 +10,7 @@
*
* Contributors:
* Maged Elaasar - Initial API and implementation
- * Christian W. Damus - bug 539694
+ * Christian W. Damus - bugs 539694, 570856
*
*
*/
@@ -255,7 +255,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
* @generated
*/
@Override
- public EOperation getPapyrusDiagram__CeationCommandClassExists__DiagnosticChain_Map() {
+ public EOperation getPapyrusDiagram__CreationCommandClassExists__DiagnosticChain_Map() {
return papyrusDiagramEClass.getEOperations().get(0);
}
@@ -445,7 +445,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
createEReference(papyrusDiagramEClass, PAPYRUS_DIAGRAM__ASSISTANT_RULES);
createEAttribute(papyrusDiagramEClass, PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS);
createEReference(papyrusDiagramEClass, PAPYRUS_DIAGRAM__PALETTES);
- createEOperation(papyrusDiagramEClass, PAPYRUS_DIAGRAM___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP);
+ createEOperation(papyrusDiagramEClass, PAPYRUS_DIAGRAM___CREATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP);
childRuleEClass = createEClass(CHILD_RULE);
createEReference(childRuleEClass, CHILD_RULE__ELEMENT);
@@ -516,7 +516,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent
initEAttribute(getPapyrusDiagram_CreationCommandClass(), ecorePackage.getEString(), "creationCommandClass", null, 1, 1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
initEReference(getPapyrusDiagram_Palettes(), thePaletteconfigurationPackage.getPaletteConfiguration(), null, "palettes", null, 0, -1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- EOperation op = initEOperation(getPapyrusDiagram__CeationCommandClassExists__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "ceationCommandClassExists", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+ EOperation op = initEOperation(getPapyrusDiagram__CreationCommandClassExists__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "creationCommandClassExists", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
addEParameter(op, theEcorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, !IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
EGenericType g1 = createEGenericType(theEcorePackage.getEMap());
EGenericType g2 = createEGenericType(theEcorePackage.getEJavaObject());
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationValidator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationValidator.java
index a95800dcc31..c1eb1084ac8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationValidator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationValidator.java
@@ -57,12 +57,18 @@ public class RepresentationValidator extends EObjectValidator {
public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.infra.gmfdiag.representation"; //$NON-NLS-1$
/**
- * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Ceation Command Class Exists' of 'Papyrus Diagram'.
+ * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Creation Command Class Exists' of 'Papyrus Diagram'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- public static final int PAPYRUS_DIAGRAM__CEATION_COMMAND_CLASS_EXISTS = 1;
+ public static final int PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS_EXISTS = 1;
+
+ /**
+ * @deprecated since the 3.1 release, use {@link #PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS_EXISTS}, instead.
+ */
+ @Deprecated(since = "3.1", forRemoval = true)
+ public static final int PAPYRUS_DIAGRAM__CEATION_COMMAND_CLASS_EXISTS = PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS_EXISTS;
/**
* A constant with a fixed name that can be used as the base value for additional hand written constants.
@@ -142,18 +148,26 @@ public class RepresentationValidator extends EObjectValidator {
if (result || diagnostics != null) result &= validate_UniqueID(papyrusDiagram, diagnostics, context);
if (result || diagnostics != null) result &= validate_EveryKeyUnique(papyrusDiagram, diagnostics, context);
if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(papyrusDiagram, diagnostics, context);
- if (result || diagnostics != null) result &= validatePapyrusDiagram_ceationCommandClassExists(papyrusDiagram, diagnostics, context);
+ if (result || diagnostics != null) result &= validatePapyrusDiagram_creationCommandClassExists(papyrusDiagram, diagnostics, context);
return result;
}
/**
- * Validates the ceationCommandClassExists constraint of '<em>Papyrus Diagram</em>'.
+ * Validates the creationCommandClassExists constraint of '<em>Papyrus Diagram</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
+ public boolean validatePapyrusDiagram_creationCommandClassExists(PapyrusDiagram papyrusDiagram, DiagnosticChain diagnostics, Map<Object, Object> context) {
+ return papyrusDiagram.creationCommandClassExists(diagnostics, context);
+ }
+
+ /**
+ * @deprecated since the 3.1 release, use the {@link #validatePapyrusDiagram_creationCommandClassExists(PapyrusDiagram, DiagnosticChain, Map)} API, instead.
+ */
+ @Deprecated(since = "3.1", forRemoval = true)
public boolean validatePapyrusDiagram_ceationCommandClassExists(PapyrusDiagram papyrusDiagram, DiagnosticChain diagnostics, Map<Object, Object> context) {
- return papyrusDiagram.ceationCommandClassExists(diagnostics, context);
+ return validatePapyrusDiagram_creationCommandClassExists(papyrusDiagram, diagnostics, context);
}
/**

Back to the top