diff options
| author | ptessier | 2015-02-03 09:27:08 +0000 |
|---|---|---|
| committer | ptessier | 2015-02-03 09:27:08 +0000 |
| commit | 1b925bb7ce857fc27a6c02e3f5a434783685bdd2 (patch) | |
| tree | ac4b80a5371e29bf329772f4a099dcc16a891bb5 | |
| parent | 02cd2eb66795095aaeaecfbec41ab072cb635a92 (diff) | |
| parent | 2d053dfb67c1ee1fac1ae34821da2261de75f1ac (diff) | |
| download | org.eclipse.papyrus-1b925bb7ce857fc27a6c02e3f5a434783685bdd2.tar.gz org.eclipse.papyrus-1b925bb7ce857fc27a6c02e3f5a434783685bdd2.tar.xz org.eclipse.papyrus-1b925bb7ce857fc27a6c02e3f5a434783685bdd2.zip | |
Merge branch 'master' of ssh://ptessier@git.eclipse.org:29418/papyrus/org.eclipse.papyrus
91 files changed, 1505 insertions, 5172 deletions
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap index 0e456dfc766..219160ea69f 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap @@ -2,5 +2,8 @@ <uriMap:MappingContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:uriMap="http:///www.eclipse.org/m2m/qvt/oml/MModelUriMap/1.0.0">
<mapping sourceURI="http://www.eclipse.org/papyrus/umlnotation" targetURI="platform:/resource/org.eclipse.papyrus.migration.rsa/model/PapyrusUMLNotation.ecore"/>
<mapping sourceURI="http://www.eclipse.org/papyrus/0.7.0/sashdi" targetURI="platform:/resource/org.eclipse.papyrus.infra.core.sasheditor.di/model/di.ecore"/>
- <mapping sourceURI="http:///RSAToPapyrusParameters.ecore" targetURI="platform:/resource/org.eclipse.papyrus.migration.rsa/model/ui/RSAToPapyrusParameters.ecore"/>
+ <mapping sourceURI="http:///RSAToPapyrusParameters.ecore" targetURI="platform:/resource/org.eclipse.papyrus.migration.rsa/model/ui/RSAToPapyrusParameters.ecore"/>
+ <mapping sourceURI="http://www.eclipse.org/papyrus/profile/umlrt" targetURI="platform:/resource/org.eclipse.papyrus.migration.rsa/model/PapyrusRT.ecore"/>
+ <mapping sourceURI="http://www.eclipse.org/papyrus/profile/default" targetURI="platform:/resource/org.eclipse.papyrus.migration.rsa/model/PapyrusDefault.ecore"/>
+ <mapping sourceURI="http://www.eclipse.org/papyrus/profile/profilebase" targetURI="platform:/resource/org.eclipse.papyrus.migration.rsa/model/PapyrusProfileBase.ecore"/>
</uriMap:MappingContainer>
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusRT.ecore b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusRT.ecore index 9978d666fea..e068bd8aee4 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusRT.ecore +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusRT.ecore @@ -51,6 +51,7 @@ <eClassifiers xsi:type="ecore:EClass" name="RTRedefinableElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="base_RedefinableElement"
lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//RedefinableElement"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="rootFragment" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//RedefinableElement"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Trigger">
<eStructuralFeatures xsi:type="ecore:EReference" name="base_Operation" lowerBound="1"
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusRT.genmodel b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusRT.genmodel index ff59a84e9ae..f91d73c1054 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusRT.genmodel +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/model/PapyrusRT.genmodel @@ -5,7 +5,7 @@ editorDirectory="/org.eclipse.papyrus.migration.rsa.editor/src-gen" modelPluginID="org.eclipse.papyrus.migration.rsa"
modelName="PapyrusRT" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
testsDirectory="/org.eclipse.papyrus.migration.rsa.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"
- complianceLevel="6.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml"
+ complianceLevel="6.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml"
operationReflection="true" importOrganizing="true">
<foreignModel>PapyrusRT.ecore</foreignModel>
<genPackages prefix="UMLRealTime" basePackage="org.eclipse.papyrus.migration.rsa"
@@ -19,6 +19,7 @@ <genEnumLiterals ecoreEnumLiteral="PapyrusRT.ecore#//HistoryKind/Deep"/>
<genEnumLiterals ecoreEnumLiteral="PapyrusRT.ecore#//HistoryKind/Shallow"/>
</genEnums>
+ <genClasses image="false" ecoreClass="PapyrusRT.ecore#//RTStereotype"/>
<genClasses image="false" ecoreClass="PapyrusRT.ecore#//AbstractEvent">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusRT.ecore#//AbstractEvent/base_CallEvent"/>
</genClasses>
@@ -55,6 +56,7 @@ </genClasses>
<genClasses ecoreClass="PapyrusRT.ecore#//RTRedefinableElement">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusRT.ecore#//RTRedefinableElement/base_RedefinableElement"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusRT.ecore#//RTRedefinableElement/rootFragment"/>
</genClasses>
<genClasses ecoreClass="PapyrusRT.ecore#//Trigger">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference PapyrusRT.ecore#//Trigger/base_Operation"/>
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/AbstractEvent.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/AbstractEvent.java index 88bbba54aae..ae19f96c4ee 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/AbstractEvent.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/AbstractEvent.java @@ -21,10 +21,10 @@ import org.eclipse.uml2.uml.CallEvent; *
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.AbstractEvent#getBase_CallEvent <em>Base Call Event</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getAbstractEvent()
* @model abstract="true"
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Capsule.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Capsule.java index 1d16593f36e..fdd74b216b6 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Capsule.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Capsule.java @@ -20,10 +20,10 @@ import org.eclipse.emf.ecore.EObject; *
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.Capsule#getBase_Class <em>Base Class</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getCapsule()
* @model
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/CapsulePart.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/CapsulePart.java index 63d816eb44e..8d0b73a6687 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/CapsulePart.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/CapsulePart.java @@ -21,10 +21,10 @@ import org.eclipse.uml2.uml.Property; *
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.CapsulePart#getBase_Property <em>Base Property</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getCapsulePart()
* @model
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/HistoryKind.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/HistoryKind.java index 913d64acc47..45b15dbcf15 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/HistoryKind.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/HistoryKind.java @@ -107,6 +107,9 @@ public enum HistoryKind implements Enumerator { * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
+ * @param literal
+ * the literal.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static HistoryKind get(String literal) {
@@ -124,6 +127,9 @@ public enum HistoryKind implements Enumerator { * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
+ * @param name
+ * the name.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static HistoryKind getByName(String name) {
@@ -141,6 +147,9 @@ public enum HistoryKind implements Enumerator { * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
+ * @param value
+ * the integer value.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static HistoryKind get(int value) {
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Protocol.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Protocol.java index 309b385ccf1..59063040b64 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Protocol.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Protocol.java @@ -21,10 +21,10 @@ import org.eclipse.uml2.uml.Collaboration; *
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.Protocol#getBase_Collaboration <em>Base Collaboration</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getProtocol()
* @model
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/ProtocolContainer.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/ProtocolContainer.java index 25cb87597a4..bd4d2765c48 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/ProtocolContainer.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/ProtocolContainer.java @@ -20,10 +20,10 @@ import org.eclipse.emf.ecore.EObject; *
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.ProtocolContainer#getBase_Package <em>Base Package</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getProtocolContainer()
* @model
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTConnector.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTConnector.java index c0d2a048d07..36568c24153 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTConnector.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTConnector.java @@ -21,10 +21,10 @@ import org.eclipse.uml2.uml.Connector; *
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTConnector#getBase_Connector <em>Base Connector</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTConnector()
* @model
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTHistorystate.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTHistorystate.java index b879660e19a..d6b8cb3e985 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTHistorystate.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTHistorystate.java @@ -21,11 +21,11 @@ import org.eclipse.uml2.uml.Pseudostate; *
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate#getBase_Pseudostate <em>Base Pseudostate</em>}</li>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate#getHistoryKind <em>History Kind</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTHistorystate()
* @model
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTPort.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTPort.java index f34fc9086fd..2de38e2634c 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTPort.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTPort.java @@ -21,6 +21,7 @@ import org.eclipse.uml2.uml.Port; *
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#getBase_Port <em>Base Port</em>}</li>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#isIsConjugate <em>Is Conjugate</em>}</li>
@@ -30,7 +31,6 @@ import org.eclipse.uml2.uml.Port; * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#getRegistration <em>Registration</em>}</li>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTPort#getRegistrationOverride <em>Registration Override</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTPort()
* @model
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTRedefinableElement.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTRedefinableElement.java index f36d0e70cf1..4c6036dee75 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTRedefinableElement.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTRedefinableElement.java @@ -21,10 +21,11 @@ import org.eclipse.uml2.uml.RedefinableElement; *
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTRedefinableElement#getBase_RedefinableElement <em>Base Redefinable Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.RTRedefinableElement#getRootFragment <em>Root Fragment</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTRedefinableElement()
* @model
@@ -59,4 +60,32 @@ public interface RTRedefinableElement extends EObject { */
void setBase_RedefinableElement(RedefinableElement value);
+ /**
+ * Returns the value of the '<em><b>Root Fragment</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Root Fragment</em>' reference isn't clear, there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Root Fragment</em>' reference.
+ * @see #setRootFragment(RedefinableElement)
+ * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTRedefinableElement_RootFragment()
+ * @model
+ * @generated
+ */
+ RedefinableElement getRootFragment();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTRedefinableElement#getRootFragment <em>Root Fragment</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Root Fragment</em>' reference.
+ * @see #getRootFragment()
+ * @generated
+ */
+ void setRootFragment(RedefinableElement value);
+
} // RTRedefinableElement
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTStereotype.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTStereotype.java new file mode 100644 index 00000000000..cfd7cb73383 --- /dev/null +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/RTStereotype.java @@ -0,0 +1,27 @@ +/** + * * Copyright (c) 2013, 2014 CEA LIST. + * * + * * All rights reserved. This program and the accompanying materials + * * are made available under the terms of the Eclipse Public License v1.0 + * * which accompanies this distribution, and is available at + * * http://www.eclipse.org/legal/epl-v10.html + * * + * * Contributors: + * * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + */ +package org.eclipse.papyrus.migration.rsa.umlrt; + +import org.eclipse.emf.ecore.EObject; + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>RT Stereotype</b></em>'. + * <!-- end-user-doc --> + * + * + * @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getRTStereotype() + * @model abstract="true" + * @generated + */ +public interface RTStereotype extends EObject { +} // RTStereotype diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Trigger.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Trigger.java index e2b7eac8ee4..a5fc6fbe962 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Trigger.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/Trigger.java @@ -21,10 +21,10 @@ import org.eclipse.uml2.uml.Operation; *
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.Trigger#getBase_Operation <em>Base Operation</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage#getTrigger()
* @model
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/UMLRealTimePackage.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/UMLRealTimePackage.java index 345f87b5cd9..4ee73260176 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/UMLRealTimePackage.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/UMLRealTimePackage.java @@ -72,6 +72,37 @@ public interface UMLRealTimePackage extends EPackage { UMLRealTimePackage eINSTANCE = org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl.init();
/**
+ * The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTStereotypeImpl <em>RT Stereotype</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.RTStereotypeImpl
+ * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getRTStereotype()
+ * @generated
+ */
+ int RT_STEREOTYPE = 0;
+
+ /**
+ * The number of structural features of the '<em>RT Stereotype</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int RT_STEREOTYPE_FEATURE_COUNT = 0;
+
+ /**
+ * The number of operations of the '<em>RT Stereotype</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int RT_STEREOTYPE_OPERATION_COUNT = 0;
+
+ /**
* The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.AbstractEventImpl <em>Abstract Event</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -80,7 +111,7 @@ public interface UMLRealTimePackage extends EPackage { * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getAbstractEvent()
* @generated
*/
- int ABSTRACT_EVENT = 0;
+ int ABSTRACT_EVENT = 1;
/**
* The feature id for the '<em><b>Base Call Event</b></em>' reference.
@@ -121,7 +152,7 @@ public interface UMLRealTimePackage extends EPackage { * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getCapsule()
* @generated
*/
- int CAPSULE = 1;
+ int CAPSULE = 2;
/**
* The feature id for the '<em><b>Base Class</b></em>' reference.
@@ -162,7 +193,7 @@ public interface UMLRealTimePackage extends EPackage { * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getCapsulePart()
* @generated
*/
- int CAPSULE_PART = 2;
+ int CAPSULE_PART = 3;
/**
* The feature id for the '<em><b>Base Property</b></em>' reference.
@@ -203,7 +234,7 @@ public interface UMLRealTimePackage extends EPackage { * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getCoregion()
* @generated
*/
- int COREGION = 3;
+ int COREGION = 4;
/**
* The number of structural features of the '<em>Coregion</em>' class.
@@ -234,7 +265,7 @@ public interface UMLRealTimePackage extends EPackage { * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getInEvent()
* @generated
*/
- int IN_EVENT = 4;
+ int IN_EVENT = 5;
/**
* The feature id for the '<em><b>Base Call Event</b></em>' reference.
@@ -275,7 +306,7 @@ public interface UMLRealTimePackage extends EPackage { * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getOutEvent()
* @generated
*/
- int OUT_EVENT = 5;
+ int OUT_EVENT = 6;
/**
* The feature id for the '<em><b>Base Call Event</b></em>' reference.
@@ -316,7 +347,7 @@ public interface UMLRealTimePackage extends EPackage { * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getProtocol()
* @generated
*/
- int PROTOCOL = 6;
+ int PROTOCOL = 7;
/**
* The feature id for the '<em><b>Base Collaboration</b></em>' reference.
@@ -357,7 +388,7 @@ public interface UMLRealTimePackage extends EPackage { * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getProtocolContainer()
* @generated
*/
- int PROTOCOL_CONTAINER = 7;
+ int PROTOCOL_CONTAINER = 8;
/**
* The feature id for the '<em><b>Base Package</b></em>' reference.
@@ -398,7 +429,7 @@ public interface UMLRealTimePackage extends EPackage { * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getRTConnector()
* @generated
*/
- int RT_CONNECTOR = 8;
+ int RT_CONNECTOR = 9;
/**
* The feature id for the '<em><b>Base Connector</b></em>' reference.
@@ -439,7 +470,7 @@ public interface UMLRealTimePackage extends EPackage { * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getRTHistorystate()
* @generated
*/
- int RT_HISTORYSTATE = 9;
+ int RT_HISTORYSTATE = 10;
/**
* The feature id for the '<em><b>Base Pseudostate</b></em>' reference.
@@ -490,7 +521,7 @@ public interface UMLRealTimePackage extends EPackage { * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getRTPort()
* @generated
*/
- int RT_PORT = 10;
+ int RT_PORT = 11;
/**
* The feature id for the '<em><b>Base Port</b></em>' reference.
@@ -591,7 +622,7 @@ public interface UMLRealTimePackage extends EPackage { * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getRTRedefinableElement()
* @generated
*/
- int RT_REDEFINABLE_ELEMENT = 11;
+ int RT_REDEFINABLE_ELEMENT = 12;
/**
* The feature id for the '<em><b>Base Redefinable Element</b></em>' reference.
@@ -604,6 +635,16 @@ public interface UMLRealTimePackage extends EPackage { int RT_REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT = 0;
/**
+ * The feature id for the '<em><b>Root Fragment</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int RT_REDEFINABLE_ELEMENT__ROOT_FRAGMENT = 1;
+
+ /**
* The number of structural features of the '<em>RT Redefinable Element</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -611,7 +652,7 @@ public interface UMLRealTimePackage extends EPackage { * @generated
* @ordered
*/
- int RT_REDEFINABLE_ELEMENT_FEATURE_COUNT = 1;
+ int RT_REDEFINABLE_ELEMENT_FEATURE_COUNT = 2;
/**
* The number of operations of the '<em>RT Redefinable Element</em>' class.
@@ -632,7 +673,7 @@ public interface UMLRealTimePackage extends EPackage { * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getTrigger()
* @generated
*/
- int TRIGGER = 12;
+ int TRIGGER = 13;
/**
* The feature id for the '<em><b>Base Operation</b></em>' reference.
@@ -673,7 +714,7 @@ public interface UMLRealTimePackage extends EPackage { * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getPortRegistrationType()
* @generated
*/
- int PORT_REGISTRATION_TYPE = 13;
+ int PORT_REGISTRATION_TYPE = 14;
/**
* The meta object id for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.HistoryKind <em>History Kind</em>}' enum.
@@ -684,8 +725,19 @@ public interface UMLRealTimePackage extends EPackage { * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getHistoryKind()
* @generated
*/
- int HISTORY_KIND = 14;
+ int HISTORY_KIND = 15;
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTStereotype <em>RT Stereotype</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>RT Stereotype</em>'.
+ * @see org.eclipse.papyrus.migration.rsa.umlrt.RTStereotype
+ * @generated
+ */
+ EClass getRTStereotype();
/**
* Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlrt.AbstractEvent <em>Abstract Event</em>}'.
@@ -1012,6 +1064,18 @@ public interface UMLRealTimePackage extends EPackage { EReference getRTRedefinableElement_Base_RedefinableElement();
/**
+ * Returns the meta object for the reference '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTRedefinableElement#getRootFragment <em>Root Fragment</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the reference '<em>Root Fragment</em>'.
+ * @see org.eclipse.papyrus.migration.rsa.umlrt.RTRedefinableElement#getRootFragment()
+ * @see #getRTRedefinableElement()
+ * @generated
+ */
+ EReference getRTRedefinableElement_RootFragment();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.papyrus.migration.rsa.umlrt.Trigger <em>Trigger</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1082,6 +1146,17 @@ public interface UMLRealTimePackage extends EPackage { */
interface Literals {
/**
+ * The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTStereotypeImpl <em>RT Stereotype</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.RTStereotypeImpl
+ * @see org.eclipse.papyrus.migration.rsa.umlrt.impl.UMLRealTimePackageImpl#getRTStereotype()
+ * @generated
+ */
+ EClass RT_STEREOTYPE = eINSTANCE.getRTStereotype();
+
+ /**
* The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.AbstractEventImpl <em>Abstract Event</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1358,6 +1433,15 @@ public interface UMLRealTimePackage extends EPackage { EReference RT_REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT = eINSTANCE.getRTRedefinableElement_Base_RedefinableElement();
/**
+ * The meta object literal for the '<em><b>Root Fragment</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference RT_REDEFINABLE_ELEMENT__ROOT_FRAGMENT = eINSTANCE.getRTRedefinableElement_RootFragment();
+
+ /**
* The meta object literal for the '{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.TriggerImpl <em>Trigger</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/AbstractEventImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/AbstractEventImpl.java index 2a8832ff1f4..e6b8a951c7f 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/AbstractEventImpl.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/AbstractEventImpl.java @@ -25,11 +25,12 @@ import org.eclipse.uml2.uml.CallEvent; * An implementation of the model object '<em><b>Abstract Event</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.AbstractEventImpl#getBase_CallEvent <em>Base Call Event</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CapsuleImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CapsuleImpl.java index a7fa5a83917..ab4da59c700 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CapsuleImpl.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CapsuleImpl.java @@ -24,11 +24,12 @@ import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage; * An implementation of the model object '<em><b>Capsule</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.CapsuleImpl#getBase_Class <em>Base Class</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CapsulePartImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CapsulePartImpl.java index a6270547cb1..c128fc43974 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CapsulePartImpl.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CapsulePartImpl.java @@ -25,11 +25,12 @@ import org.eclipse.uml2.uml.Property; * An implementation of the model object '<em><b>Capsule Part</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.CapsulePartImpl#getBase_Property <em>Base Property</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CoregionImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CoregionImpl.java index 1b8641e8503..8508ca8ed99 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CoregionImpl.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/CoregionImpl.java @@ -21,7 +21,6 @@ import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage; * An implementation of the model object '<em><b>Coregion</b></em>'.
* <!-- end-user-doc -->
* <p>
- * </p>
*
* @generated
*/
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/InEventImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/InEventImpl.java index 2b22da2defe..23720752be1 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/InEventImpl.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/InEventImpl.java @@ -20,7 +20,6 @@ import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage; * An implementation of the model object '<em><b>In Event</b></em>'.
* <!-- end-user-doc -->
* <p>
- * </p>
*
* @generated
*/
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/OutEventImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/OutEventImpl.java index fab1fcd5e08..19b6ebe3a14 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/OutEventImpl.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/OutEventImpl.java @@ -20,7 +20,6 @@ import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage; * An implementation of the model object '<em><b>Out Event</b></em>'.
* <!-- end-user-doc -->
* <p>
- * </p>
*
* @generated
*/
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/ProtocolContainerImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/ProtocolContainerImpl.java index 7722e54cf7b..99ad8d96ca7 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/ProtocolContainerImpl.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/ProtocolContainerImpl.java @@ -24,11 +24,12 @@ import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage; * An implementation of the model object '<em><b>Protocol Container</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.ProtocolContainerImpl#getBase_Package <em>Base Package</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/ProtocolImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/ProtocolImpl.java index 579398a436f..ce314993706 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/ProtocolImpl.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/ProtocolImpl.java @@ -25,11 +25,12 @@ import org.eclipse.uml2.uml.Collaboration; * An implementation of the model object '<em><b>Protocol</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.ProtocolImpl#getBase_Collaboration <em>Base Collaboration</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTConnectorImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTConnectorImpl.java index 9577bb84bcd..d4b0a1b5284 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTConnectorImpl.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTConnectorImpl.java @@ -25,11 +25,12 @@ import org.eclipse.uml2.uml.Connector; * An implementation of the model object '<em><b>RT Connector</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTConnectorImpl#getBase_Connector <em>Base Connector</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTHistorystateImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTHistorystateImpl.java index ea144aa1bf3..8f2e8a2d294 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTHistorystateImpl.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTHistorystateImpl.java @@ -26,12 +26,13 @@ import org.eclipse.uml2.uml.Pseudostate; * An implementation of the model object '<em><b>RT Historystate</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTHistorystateImpl#getBase_Pseudostate <em>Base Pseudostate</em>}</li>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTHistorystateImpl#getHistoryKind <em>History Kind</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTPortImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTPortImpl.java index bca785b086e..e177c1139af 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTPortImpl.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTPortImpl.java @@ -26,7 +26,9 @@ import org.eclipse.uml2.uml.Port; * An implementation of the model object '<em><b>RT Port</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTPortImpl#getBase_Port <em>Base Port</em>}</li>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTPortImpl#isIsConjugate <em>Is Conjugate</em>}</li>
@@ -36,7 +38,6 @@ import org.eclipse.uml2.uml.Port; * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTPortImpl#getRegistration <em>Registration</em>}</li>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTPortImpl#getRegistrationOverride <em>Registration Override</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTRedefinableElementImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTRedefinableElementImpl.java index b674fa8c8d6..a85d8a8682f 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTRedefinableElementImpl.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTRedefinableElementImpl.java @@ -25,11 +25,13 @@ import org.eclipse.uml2.uml.RedefinableElement; * An implementation of the model object '<em><b>RT Redefinable Element</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTRedefinableElementImpl#getBase_RedefinableElement <em>Base Redefinable Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.RTRedefinableElementImpl#getRootFragment <em>Root Fragment</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -46,6 +48,17 @@ public class RTRedefinableElementImpl extends MinimalEObjectImpl.Container imple protected RedefinableElement base_RedefinableElement;
/**
+ * The cached value of the '{@link #getRootFragment() <em>Root Fragment</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getRootFragment()
+ * @generated
+ * @ordered
+ */
+ protected RedefinableElement rootFragment;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -118,6 +131,51 @@ public class RTRedefinableElementImpl extends MinimalEObjectImpl.Container imple * @generated
*/
@Override
+ public RedefinableElement getRootFragment() {
+ if (rootFragment != null && rootFragment.eIsProxy()) {
+ InternalEObject oldRootFragment = (InternalEObject) rootFragment;
+ rootFragment = (RedefinableElement) eResolveProxy(oldRootFragment);
+ if (rootFragment != oldRootFragment) {
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLRealTimePackage.RT_REDEFINABLE_ELEMENT__ROOT_FRAGMENT, oldRootFragment, rootFragment));
+ }
+ }
+ }
+ return rootFragment;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public RedefinableElement basicGetRootFragment() {
+ return rootFragment;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void setRootFragment(RedefinableElement newRootFragment) {
+ RedefinableElement oldRootFragment = rootFragment;
+ rootFragment = newRootFragment;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, UMLRealTimePackage.RT_REDEFINABLE_ELEMENT__ROOT_FRAGMENT, oldRootFragment, rootFragment));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case UMLRealTimePackage.RT_REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT:
@@ -125,6 +183,11 @@ public class RTRedefinableElementImpl extends MinimalEObjectImpl.Container imple return getBase_RedefinableElement();
}
return basicGetBase_RedefinableElement();
+ case UMLRealTimePackage.RT_REDEFINABLE_ELEMENT__ROOT_FRAGMENT:
+ if (resolve) {
+ return getRootFragment();
+ }
+ return basicGetRootFragment();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -141,6 +204,9 @@ public class RTRedefinableElementImpl extends MinimalEObjectImpl.Container imple case UMLRealTimePackage.RT_REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT:
setBase_RedefinableElement((RedefinableElement) newValue);
return;
+ case UMLRealTimePackage.RT_REDEFINABLE_ELEMENT__ROOT_FRAGMENT:
+ setRootFragment((RedefinableElement) newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -157,6 +223,9 @@ public class RTRedefinableElementImpl extends MinimalEObjectImpl.Container imple case UMLRealTimePackage.RT_REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT:
setBase_RedefinableElement((RedefinableElement) null);
return;
+ case UMLRealTimePackage.RT_REDEFINABLE_ELEMENT__ROOT_FRAGMENT:
+ setRootFragment((RedefinableElement) null);
+ return;
}
super.eUnset(featureID);
}
@@ -172,6 +241,8 @@ public class RTRedefinableElementImpl extends MinimalEObjectImpl.Container imple switch (featureID) {
case UMLRealTimePackage.RT_REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT:
return base_RedefinableElement != null;
+ case UMLRealTimePackage.RT_REDEFINABLE_ELEMENT__ROOT_FRAGMENT:
+ return rootFragment != null;
}
return super.eIsSet(featureID);
}
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTStereotypeImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTStereotypeImpl.java new file mode 100644 index 00000000000..d6bce6fb7bd --- /dev/null +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/RTStereotypeImpl.java @@ -0,0 +1,51 @@ +/** + * * Copyright (c) 2013, 2014 CEA LIST. + * * + * * All rights reserved. This program and the accompanying materials + * * are made available under the terms of the Eclipse Public License v1.0 + * * which accompanies this distribution, and is available at + * * http://www.eclipse.org/legal/epl-v10.html + * * + * * Contributors: + * * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation + */ +package org.eclipse.papyrus.migration.rsa.umlrt.impl; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.papyrus.migration.rsa.umlrt.RTStereotype; +import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>RT Stereotype</b></em>'. + * <!-- end-user-doc --> + * <p> + * + * @generated + */ +public abstract class RTStereotypeImpl extends MinimalEObjectImpl.Container implements RTStereotype { + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + protected RTStereotypeImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return UMLRealTimePackage.Literals.RT_STEREOTYPE; + } + +} // RTStereotypeImpl diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/TriggerImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/TriggerImpl.java index 7fea13e4fba..612f612ba3e 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/TriggerImpl.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/TriggerImpl.java @@ -25,11 +25,12 @@ import org.eclipse.uml2.uml.Operation; * An implementation of the model object '<em><b>Trigger</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.papyrus.migration.rsa.umlrt.impl.TriggerImpl#getBase_Operation <em>Base Operation</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/UMLRealTimePackageImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/UMLRealTimePackageImpl.java index a9eee4f9dbe..8ae8aa41dc5 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/UMLRealTimePackageImpl.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/impl/UMLRealTimePackageImpl.java @@ -32,6 +32,7 @@ import org.eclipse.papyrus.migration.rsa.umlrt.RTConnector; import org.eclipse.papyrus.migration.rsa.umlrt.RTHistorystate;
import org.eclipse.papyrus.migration.rsa.umlrt.RTPort;
import org.eclipse.papyrus.migration.rsa.umlrt.RTRedefinableElement;
+import org.eclipse.papyrus.migration.rsa.umlrt.RTStereotype;
import org.eclipse.papyrus.migration.rsa.umlrt.Trigger;
import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimeFactory;
import org.eclipse.papyrus.migration.rsa.umlrt.UMLRealTimePackage;
@@ -52,6 +53,14 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP *
* @generated
*/
+ private EClass rtStereotypeEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
private EClass abstractEventEClass = null;
/**
@@ -167,8 +176,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP private EEnum historyKindEEnum = 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 -->
@@ -236,6 +244,17 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP * @generated
*/
@Override
+ public EClass getRTStereotype() {
+ return rtStereotypeEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
public EClass getAbstractEvent() {
return abstractEventEClass;
}
@@ -544,6 +563,17 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP * @generated
*/
@Override
+ public EReference getRTRedefinableElement_RootFragment() {
+ return (EReference) rtRedefinableElementEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
public EClass getTrigger() {
return triggerEClass;
}
@@ -615,6 +645,8 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP isCreated = true;
// Create classes and their features
+ rtStereotypeEClass = createEClass(RT_STEREOTYPE);
+
abstractEventEClass = createEClass(ABSTRACT_EVENT);
createEReference(abstractEventEClass, ABSTRACT_EVENT__BASE_CALL_EVENT);
@@ -654,6 +686,7 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP rtRedefinableElementEClass = createEClass(RT_REDEFINABLE_ELEMENT);
createEReference(rtRedefinableElementEClass, RT_REDEFINABLE_ELEMENT__BASE_REDEFINABLE_ELEMENT);
+ createEReference(rtRedefinableElementEClass, RT_REDEFINABLE_ELEMENT__ROOT_FRAGMENT);
triggerEClass = createEClass(TRIGGER);
createEReference(triggerEClass, TRIGGER__BASE_OPERATION);
@@ -703,6 +736,8 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP outEventEClass.getESuperTypes().add(this.getAbstractEvent());
// Initialize classes, features, and operations; add parameters
+ initEClass(rtStereotypeEClass, RTStereotype.class, "RTStereotype", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
initEClass(abstractEventEClass, AbstractEvent.class, "AbstractEvent", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getAbstractEvent_Base_CallEvent(), theUMLPackage.getCallEvent(), null, "base_CallEvent", null, 1, 1, AbstractEvent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
@@ -749,6 +784,8 @@ public class UMLRealTimePackageImpl extends EPackageImpl implements UMLRealTimeP initEClass(rtRedefinableElementEClass, RTRedefinableElement.class, "RTRedefinableElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getRTRedefinableElement_Base_RedefinableElement(), theUMLPackage.getRedefinableElement(), null, "base_RedefinableElement", null, 1, 1, RTRedefinableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getRTRedefinableElement_RootFragment(), theUMLPackage.getRedefinableElement(), null, "rootFragment", null, 0, 1, RTRedefinableElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(triggerEClass, Trigger.class, "Trigger", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getTrigger_Base_Operation(), theUMLPackage.getOperation(), null, "base_Operation", null, 1, 1, Trigger.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeAdapterFactory.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeAdapterFactory.java index 2185764b870..2c05a0d5f2f 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeAdapterFactory.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeAdapterFactory.java @@ -15,6 +15,7 @@ import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.migration.rsa.umlrt.*;
import org.eclipse.papyrus.migration.rsa.umlrt.AbstractEvent;
import org.eclipse.papyrus.migration.rsa.umlrt.Capsule;
import org.eclipse.papyrus.migration.rsa.umlrt.CapsulePart;
@@ -92,6 +93,11 @@ public class UMLRealTimeAdapterFactory extends AdapterFactoryImpl { protected UMLRealTimeSwitch<Adapter> modelSwitch =
new UMLRealTimeSwitch<Adapter>() {
@Override
+ public Adapter caseRTStereotype(RTStereotype object) {
+ return createRTStereotypeAdapter();
+ }
+
+ @Override
public Adapter caseAbstractEvent(AbstractEvent object) {
return createAbstractEventAdapter();
}
@@ -179,6 +185,21 @@ public class UMLRealTimeAdapterFactory extends AdapterFactoryImpl { /**
+ * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlrt.RTStereotype <em>RT Stereotype</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ *
+ * @return the new adapter.
+ * @see org.eclipse.papyrus.migration.rsa.umlrt.RTStereotype
+ * @generated
+ */
+ public Adapter createRTStereotypeAdapter() {
+ return null;
+ }
+
+ /**
* Creates a new adapter for an object of class '{@link org.eclipse.papyrus.migration.rsa.umlrt.AbstractEvent <em>Abstract Event</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeResourceFactoryImpl.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeResourceFactoryImpl.java index e858728ccbc..78373894f05 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeResourceFactoryImpl.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeResourceFactoryImpl.java @@ -14,7 +14,6 @@ package org.eclipse.papyrus.migration.rsa.umlrt.util; import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
/**
* <!-- begin-user-doc -->
@@ -45,16 +44,7 @@ public class UMLRealTimeResourceFactoryImpl extends ResourceFactoryImpl { */
@Override
public Resource createResource(URI uri) {
- XMLResource result = new UMLRealTimeResourceImpl(uri);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
- result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-
- result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
- result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
- result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
+ Resource result = new UMLRealTimeResourceImpl(uri);
return result;
}
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeSwitch.java b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeSwitch.java index db5b1c91c8e..bc7ee05bac6 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeSwitch.java +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/src-gen/org/eclipse/papyrus/migration/rsa/umlrt/util/UMLRealTimeSwitch.java @@ -14,6 +14,7 @@ package org.eclipse.papyrus.migration.rsa.umlrt.util; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.Switch;
+import org.eclipse.papyrus.migration.rsa.umlrt.*;
import org.eclipse.papyrus.migration.rsa.umlrt.AbstractEvent;
import org.eclipse.papyrus.migration.rsa.umlrt.Capsule;
import org.eclipse.papyrus.migration.rsa.umlrt.CapsulePart;
@@ -70,7 +71,8 @@ public class UMLRealTimeSwitch<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
*/
@@ -90,6 +92,14 @@ public class UMLRealTimeSwitch<T> extends Switch<T> { @Override
protected T doSwitch(int classifierID, EObject theEObject) {
switch (classifierID) {
+ case UMLRealTimePackage.RT_STEREOTYPE: {
+ RTStereotype rtStereotype = (RTStereotype) theEObject;
+ T result = caseRTStereotype(rtStereotype);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
case UMLRealTimePackage.ABSTRACT_EVENT: {
AbstractEvent abstractEvent = (AbstractEvent) theEObject;
T result = caseAbstractEvent(abstractEvent);
@@ -206,6 +216,23 @@ public class UMLRealTimeSwitch<T> extends Switch<T> { }
/**
+ * Returns the result of interpreting the object as an instance of '<em>RT Stereotype</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ *
+ * @param object
+ * the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>RT Stereotype</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseRTStereotype(RTStereotype object) {
+ return null;
+ }
+
+ /**
* Returns the result of interpreting the object as an instance of '<em>Abstract Event</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSARTToPapyrusRT.qvto b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSARTToPapyrusRT.qvto index 6dd20a4dcc0..19b569761ea 100644 --- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSARTToPapyrusRT.qvto +++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSARTToPapyrusRT.qvto @@ -178,6 +178,7 @@ mapping sourcert::RTRedefinableElement::toRTRedefinedElement() : umlrt::RTRedefi self.oclIsTypeOf(sourcert::RTRedefinableElement) /* Workaround for Bug 445083/445198 */ }{ result.base_RedefinableElement := self.base_RedefinableElement; + result.rootFragment := self.rootFragment; } mapping sourcert::Trigger::toRTTrigger() : RTTrigger when { diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/.classpath b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/.classpath index 661ef4bb0e8..ad32c83a788 100644 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/.classpath +++ b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/.classpath @@ -1,8 +1,7 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="generation-classes-helper-src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/.project b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/.project index fa54661acff..b234accea42 100644 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/.project +++ b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/.project @@ -1,28 +1,28 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.sysml.sysmloveruml.codegen</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.papyrus.uml.diagram.education</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/.settings/org.eclipse.jdt.core.prefs b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..c537b63063c --- /dev/null +++ b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/META-INF/MANIFEST.MF b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..80f8aeb4835 --- /dev/null +++ b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/META-INF/MANIFEST.MF @@ -0,0 +1,20 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Education Configuration for Papyrus +Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.education;singleton:=true +Bundle-Version: 1.1.0.qualifier +Bundle-Activator: org.eclipse.papyrus.uml.diagram.education.Activator +Bundle-Vendor: Eclipse Modeling Project +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0", + org.eclipse.papyrus.infra.newchild;bundle-version="1.1.0", + org.eclipse.papyrus.views.properties;bundle-version="1.1.0", + org.eclipse.uml2.uml, + org.eclipse.papyrus.infra.core;bundle-version="1.1.0", + org.eclipse.emf.ecore.editor, + org.eclipse.papyrus.infra.onefile;bundle-version="1.1.0", + com.google.guava;bundle-version="11.0.0", + org.eclipse.papyrus.infra.emf;bundle-version="1.1.0" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-ActivationPolicy: lazy diff --git a/plugins/developer/org.eclipse.papyrus.emf.commandstack/about.html b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/about.html index d35d5aed64c..d35d5aed64c 100644 --- a/plugins/developer/org.eclipse.papyrus.emf.commandstack/about.html +++ b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/about.html diff --git a/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/build.properties b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/build.properties new file mode 100644 index 00000000000..90aaca604a4 --- /dev/null +++ b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/build.properties @@ -0,0 +1,7 @@ +source.. = src/ +output.. = bin/ +bin.includes = plugin.xml,\ + META-INF/,\ + .,\ + about.html,\ + resources/ diff --git a/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/plugin.xml b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/plugin.xml new file mode 100644 index 00000000000..f995ff4cdba --- /dev/null +++ b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/plugin.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?eclipse version="3.4"?> +<plugin> + <extension + point="org.eclipse.papyrus.infra.viewpoints.policy.custom"> + <configuration + file="resources/configuration/EducationUML.configuration" + priority="30"> + </configuration> + </extension> +</plugin> diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/pom.xml b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/pom.xml index 7d3bddeb50d..db5a77acb4b 100644 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/pom.xml +++ b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/pom.xml @@ -5,10 +5,10 @@ <artifactId>org.eclipse.papyrus</artifactId> <groupId>org.eclipse.papyrus</groupId> <version>1.1.0-SNAPSHOT</version> - <relativePath>../../../releng/top-pom-dev.xml</relativePath> + <relativePath>../../../releng/top-pom-extras.xml</relativePath> </parent> - <artifactId>org.eclipse.papyrus.sysml.sysmloveruml.codegen</artifactId> <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.uml.diagram.education</artifactId> <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
\ No newline at end of file diff --git a/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/resources/configuration/EducationUML.configuration b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/resources/configuration/EducationUML.configuration new file mode 100644 index 00000000000..93868e661e5 --- /dev/null +++ b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/resources/configuration/EducationUML.configuration @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<configuration:PapyrusConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:configuration="http://www.eclipse.org/papyrus/infra/viewpoints/configuration" xmi:id="_oa8yUBP7EeSS0oyATXohNA" defaultStakeholder="_dBfdEKCgEeSNKqx5mKuydQ"> + <stakeholders xmi:id="_dBfdEKCgEeSNKqx5mKuydQ" name="Student" viewpoints="_WwNWIKCpEeSNKqx5mKuydQ _3T-cEBP7EeSS0oyATXohNA"/> + <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_3T-cEBP7EeSS0oyATXohNA" name="Basics Education UML Viewpoint"> + <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_75O3MKCpEeSNKqx5mKuydQ" name="Basic UML UseCase Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/icons/obj16/Diagram_UseCase.gif" implementationID="UseCase"> + <modelRules xmi:id="_3VnsoKCqEeSNKqx5mKuydQ"> + <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> + </modelRules> + <owningRules xmi:id="_5QwjoKCqEeSNKqx5mKuydQ"> + <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> + </owningRules> + <childRules xmi:id="_6x-ewKCqEeSNKqx5mKuydQ"/> + <paletteRules xmi:id="_57UuIKCrEeSNKqx5mKuydQ" element="usecase.tool.include"/> + <paletteRules xmi:id="_jImkQKCrEeSNKqx5mKuydQ" element="usecase.tool.extend"/> + <paletteRules xmi:id="_RFCbsKCsEeSNKqx5mKuydQ" element="usecase.tool.actor"/> + <paletteRules xmi:id="_Z02rgKCsEeSNKqx5mKuydQ" element="usecase.tool.usecase"/> + <paletteRules xmi:id="_5a_BMKCrEeSNKqx5mKuydQ" permit="false" element="usecase.tool.*"/> + </modelKinds> + </viewpoints> + <viewpoints xsi:type="configuration:PapyrusViewpoint" xmi:id="_WwNWIKCpEeSNKqx5mKuydQ" name="Initial Education UML Viewpoint"> + <modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_d-6jEKCqEeSNKqx5mKuydQ" name="Initial UML UseCase Diagram" icon="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/icons/obj16/Diagram_UseCase.gif" parent="_75O3MKCpEeSNKqx5mKuydQ" implementationID="UseCase" customStyle=""> + <modelRules xmi:id="_qAsA8KCsEeSNKqx5mKuydQ"> + <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> + </modelRules> + <owningRules xmi:id="_qAsA8aCsEeSNKqx5mKuydQ"> + <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/> + </owningRules> + <childRules xmi:id="_qAsA8qCsEeSNKqx5mKuydQ"/> + <paletteRules xmi:id="_qAsA96CsEeSNKqx5mKuydQ" permit="false" element="usecase.tool.extend"/> + </modelKinds> + </viewpoints> + <metamodel href="http://www.eclipse.org/uml2/5.0.0/UML#/"/> + <categories xmi:id="_vUL7ABP7EeSS0oyATXohNA" name="uml"/> +</configuration:PapyrusConfiguration> diff --git a/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/src/org/eclipse/papyrus/uml/diagram/education/Activator.java b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/src/org/eclipse/papyrus/uml/diagram/education/Activator.java new file mode 100644 index 00000000000..f6da2dbc7cf --- /dev/null +++ b/extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education/src/org/eclipse/papyrus/uml/diagram/education/Activator.java @@ -0,0 +1,73 @@ +/***************************************************************************** + * Copyright (c) 2015 CEA LIST. + * + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Benoit Maggi benoit.maggi@cea.fr - Initial API and implementation + *****************************************************************************/ +package org.eclipse.papyrus.uml.diagram.education; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.diagram.education"; //$NON-NLS-1$ + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin = this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin = null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + + /** + * Returns an image descriptor for the image file at the given + * plug-in relative path + * + * @param path the path + * @return the image descriptor + */ + public static ImageDescriptor getImageDescriptor(String path) { + return imageDescriptorFromPlugin(PLUGIN_ID, path); + } +} diff --git a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml index 95b3ea2a156..9a2ee9f95fc 100755 --- a/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml +++ b/features/papyrus-dev-features/org.eclipse.papyrus.dev.feature/feature.xml @@ -1,40 +1,133 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?><feature id="org.eclipse.papyrus.dev.feature" label="Papyrus Developer Tools (Incubation)" provider-name="Eclipse Modeling Project" version="1.1.0.qualifier">
-
- <copyright url="http://www.eclipse.org/legal/epl-v10.html">
- Copyright (c) 2014 CEA LIST
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License
-v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <plugin download-size="0" id="org.eclipse.papyrus.codegen" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.dev.view.services.edit.request" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.documentation.plugin" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.documentation.plugin.edit" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.gmf.editpoliciesstates" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.gmf.editpartview" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.gmf.figureview" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.gmfgenextension" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.infra.gmfdiag.css.debug" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.domaincontextcodegen" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.domaincontextcodegen.edit" install-size="0" unpack="false" version="0.0.0"/>
-
- <plugin download-size="0" id="org.eclipse.papyrus.domaincontextcodegen.editor" install-size="0" unpack="false" version="0.0.0"/>
-
-</feature>
\ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.eclipse.papyrus.dev.feature" + label="Papyrus Developer Tools (Incubation)" + version="1.1.0.qualifier" + provider-name="Eclipse Modeling Project"> + + <copyright url="http://www.eclipse.org/legal/epl-v10.html"> + Copyright (c) 2014 CEA LIST +All rights reserved. This program and the accompanying materials +are made available under the terms of the Eclipse Public License +v1.0 +which accompanies this distribution, and is available at +http://www.eclipse.org/legal/epl-v10.html + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <plugin + id="org.eclipse.papyrus.codegen" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.dev.view.services.edit.request" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.documentation.plugin" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.documentation.plugin.edit" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.gmf.editpoliciesstates" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.gmf.editpartview" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.gmf.figureview" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.gmfgenextension" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.infra.gmfdiag.css.debug" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.domaincontextcodegen" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.domaincontextcodegen.edit" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.domaincontextcodegen.editor" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.releng.tools" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.eclipse.project.editors" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.dev.project.management" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.papyrus.infra.emf.commandstack" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> diff --git a/plugins/developer/org.eclipse.papyrus.emf.commandstack/.classpath b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.classpath index 64c5e31b7a2..64c5e31b7a2 100644 --- a/plugins/developer/org.eclipse.papyrus.emf.commandstack/.classpath +++ b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.classpath diff --git a/plugins/developer/org.eclipse.papyrus.emf.commandstack/.project b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.project index d305eea197c..d305eea197c 100644 --- a/plugins/developer/org.eclipse.papyrus.emf.commandstack/.project +++ b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.project diff --git a/plugins/developer/org.eclipse.papyrus.emf.commandstack/.settings/org.eclipse.jdt.core.prefs b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.jdt.core.prefs index c585cc455ae..c585cc455ae 100644 --- a/plugins/developer/org.eclipse.papyrus.emf.commandstack/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.jdt.core.prefs diff --git a/plugins/developer/org.eclipse.papyrus.emf.commandstack/.settings/org.eclipse.jdt.ui.prefs b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.jdt.ui.prefs index 954281dbc31..954281dbc31 100644 --- a/plugins/developer/org.eclipse.papyrus.emf.commandstack/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/.settings/org.eclipse.jdt.ui.prefs diff --git a/plugins/developer/org.eclipse.papyrus.emf.commandstack/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/META-INF/MANIFEST.MF index 0edee1616af..0edee1616af 100644 --- a/plugins/developer/org.eclipse.papyrus.emf.commandstack/META-INF/MANIFEST.MF +++ b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/META-INF/MANIFEST.MF diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/about.html b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/about.html index 82d49bf5f81..d35d5aed64c 100644 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/about.html +++ b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/about.html @@ -1,28 +1,28 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> +<title>About</title> +</head> +<body lang="EN-US"> +<h2>About This Content</h2> + +<p>June 5, 2007</p> +<h3>License</h3> + +<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>. +For purposes of the EPL, "Program" will mean the Content.</p> + +<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor's license that was +provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> + +</body> +</html> diff --git a/plugins/developer/org.eclipse.papyrus.emf.commandstack/build.properties b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/build.properties index 69d0f2e3ef2..69d0f2e3ef2 100644 --- a/plugins/developer/org.eclipse.papyrus.emf.commandstack/build.properties +++ b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/build.properties diff --git a/plugins/developer/org.eclipse.papyrus.emf.commandstack/icons/stack.gif b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/icons/stack.gif Binary files differindex 3d49e781ea1..3d49e781ea1 100644 --- a/plugins/developer/org.eclipse.papyrus.emf.commandstack/icons/stack.gif +++ b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/icons/stack.gif diff --git a/plugins/developer/org.eclipse.papyrus.emf.commandstack/plugin.properties b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/plugin.properties index 04e571f6f13..04e571f6f13 100644 --- a/plugins/developer/org.eclipse.papyrus.emf.commandstack/plugin.properties +++ b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/plugin.properties diff --git a/plugins/developer/org.eclipse.papyrus.emf.commandstack/plugin.xml b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/plugin.xml index 2a1e8e4a703..2a1e8e4a703 100644 --- a/plugins/developer/org.eclipse.papyrus.emf.commandstack/plugin.xml +++ b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/plugin.xml diff --git a/plugins/developer/org.eclipse.papyrus.emf.commandstack/pom.xml b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/pom.xml index f279f4e01b1..f279f4e01b1 100644 --- a/plugins/developer/org.eclipse.papyrus.emf.commandstack/pom.xml +++ b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/pom.xml diff --git a/plugins/developer/org.eclipse.papyrus.emf.commandstack/src/org/eclipse/papyrus/infra/emf/commandstack/Activator.java b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/src/org/eclipse/papyrus/infra/emf/commandstack/Activator.java index 309d259bfd6..309d259bfd6 100644 --- a/plugins/developer/org.eclipse.papyrus.emf.commandstack/src/org/eclipse/papyrus/infra/emf/commandstack/Activator.java +++ b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/src/org/eclipse/papyrus/infra/emf/commandstack/Activator.java diff --git a/plugins/developer/org.eclipse.papyrus.emf.commandstack/src/org/eclipse/papyrus/infra/emf/commandstack/view/CommandStackView.java b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/src/org/eclipse/papyrus/infra/emf/commandstack/view/CommandStackView.java index 093c1a345a9..093c1a345a9 100644 --- a/plugins/developer/org.eclipse.papyrus.emf.commandstack/src/org/eclipse/papyrus/infra/emf/commandstack/view/CommandStackView.java +++ b/plugins/developer/org.eclipse.papyrus.infra.emf.commandstack/src/org/eclipse/papyrus/infra/emf/commandstack/view/CommandStackView.java diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/.settings/org.eclipse.jdt.core.prefs b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index cc0129caebe..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Wed Sep 07 16:57:36 CEST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/.settings/org.eclipse.jdt.ui.prefs b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 95c12364292..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Wed Sep 07 16:57:36 CEST 2011
-eclipse.preferences.version=1
-formatter_settings_version=12
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/META-INF/MANIFEST.MF deleted file mode 100644 index f89877df59e..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/META-INF/MANIFEST.MF +++ /dev/null @@ -1,21 +0,0 @@ -Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.sysml.sysmloveruml.codegen,
- org.eclipse.papyrus.sysml.sysmloveruml.codegen.core,
- org.eclipse.papyrus.sysml.sysmloveruml.codegen.utils
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.common;bundle-version="2.7.0",
- org.eclipse.jet;bundle-version="1.1.1",
- org.eclipse.emf.ecore;bundle-version="2.8.0",
- org.eclipse.emf.codegen.ecore;bundle-version="2.8.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.1.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.sysml.sysmloveruml.codegen.SysML
- OverUMLGeneratorPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sysml.sysmloveruml.codegen;si
- ngleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/build.properties b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/build.properties deleted file mode 100644 index 0d535357068..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/build.properties +++ /dev/null @@ -1,9 +0,0 @@ -source.. = src/,\
- generation-classes-helper-src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- templates/,\
- plugin.xml,\
- generation-classes-helper-src/
-src.includes = templates/
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/generation-classes-helper-src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/generationUtils/SysMLOverUMLHelper.java b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/generation-classes-helper-src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/generationUtils/SysMLOverUMLHelper.java deleted file mode 100644 index 101a2fd4e24..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/generation-classes-helper-src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/generationUtils/SysMLOverUMLHelper.java +++ /dev/null @@ -1,421 +0,0 @@ -/**
- * Copyright (c) 2011 Atos.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Atos - Initial API and implementation
- *
- */
-package org.eclipse.papyrus.sysml.sysmloveruml.codegen.generationUtils;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeMap;
-
-import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * Helper class for generation
- *
- * @author "Arthur Daussy <a href="mailto:arthur.daussy@atos.net
- * ">arthur.daussy@atos.net</a>"
- *
- */
-public class SysMLOverUMLHelper {
-
- /**
- * Get all the based element of all the element of the package sorted by the
- * Classifer_ID of their based element
- *
- * @param genPackage
- * {@link GenPackage}
- * @return {@link TreeMap} of the all the based element sorted by the
- * classifier_ID of their based element
- */
- public static TreeMap<String, List<GenClass>> getSortedBasedElementFromPackage(GenPackage genPackage) {
- TreeMap<String, List<GenClass>> result = new TreeMap<String, List<GenClass>>();
- for (GenClass genClass : genPackage.getGenClasses()) {
- /**
- * Get all the based element for this class
- */
- List<EClass> basedElements = getBasedElement(genClass.getEcoreClass());
- /**
- * Register in the registery by EClass classifier
- */
- for (EClass basedClass : basedElements) {
- List<GenClass> list = result.get(basedClass.getName());
- if (list == null) {
- result.put(basedClass.getName(), new ArrayList<GenClass>(Collections.singletonList(genClass)));
- } else {
- list.add(genClass);
- }
- }
- }
- return result;
- }
-
- /**
- * Get the list of all EClass from the UML metamodel present in the SysML
- * language
- *
- * @param genModel
- * @return {@link Set} of all UML EClass present in the sysml language
- */
- public static Set<EClass> getAllUMLElementNameFromModel(GenModel genModel) {
- Set<EClass> result = new HashSet<EClass>();
- for (GenPackage genPackage : genModel.getAllGenPackagesWithConcreteClasses()) {
- for (GenClass genClass : genPackage.getGenClasses()) {
- /**
- * Get all the based element for this class
- */
- List<EClass> basedElements = getBasedElement(genClass.getEcoreClass());
- /**
- * Register in the registery by EClass classifier
- */
- for (EClass basedClass : basedElements) {
- result.add(basedClass);
- }
- }
- }
- return result;
- }
-
- /**
- * Get all the based element of all the element of the model sorted by the
- * Classifer_ID of their based element
- *
- * @param genModel
- * {@link GenModel}
- * @return {@link TreeMap} of the all the based element sorted by the
- * classifier_ID of their based element
- */
- public static TreeMap<String, Set<GenPackage>> getSortedEClassBasedElementFromModel(GenModel genModel) {
- TreeMap<String, Set<GenPackage>> result = new TreeMap<String, Set<GenPackage>>();
- for (GenPackage genPackage : genModel.getAllGenPackagesWithConcreteClasses()) {
- for (GenClass genClass : genPackage.getGenClasses()) {
- /**
- * Get all the based element for this class
- */
- List<EClass> basedElements = getBasedElement(genClass.getEcoreClass());
- /**
- * Register in the registery by EClass classifier
- */
- for (EClass basedClass : basedElements) {
- final Set<GenPackage> set = result.get(getClassifierCorrectLabel(basedClass.getName()));
- if (set != null) {
- set.add(genClass.getGenPackage());
- } else {
- result.put(getClassifierCorrectLabel(basedClass.getName()), new HashSet<GenPackage>(Collections.singletonList(genClass.getGenPackage())));
- }
- }
- }
- }
- return result;
- }
-
- /**
- * Get the name of the test function for uml element in sysml langage
- * Example : protected boolean isBlock ( Class clazz) { ... }
- *
- * @param genClass
- * @return the name of the function
- */
- public static String getIsXFromYLabelFunction(GenClass genClass, EClass basedClass) {
- return "is" + genClass.getClassifierAccessorName() + "From" //$NON-NLS-1$ //$NON-NLS-2$
- + basedClass.getName();//
- }
-
- /**
- * Get the name of the case function for uml element in sysml language
- * Example : public T caseClassStereotypedByBlock(Class object) {...}
- *
- * @param genClass
- * @param basedClass
- * @return
- */
- public static String getCaseXStereotypedByYLabelFunction(GenClass genClass, EClass basedClass) {
- return getCaseXStereotypedByYLabelFunction(genClass, basedClass.getName());
- }
-
- /**
- * Get the name of the case function for uml element in sysml language
- * Example : public T caseClassStereotypedByBlock(Class object) {...}
- *
- * @param genClass
- * @param String
- * based class name
- * @return
- */
- public static String getCaseXStereotypedByYLabelFunction(GenClass genClass, String basedClassName) {
- return "case" + basedClassName + "StereotypedBy" //$NON-NLS-1$ //$NON-NLS-2$
- + genClass.getClassifierAccessorName();////$NON-NLS-
- }
-
- /**
- * Get the variablele anme for the isXFromY methods
- *
- * @param eClass
- * @return
- */
- public static String getBasedClassVariableName(EClass eClass) {
- return setFirstLetterToLowerCase(eClass.getName()) + "_"; //$NON-NLS-1$
- }
-
- /**
- * Get the based elements from a stereotype application EObject. (copied
- * from org.eclipse.emf.compare.sysml.codegen)
- *
- * @param eClass
- * {@link EClass} of the based element of the stereotype
- * @return The basedElement or empty list
- */
- public static List<EClass> getBasedElement(EClass eClass) {
- if (eClass != null) {
- final EList<EStructuralFeature> structuralFeatures = eClass.getEStructuralFeatures();
- final ArrayList<EClass> basedElements = new ArrayList<EClass>();
- for (EStructuralFeature struc : structuralFeatures) {
- if (struc.getName().startsWith("base_")) { //$NON-NLS-1$
- final EClassifier attType = struc.getEType();
- if (attType instanceof EClass) {
- basedElements.add((EClass) attType);
- }
- }
- }
- if (basedElements.isEmpty()) {
- /**
- * If no based class found look into the super EClass Handle for
- * exmaple the constriant block example.
- * |Class|<-|Block]<-|ConstraintBlock|
- */
- EList<EClass> superEclasses = eClass.getESuperTypes();
- if (superEclasses == null || superEclasses.isEmpty()) {
- return Collections.emptyList();
- } else {
- for (EClass superEClass : superEclasses) {
- basedElements.addAll(getBasedElement(superEClass));
- }
- }
- }
- return basedElements;
- }
- return Collections.emptyList();
- }
-
- /**
- * get the complete name of Uml interfaces ex: org.eclipse.uml.Class
- *
- * @param eClass
- * @return
- */
- public static String getUMLInterfaceName(EClass eClass) {
- return "org.eclipse.uml2.uml." + eClass.getName(); //$NON-NLS-1$
- }
-
- /**
- * Get the classifier label of this structural feature
- *
- * @param feature
- * @param basedClass
- * @return
- */
- public static String getEStructuralFeatureClassifier(EStructuralFeature feature, EClass basedClass) {
- return getClassifierCorrectLabel(basedClass) + "__" + getClassifierCorrectLabel(feature.getName());
- }
-
- /**
- * Get the base feature name Example: For Requirement -> "getBase_Class()"
- *
- * @param stereotypeClass
- * @param basedClass
- * @return
- */
- public static String getBase_ElementMethodName(EClass stereotypeClass, EClass basedClass) {
- String result = ""; //$NON-NLS-1$
- if (stereotypeClass != null && basedClass != null) {
- final EList<EStructuralFeature> structuralFeatures = stereotypeClass.getEStructuralFeatures();
- for (EStructuralFeature feature : structuralFeatures) {
- EClassifier classifier = feature.getEType();
- if (classifier instanceof EClass) {
- String featureName = feature.getName();
- if (((EClass) classifier).equals(basedClass) && featureName.startsWith("base_")) { //$NON-NLS-1$
- return getQualifiedBasedMethodName(featureName);
- }
- }
- }
- }
- /**
- * Look into super type TODO Check if it work with two super type
- */
- for (EClass superType : stereotypeClass.getESuperTypes()) {
- result = getBase_ElementMethodName(superType, basedClass);
- if (result != null && !("".equals(result))) { //$NON-NLS-1$
- return result;
- }
- }
- return "ErrorNotbaseMethodFound(look into SysMLOverUMLHelper#getBase_ElementMethodName)"; //$NON-NLS-1$
- }
-
- /**
- * Get the qualified name of the method to get the based element Example:
- * Block -> return "getBase_Class"
- *
- * @param featureName
- * @return
- */
- private static String getQualifiedBasedMethodName(String featureName) {
- return "get" + setFirstLetterToUpperCase(featureName); //$NON-NLS-1$
- }
-
- /**
- * Set the first letter of the word to upper case
- *
- * @param s
- * @return
- */
- private static String setFirstLetterToUpperCase(String s) {
- StringBuilder result = new StringBuilder(s);
- Character first = result.charAt(0);
- result.setCharAt(0, Character.toUpperCase(first));
- return result.toString();
- }
-
- /**
- * get the displayed name as it is displayed with UML Item provider
- *
- * @param eClass
- * @return
- */
- public static String getDisplayedClassName(EClass eClass) {
- return setFirstLetterToLowerCase(eClass.getName());
- }
-
- /**
- * Set the first letter of the word to upper case
- *
- * @param s
- * @return
- */
- private static String setFirstLetterToLowerCase(String s) {
- StringBuilder result = new StringBuilder(s);
- Character first = result.charAt(0);
- result.setCharAt(0, Character.toLowerCase(first));
- return result.toString();
- }
-
- /**
- * Get the qualified name (in the UML way) of the EClass example:
- * SysML::Block::block
- *
- * @param eClass
- * @return
- */
- public static String getQualifiedUMLLikeName(EClass eClass) {
- String eClassName = eClass.getName();
- EPackage package_ = eClass.getEPackage();
- /**
- * Concat the packages names
- */
- String packageName = ""; //$NON-NLS-1$
- String packageNameAux = ""; //$NON-NLS-1$
- if (package_ != null) {
- packageName = new String(package_.getNsPrefix());
- packageName = packageName.concat("::").concat(eClassName); //$NON-NLS-1$
- while (package_.getESuperPackage() != null) {
- package_ = package_.getESuperPackage();
- packageNameAux = new String(package_.getNsPrefix());
- packageNameAux = packageNameAux.concat("::") //$NON-NLS-1$
- .concat(packageName);
- packageName = new String(packageNameAux);
- }
- }
- return packageName;
- }
-
- public static String getClassifierCorrectLabel(String classifier) {
- StringBuilder builder = new StringBuilder();
- for (int i = 0; i < classifier.length(); i++) {
- if (Character.isUpperCase(classifier.charAt(i)) && i > 0) {
- builder.append('_');
- }
- builder.append(classifier.charAt(i));
- }
- return builder.toString().toUpperCase();
- }
-
- public static String getElementTypeCorrectLabel(String classifier) {
- StringBuilder builder = new StringBuilder();
- for (int i = 0; i < classifier.length(); i++) {
- if (Character.isUpperCase(classifier.charAt(i)) && i > 0) {
- builder.append(' ');
- }
- builder.append(classifier.charAt(i));
- }
- return builder.toString();
- }
-
- /**
- * Get the correct label name of an {@link EClass} as it is written in UMLPackage.litterals
- * Example:
- *
- * EClass ActivityEdge -> return ACTIVITY_EDGE
- *
- * @param eClass
- * @return
- */
- public static String getClassifierCorrectLabel(EClass eClass) {
- return getClassifierCorrectLabel(eClass.getName());
- }
-
- /**
- * Get the correct label name of an {@link EClass} as it is written in plugins.properties to externalize strings
- * Example:
- *
- * EClass ActivityEdge -> return Activity Edge
- *
- * @param eClass
- * @return
- */
- public static String getElementTypeCorrectLabel(EClass eClass) {
- return getElementTypeCorrectLabel(eClass.getName());
- }
-
- /**
- * Get the package name with an adding string.
- *
- * @param genPackage
- * {@link GenClass}
- * @param elementName
- * {@link String} you want to add to create the apckage name
- * @return Package name
- */
- static String getXPackageName(GenModel genPackage, String elementName) {
- final String basePackage = genPackage.getInterfaceNamePattern();
- if (basePackage.length() > 0) {
- return basePackage + "." + elementName.toLowerCase(); //$NON-NLS-1$
- } else {
- return elementName.toLowerCase();
- }
- }
-
- public static String getAdapterFactoryRegistryPackageName() {
- return "org.eclipse.papyrus.sysml.registry"; //$NON-NLS-1$
- }
-
- public static String getAdapterFactoryRegistryClassName() {
- return "SysmlRegistryAdapterFactoryRegistry"; //$NON-NLS-1$
- }
-}
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/plugin.properties b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/plugin.properties deleted file mode 100644 index 602385467f1..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/plugin.properties +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2011 Atos Origin.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# Atos Origin - Initial API and implementation
-#
-
-pluginName = Papyrus SysML Codegen
-providerName = Eclipse Modeling Project
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/plugin.xml b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/plugin.xml deleted file mode 100644 index 8feb7358095..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/plugin.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.emf.codegen.ecore.generatorAdapters">
- <adapterFactory
- class="org.eclipse.papyrus.sysml.sysmloveruml.codegen.core.SysMLOverUMLGenModelGeneratorAdapterFactory">
- </adapterFactory>
- </extension>
-
-</plugin>
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/SysMLOverUMLGeneratorPlugin.java b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/SysMLOverUMLGeneratorPlugin.java deleted file mode 100644 index eb080306d59..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/SysMLOverUMLGeneratorPlugin.java +++ /dev/null @@ -1,75 +0,0 @@ -/**
- * Copyright (c) 2011 Atos.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Atos - Initial API and implementation
- *
- */
-package org.eclipse.papyrus.sysml.sysmloveruml.codegen;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class SysMLOverUMLGeneratorPlugin extends EMFPlugin {
-
- /**
- * The singleton instance of the plugin.
- */
- public static final SysMLOverUMLGeneratorPlugin INSTANCE = new SysMLOverUMLGeneratorPlugin();
-
- // The plug-in ID
- public static final String ID = "org.eclipse.papyrus.sysml.sysmloveruml.codegen"; //$NON-NLS-1$
-
- /**
- * The shared instance.
- */
- private static Implementation plugin;
-
- /**
- * Creates the singleton instance.
- */
- private SysMLOverUMLGeneratorPlugin() {
- super(new ResourceLocator[] {});
- }
-
- /*
- * Javadoc copied from base class.
- */
- @Override
- public ResourceLocator getPluginResourceLocator() {
- return plugin;
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin.
- *
- * @return the singleton instance.
- */
- public static Implementation getPlugin() {
- return plugin;
- }
-
- /**
- * The actual implementation of the Eclipse <b>Plugin</b>.
- */
- public static class Implementation extends EclipsePlugin {
-
- /**
- * Creates an instance.
- */
- public Implementation() {
- super();
- // Remember the static instance.
- //
- plugin = this;
- }
- }
-}
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/core/AbstractGeneratorAdaptor.java b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/core/AbstractGeneratorAdaptor.java deleted file mode 100644 index 1e0ce48505b..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/core/AbstractGeneratorAdaptor.java +++ /dev/null @@ -1,94 +0,0 @@ -/**
- * Copyright (c) 2011 Atos.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Atos - Initial API and implementation
- *
- */
-package org.eclipse.papyrus.sysml.sysmloveruml.codegen.core;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.codegen.ecore.generator.GeneratorAdapterFactory;
-import org.eclipse.emf.codegen.ecore.genmodel.GenBase;
-import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
-import org.eclipse.emf.codegen.ecore.genmodel.generator.GenBaseGeneratorAdapter;
-import org.eclipse.papyrus.sysml.sysmloveruml.codegen.utils.LabelHelper;
-
-/**
- * Abstract Generator adaptor. Used has based for future generator. it's
- * provide: -> A store mechanism of JETEmitter -> A condition mechanism which
- * select JETEmitter in function of the an argument which extends genBase
- *
- * @author "Arthur Daussy <a href="mailto:arthur.daussy@atos.net
- * ">arthur.daussy@atos.net</a>"
- * @param <T>
- */
-public abstract class AbstractGeneratorAdaptor<T extends GenBase> extends GenBaseGeneratorAdapter {
-
- /**
- * Map to store all JETEmitterDescriptor with their corresponding execution
- * condition.
- */
- protected Map<JETEmitterDescriptor, Condition<T>> jetEmitterMap = new HashMap<JETEmitterDescriptor, Condition<T>>();
-
- /**
- * Super implementation plus initialize the store.
- */
- public AbstractGeneratorAdaptor() {
- super();
- initializeJETEEMITTERDescriptorStore();
- }
-
- /**
- * Super implementation plus initialize the store.
- *
- * @param generatorAdapterFactory
- * See super implementation
- */
- public AbstractGeneratorAdaptor(GeneratorAdapterFactory generatorAdapterFactory) {
- super(generatorAdapterFactory);
- initializeJETEEMITTERDescriptorStore();
- }
-
- /**
- * Get the getJETEmitterDescriptors which are stored and which are
- * corresponding condition which is validate with the {@link GenClass} passed in argument.
- *
- * @param genBase
- * {@link GenBase} inherited element to compute the {@link JETEmitterDescriptor} according to conditions
- * @return List of all {@link JETEmitterDescriptor} which correspond to the {@link GenBase} element
- */
- protected JETEmitterDescriptor[] getJETEmitterDescriptors(T genBase) {
- final ArrayList<JETEmitterDescriptor> result = new ArrayList<JETEmitterDescriptor>();
- for (JETEmitterDescriptor descriptor : jetEmitterMap.keySet()) {
- if (jetEmitterMap.get(descriptor).canGenerate(genBase)) {
- result.add(descriptor);
- }
- }
- if (result.isEmpty()) {
- return new JETEmitterDescriptor[0];
- }
- return result.toArray(new JETEmitterDescriptor[result.size()]);
- }
-
- @Override
- protected void addBaseTemplatePathEntries(List<String> templatePath) {
- templatePath.add(LabelHelper.TEMPLATE_LOCATION);
- super.addBaseTemplatePathEntries(templatePath);
- }
-
- /**
- * Initialize all JETEmitterDescriptor with a condition of execution and put
- * it in jetEmitterMap.
- */
- protected abstract void initializeJETEEMITTERDescriptorStore();
-}
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/core/Condition.java b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/core/Condition.java deleted file mode 100644 index a5bd8918feb..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/core/Condition.java +++ /dev/null @@ -1,35 +0,0 @@ -/**
- * Copyright (c) 2011 Atos.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Atos - Initial API and implementation
- *
- */
-package org.eclipse.papyrus.sysml.sysmloveruml.codegen.core;
-
-import org.eclipse.emf.codegen.ecore.genmodel.GenBase;
-
-/**
- * Condition on a GenBase to say if a generator has to be used with this {@link GenBase}.
- *
- * @author Arthur Daussy <a
- * href="mailto:arthur.daussy@atos.net">arthur.daussy@atos.net</a>
- * @param <T>
- * Element inherited from {@link GenBase} to calculate the condition
- */
-public interface Condition<T extends GenBase> {
-
- /**
- * Tell if the condition is true with the parameter.
- *
- * @param gen
- * T
- * @return true if the condition relate to T is true
- */
- boolean canGenerate(T gen);
-}
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/core/Messages.java b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/core/Messages.java deleted file mode 100644 index d292a279963..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/core/Messages.java +++ /dev/null @@ -1,39 +0,0 @@ -/**
- * Copyright (c) 2011 Atos.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Atos - Initial API and implementation
- *
- */
-package org.eclipse.papyrus.sysml.sysmloveruml.codegen.core;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Externalize messages.
- *
- * @author "Arthur Daussy <a href="mailto:arthur.daussy@atos.net">arthur.daussy@atos.net</a>"
- *
- */
-public class Messages extends NLS {
-
- private static final String BUNDLE_NAME = "org.eclipse.papyrus.sysml.sysmloveruml.codegen.core.messages"; //$NON-NLS-1$
-
- public static String SysMLOverUmlGenModelGenerator_GENERATOR_LABEL;
-
- public static String SysMLOverUmlGenModelGenerator_package;
-
- public static String SysMLOverUmlGenModelGenerator_SysMLAdapterFactoryRegisteryTemplate;
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- }
-}
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/core/SysMLOverUMLGenModelGeneratorAdapterFactory.java b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/core/SysMLOverUMLGenModelGeneratorAdapterFactory.java deleted file mode 100644 index c55ea33e4c1..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/core/SysMLOverUMLGenModelGeneratorAdapterFactory.java +++ /dev/null @@ -1,54 +0,0 @@ -/*****************************************************************************
- * Copyright (c) 2011 Atos.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Atos - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.sysmloveruml.codegen.core;
-
-import org.eclipse.emf.codegen.ecore.genmodel.generator.GenModelGeneratorAdapterFactory;
-import org.eclipse.emf.common.notify.Adapter;
-
-/**
- * @author "Arthur Daussy <a href="mailto:arthur.daussy@atos.net
- * ">arthur.daussy@atos.net</a>"
- *
- */
-public class SysMLOverUMLGenModelGeneratorAdapterFactory extends GenModelGeneratorAdapterFactory {
-
- @Override
- public Adapter createGenPackageAdapter() {
- return null;
- }
-
- @Override
- public Adapter createGenEnumAdapter() {
- return null;
- }
-
- @Override
- public Adapter createGenModelAdapter() {
- if (genPackageGeneratorAdapter == null) {
- genPackageGeneratorAdapter = new SysMLOverUmlGenModelGenerator(this);
- }
- return genPackageGeneratorAdapter;
- }
-
- /**
- * Define the new GenClassFatoryGeneratorAdaptor.
- *
- * @see org.eclipse.emf.codegen.ecore.genmodel.generator.GenModelGeneratorAdapterFactory#createGenClassAdapter()
- * @return {@link Adapter}
- */
- @Override
- public Adapter createGenClassAdapter() {
- return null;
- }
-}
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/core/SysMLOverUmlGenModelGenerator.java b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/core/SysMLOverUmlGenModelGenerator.java deleted file mode 100644 index ddc52878d30..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/core/SysMLOverUmlGenModelGenerator.java +++ /dev/null @@ -1,77 +0,0 @@ -/*****************************************************************************
- * Copyright (c) 2011 Atos.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Atos - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.sysmloveruml.codegen.core;
-
-import org.eclipse.emf.codegen.ecore.generator.GeneratorAdapterFactory;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.Monitor;
-import org.eclipse.papyrus.sysml.sysmloveruml.codegen.generationUtils.SysMLOverUMLHelper;
-
-/**
- * Generator for model elements.
- *
- * @author "Arthur Daussy <a href="mailto:arthur.daussy@atos.net">arthur.daussy@atos.net</a>"
- *
- */
-public class SysMLOverUmlGenModelGenerator extends AbstractGeneratorAdaptor<GenModel> {
-
- /**
- * Id.
- */
- private static final String GENERATOR_LABEL = Messages.SysMLOverUmlGenModelGenerator_GENERATOR_LABEL;
-
- /**
- * Name of the generator.
- */
- private static final int CHANGE_ELEMENT_ID = 0;
-
- @Override
- protected Diagnostic generateEdit(Object object, Monitor monitor) {
- final GenModel genModel = (GenModel) object;
- monitor.beginTask("", 2); //$NON-NLS-1$
- message = GENERATOR_LABEL;
- monitor.subTask(message);
- // final GenModel genModel = genClass.getGenModel();
- ensureProjectExists(genModel.getEditDirectory(), genModel, MODEL_PROJECT_TYPE, genModel.isUpdateClasspath(), createMonitor(monitor, 1));
- /**
- * Generate only if there at least one good template to generate
- */
- final JETEmitterDescriptor[] emitters = getJETEmitterDescriptors(genModel);
- if (emitters.length > 0) {
- generateJava(genModel.getEditDirectory(), SysMLOverUMLHelper.getAdapterFactoryRegistryPackageName(), SysMLOverUMLHelper.getAdapterFactoryRegistryClassName(), getJETEmitter(getJETEmitterDescriptors(genModel), CHANGE_ELEMENT_ID), null,
- createMonitor(monitor, 1));
- }
- return Diagnostic.OK_INSTANCE;
- }
-
- @Override
- protected void initializeJETEEMITTERDescriptorStore() {
- final Condition<GenModel> trueCondition = new Condition<GenModel>() {
-
- public boolean canGenerate(GenModel gen) {
- return true;
- }
- };
- jetEmitterMap.put(new JETEmitterDescriptor(Messages.SysMLOverUmlGenModelGenerator_SysMLAdapterFactoryRegisteryTemplate, Messages.SysMLOverUmlGenModelGenerator_package), trueCondition);
- }
-
- public SysMLOverUmlGenModelGenerator() {
- super();
- }
-
- public SysMLOverUmlGenModelGenerator(GeneratorAdapterFactory generatorAdapterFactory) {
- super(generatorAdapterFactory);
- }
-}
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/core/messages.properties b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/core/messages.properties deleted file mode 100644 index 47e13d84d70..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/core/messages.properties +++ /dev/null @@ -1,3 +0,0 @@ -SysMLOverUmlGenModelGenerator_GENERATOR_LABEL=SysML GenPackage Generator
-SysMLOverUmlGenModelGenerator_package=org.eclipse.papyrus.sysml.overumllayer
-SysMLOverUmlGenModelGenerator_SysMLAdapterFactoryRegisteryTemplate=edit/SysMLAdapterFactoryRegistery.javajet
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/utils/LabelHelper.java b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/utils/LabelHelper.java deleted file mode 100644 index 68261527304..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/src/org/eclipse/papyrus/sysml/sysmloveruml/codegen/utils/LabelHelper.java +++ /dev/null @@ -1,46 +0,0 @@ -/*****************************************************************************
- * Copyright (c) 2011 Atos Origin.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Atos Origin - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.sysml.sysmloveruml.codegen.utils;
-
-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
-import org.eclipse.papyrus.sysml.sysmloveruml.codegen.SysMLOverUMLGeneratorPlugin;
-
-/**
- * Helper to print label during generation.
- *
- * @author "Arthur Daussy <a href="mailto:arthur.daussy@atos.net
- * ">arthur.daussy@atos.net</a>"
- */
-public final class LabelHelper {
-
- /**
- * Path to template repository.
- */
- public static final String TEMPLATE_LOCATION = SysMLOverUMLGeneratorPlugin.INSTANCE.getBaseURL().toString() + "templates"; //$NON-NLS-1$
-
- /**
- * Class path name.
- */
- public static final String CLASSPATH_VARIABLE_NAME = "SYSML_OVER_UML_GENERATOR"; //$NON-NLS-1$
-
- /**
- * Get the name of the extension class of the Adapter Factory Class
- *
- * @param genPackage
- * @return
- */
- public static String getAdapterFactoryExtensionName(GenPackage genPackage) {
- return genPackage.getAdapterFactoryClassName() + "forUmlOverSysLM"; //$NON-NLS-1$
- }
-}
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates-orig/edit/ItemProvider.javajet b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates-orig/edit/ItemProvider.javajet deleted file mode 100644 index 88841bb8886..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates-orig/edit/ItemProvider.javajet +++ /dev/null @@ -1,476 +0,0 @@ -<%@ jet package="org.eclipse.emf.codegen.ecore.templates.edit" imports="java.util.* org.eclipse.emf.codegen.ecore.genmodel.*" class="ItemProvider" version="$Id: ItemProvider.javajet,v 1.44 2009/10/20 13:39:38 davidms Exp $" %> -<% -/** - * <copyright> - * - * Copyright (c) 2002-2007 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - * - * </copyright> - */ -%> -<%GenClass genClass = (GenClass)argument; GenPackage genPackage = genClass.getGenPackage(); GenModel genModel=genPackage.getGenModel();%> -<%@ include file="../Header.javajetinc"%> -package <%=genPackage.getProviderPackageName()%>; - - -<%genModel.addImport("org.eclipse.emf.common.notify.AdapterFactory");%> -<%genModel.addImport("org.eclipse.emf.common.notify.Notification");%> -<%genModel.addImport("org.eclipse.emf.edit.provider.IEditingDomainItemProvider");%> -<%genModel.addImport("org.eclipse.emf.edit.provider.IItemLabelProvider");%> -<%genModel.addImport("org.eclipse.emf.edit.provider.IItemPropertySource");%> -<%genModel.addImport("org.eclipse.emf.edit.provider.IStructuredItemContentProvider");%> -<%genModel.addImport("org.eclipse.emf.edit.provider.ITreeItemContentProvider");%> -<%String _List = genModel.getImportedName(genModel.useGenerics() ? "java.util.List<org.eclipse.emf.edit.provider.IItemPropertyDescriptor>" : "java.util.List");%> -<%genModel.markImportLocation(stringBuffer);%> - -/** - * This is the item provider adapter for a {@link <%=genClass.getQualifiedInterfaceName()%>} object. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -public class <%=genClass.getProviderClassName()%> - extends <%=genClass.getProviderBaseClassName() != null ? genClass.getProviderBaseClassName() : genModel.getImportedName("org.eclipse.emf.edit.provider.ItemProviderAdapter")%> - implements -<%for (Iterator<String> i = genPackage.getProviderSupportedTypes().iterator(); i.hasNext(); ) {%> - <%=genModel.getImportedName(i.next())%><%if (i.hasNext()){%>,<%}%> -<%}%> -{ -<%if (genModel.hasCopyrightField()) {%> - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final <%=genModel.getImportedName("java.lang.String")%> copyright = <%=genModel.getCopyrightFieldLiteral()%>;<%=genModel.getNonNLS()%> - -<%}%> - /** - * This constructs an instance from a factory and a notifier. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public <%=genClass.getProviderClassName()%>(AdapterFactory adapterFactory) - { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -<%if (genModel.useClassOverrideAnnotation()) {%> - @Override -<%}%> - public <%=_List%> getPropertyDescriptors(Object object) - { - if (itemPropertyDescriptors == null) - { - super.getPropertyDescriptors(object); - -<%for (GenFeature genFeature : genClass.getPropertyFeatures()) { %> - add<%=genFeature.getCapName()%>PropertyDescriptor(object); -<%}%> - } - return itemPropertyDescriptors; - } - -<%for (GenFeature genFeature : genClass.getPropertyFeatures()) { %> - /** - * This adds a property descriptor for the <%=genFeature.getFormattedName()%> feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected void add<%=genFeature.getCapName()%>PropertyDescriptor(Object object) - { -<%@ include file="ItemProvider/addPropertyDescriptor.override.javajetinc" fail="alternative" %> -<%@ start %> - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((<%=genModel.getImportedName("org.eclipse.emf.edit.provider.ComposeableAdapterFactory")%>)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_<%=genFeature.getGenClass().getName()%>_<%=genFeature.getName()%>_feature"),<%=genModel.getNonNLS()%> - <%if (genFeature.getPropertyDescription() == null || genFeature.getPropertyDescription().length() == 0) {%> - getString("_UI_PropertyDescriptor_description", "_UI_<%=genFeature.getGenClass().getName()%>_<%=genFeature.getName()%>_feature", "_UI_<%=genFeature.getGenClass().getName()%>_type"),<%=genModel.getNonNLS()%><%=genModel.getNonNLS(2)%><%=genModel.getNonNLS(3)%> - <%} else {%> - getString("_UI_<%=genFeature.getGenClass().getName()%>_<%=genFeature.getName()%>_description"),<%=genModel.getNonNLS()%> - <%}%> - <%=genFeature.getQualifiedFeatureAccessor()%>, - <%=genFeature.getProperty() == GenPropertyKind.EDITABLE_LITERAL ? "true" : "false"%>, - <%=genFeature.isPropertyMultiLine() ? "true" : "false"%>, - <%=genFeature.isPropertySortChoices() ? "true" : "false"%>, - <%if (genFeature.isReferenceType()) {%> - null, - <%} else {%> - <%=genModel.getImportedName("org.eclipse.emf.edit.provider.ItemPropertyDescriptor")%>.<%=genFeature.getPropertyImageName()%>, - <%}%> - <%if (genFeature.getPropertyCategory() == null || genFeature.getPropertyCategory().length() == 0) {%> - null, - <%} else {%> - getString("<%=genModel.getPropertyCategoryKey(genFeature.getPropertyCategory())%>"),<%=genModel.getNonNLS()%> - <%}%> - <%if (genFeature.getPropertyFilterFlags().isEmpty()) {%> - null)); - <%} else {%> - new String[] { - <%for (Iterator<String> j = genFeature.getPropertyFilterFlags().iterator(); j.hasNext();) { String filterFlag = j.next();%> - <%if (filterFlag != null && filterFlag.length() > 0) {%> - "<%=filterFlag%>"<%if (j.hasNext()) {%>,<%}%><%=genModel.getNonNLS()%> - <%}%> - <%}%> - })); - <%}%> -<%@ end %><%//ItemProvider/addPropertyDescriptor.override.javajetinc%> - } - -<%}%> -<%if (!genClass.getChildrenFeatures().isEmpty()) {%> - /** - * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an - * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or - * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -<%if (genModel.useClassOverrideAnnotation()) {%> - @Override -<%}%> - public <%=genModel.getImportedName(genModel.useGenerics() ? "java.util.Collection<? extends org.eclipse.emf.ecore.EStructuralFeature>" : "java.util.Collection")%> getChildrenFeatures(Object object) - { - if (childrenFeatures == null) - { - super.getChildrenFeatures(object); -<%for (GenFeature genFeature : genClass.getChildrenFeatures()) { %> - childrenFeatures.add(<%=genFeature.getQualifiedFeatureAccessor()%>); -<%}%> - } - return childrenFeatures; - } - -<%if (!genClass.getChildrenFeatures().isEmpty()) {%> - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -<%if (genModel.useClassOverrideAnnotation()) {%> - @Override -<%}%> - protected <%=genModel.getImportedName("org.eclipse.emf.ecore.EStructuralFeature")%> getChildFeature(Object object, Object child) - { - // Check the type of the specified child object and return the proper feature to use for - // adding (see {@link AddCommand}) it as a child. - - return super.getChildFeature(object, child); - } - -<%}%> -<%}%> -<%if (genClass.needsHasChildrenMethodOverride()) {%> - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -<%if (genModel.useClassOverrideAnnotation()) {%> - @Override -<%}%> - public boolean hasChildren(Object object) - { - return hasChildren(object, <%=genModel.isOptimizedHasChildren()%>); - } - -<%}%> -<%if (genClass.isImage()) {%> - /** - * This returns <%=genClass.getName()%>.gif. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -<%if (genModel.useClassOverrideAnnotation()) {%> - @Override -<%}%> - public Object getImage(Object object) - { - return overlayImage(object, getResourceLocator().getImage("full/obj16/<%=genClass.getName()%>"));<%=genModel.getNonNLS()%> - } - -<%}%> -<%if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF26_VALUE && !genModel.isCreationIcons()) {%> - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -<%if (genModel.useClassOverrideAnnotation()) {%> - @Override -<%}%> - protected boolean shouldComposeCreationImage() - { - return true; - } - -<%}%> - /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -<%if (genModel.useClassOverrideAnnotation()) {%> - @Override -<%}%> - public String getText(Object object) - { -<%@ include file="ItemProvider/getText.override.javajetinc" fail="alternative" %> -<%@ start %> -<%if (genClass.isMapEntry()) {%> - <%=genClass.getImportedInterfaceName()%><%if (genModel.useGenerics()) {%><?, ?><%}%> <%=genClass.getSafeUncapName()%> = (<%=genClass.getImportedInterfaceName()%><%if (genModel.useGenerics()) {%><?, ?><%}%>)object; - <%if (!genClass.getMapEntryKeyFeature().isPropertyMultiLine() && !genClass.getMapEntryValueFeature().isPropertyMultiLine()) {%> - return "" + <%=genClass.getSafeUncapName()%>.getKey() + " -> " + <%=genClass.getSafeUncapName()%>.getValue();<%=genModel.getNonNLS()%><%=genModel.getNonNLS(2)%> - <%} else {%> - <%if (genClass.getMapEntryKeyFeature().isPropertyMultiLine()) {%> - String key = crop("" + <%=genClass.getSafeUncapName()%>.getKey());<%=genModel.getNonNLS()%> - <%} else {%> - String key = "" + <%=genClass.getSafeUncapName()%>.getKey();<%=genModel.getNonNLS()%> - <%}%> - <%if (genClass.getMapEntryValueFeature().isPropertyMultiLine()) {%> - String value = crop("" + <%=genClass.getSafeUncapName()%>.getValue());<%=genModel.getNonNLS()%> - <%} else {%> - String value = "" + <%=genClass.getSafeUncapName()%>.getValue();<%=genModel.getNonNLS()%> - <%}%> - return key + " -> " + value;<%=genModel.getNonNLS()%> - <%}%> -<%} else if (genClass.getLabelFeature() != null) { GenFeature labelFeature = genClass.getLabelFeature();%> - <%if (labelFeature.isPrimitiveType() && !labelFeature.getGenClass().isDynamic() && !labelFeature.isSuppressedGetVisibility()) {%> - <%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceWildTypeArguments()%> <%=genClass.getSafeUncapName()%> = (<%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceWildTypeArguments()%>)object; - return getString("_UI_<%=genClass.getName()%>_type") + " " + <%=genClass.getSafeUncapName()%>.<%=genClass.getLabelFeature().getGetAccessor()%>();<%=genModel.getNonNLS()%><%=genModel.getNonNLS(2)%> - <%} else {%> - <%if (labelFeature.isStringType() && !labelFeature.getGenClass().isDynamic() && !labelFeature.isSuppressedGetVisibility()) {%> - <%if (labelFeature.isPropertyMultiLine()) {%> - String label = crop(((<%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceWildTypeArguments()%>)object).<%=labelFeature.getGetAccessor()%>()); - <%} else {%> - String label = ((<%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceWildTypeArguments()%>)object).<%=labelFeature.getGetAccessor()%>(); - <%}%> - <%} else {%> - <%if (labelFeature.isSuppressedGetVisibility() || labelFeature.getGenClass().isDynamic()) {%> - <%=genModel.getImportedName("java.lang.Object")%> labelValue = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.EObject")%>)object).eGet(<%=labelFeature.getQualifiedFeatureAccessor()%>); - <%} else {%> - <%=labelFeature.getRawImportedType()%> labelValue = ((<%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceWildTypeArguments()%>)object).<%=labelFeature.getGetAccessor()%>(); - <%}%> - String label = labelValue == null ? null : labelValue.toString(); - <%}%> - return label == null || label.length() == 0 ? - getString("_UI_<%=genClass.getName()%>_type") :<%=genModel.getNonNLS()%> - getString("_UI_<%=genClass.getName()%>_type") + " " + label;<%=genModel.getNonNLS()%><%=genModel.getNonNLS(2)%> - <%}%> -<%} else {%> - return getString("_UI_<%=genClass.getName()%>_type");<%=genModel.getNonNLS()%> -<%}%> -<%@ end %><%//ItemProvider/getText.override.javajetinc%> - } - - /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -<%if (genModel.useClassOverrideAnnotation()) {%> - @Override -<%}%> - public void notifyChanged(Notification notification) - { - updateChildren(notification); -<%if (!genClass.getLabelNotifyFeatures().isEmpty() || !genClass.getContentNotifyFeatures().isEmpty() || !genClass.getLabelAndContentNotifyFeatures().isEmpty()) {%> - - switch (notification.getFeatureID(<%=genClass.getRawImportedInterfaceName()%>.class)) - { - <%if (!genClass.getLabelNotifyFeatures().isEmpty()) {%> - <%for (GenFeature genFeature : genClass.getLabelNotifyFeatures()) { %> - case <%=genClass.getQualifiedFeatureID(genFeature)%>: - <%}%> - fireNotifyChanged(new <%=genModel.getImportedName("org.eclipse.emf.edit.provider.ViewerNotification")%>(notification, notification.getNotifier(), false, true)); - return; - <%}%> - <%if (!genClass.getContentNotifyFeatures().isEmpty()) {%> - <%for (GenFeature genFeature : genClass.getContentNotifyFeatures()) { %> - case <%=genClass.getQualifiedFeatureID(genFeature)%>: - <%}%> - fireNotifyChanged(new <%=genModel.getImportedName("org.eclipse.emf.edit.provider.ViewerNotification")%>(notification, notification.getNotifier(), true, false)); - return; - <%}%> - <%if (!genClass.getLabelAndContentNotifyFeatures().isEmpty()) {%> - <%for (GenFeature genFeature : genClass.getLabelAndContentNotifyFeatures()) { %> - case <%=genClass.getQualifiedFeatureID(genFeature)%>: - <%}%> - fireNotifyChanged(new <%=genModel.getImportedName("org.eclipse.emf.edit.provider.ViewerNotification")%>(notification, notification.getNotifier(), true, true)); - return; - <%}%> - } -<%}%> - super.notifyChanged(notification); - } - -<%if (genModel.isCreationCommands()) {%> - /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -<%if (genModel.useClassOverrideAnnotation()) {%> - @Override -<%}%> - protected void collectNewChildDescriptors(<%=genModel.getImportedName(genModel.useGenerics() ? "java.util.Collection<java.lang.Object>" : "java.util.Collection")%> newChildDescriptors, Object object) - { - super.collectNewChildDescriptors(newChildDescriptors, object); - <%for (GenClass.ChildCreationData childCreationData : genClass.getChildCreationData()) { GenFeature createFeature = childCreationData.createFeature; GenFeature delegatedFeature = childCreationData.delegatedFeature; GenClassifier createClassifier = childCreationData.createClassifier;%> - <%if (createFeature.isFeatureMapType()) {%> - <%if (delegatedFeature.isReferenceType()) { GenClass createClass = (GenClass)createClassifier;%> -<%@ include file="ItemProvider/newChildDescriptorsReferenceDelegatedFeature.override.javajetinc" fail="alternative"%> -<%@ start %> - - newChildDescriptors.add - (createChildParameter - (<%=createFeature.getQualifiedFeatureAccessor()%>, - <%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMapUtil")%>.createEntry - (<%=delegatedFeature.getQualifiedFeatureAccessor()%>, - <%if (createClass.isMapEntry()) { %> - <%=createClass.getGenPackage().getQualifiedEFactoryInstanceAccessor()%>.create(<%=createClass.getQualifiedClassifierAccessor()%>)))); - <%} else {%> - <%=createClass.getGenPackage().getQualifiedFactoryInstanceAccessor()%>.create<%=createClass.getName()%>()))); - <%}%> -<%@ include file="ItemProvider/newChildDescriptorsReferenceDelegatedFeature.insert.javajetinc" fail="silent"%> -<%@ end %><%//ItemProvider/newChildDescriptorsReferenceDelegatedFeature.override.javajetinc%> - <%} else { GenDataType createDataType = (GenDataType)createClassifier;%> -<%@ include file="ItemProvider/newChildDescriptorsAttributeDelegatedFeature.override.javajetinc" fail="alternative"%> -<%@ start %> - - newChildDescriptors.add - (createChildParameter - (<%=createFeature.getQualifiedFeatureAccessor()%>, - <%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMapUtil")%>.createEntry - (<%=delegatedFeature.getQualifiedFeatureAccessor()%>, - <%if (delegatedFeature.isEnumBasedType()) {%> - <%=delegatedFeature.getTypeGenEnum().getStaticValue(delegatedFeature.getEcoreFeature().getDefaultValueLiteral())%>))); - <%} else if (delegatedFeature.isStringBasedType()) {%> - <%=delegatedFeature.getCreateChildValueLiteral()%>)));<%=genModel.getNonNLS()%> - <%} else { String literal = delegatedFeature.getCreateChildValueLiteral();%> - <%=createDataType.getGenPackage().getQualifiedEFactoryInstanceAccessor()%>.createFromString(<%=createDataType.getQualifiedClassifierAccessor()%>, <%=literal%>))));<%if (literal != null) {%><%=genModel.getNonNLS()%><%} else {%> // TODO: ensure this is a valid literal value<%}%> - <%}%> -<%@ include file="ItemProvider/newChildDescriptorsAttributeDelegatedFeature.insert.javajetinc" fail="silent"%> -<%@ end %><%//ItemProvider/newChildDescriptorsAttributeDelegatedFeature.override.javajetinc%> - <%}%> - <%} else if (createFeature.isReferenceType()) { GenClass createClass = (GenClass)createClassifier;%> -<%@ include file="ItemProvider/newChildDescriptorsReferenceFeature.override.javajetinc" fail="alternative"%> -<%@ start %> - - newChildDescriptors.add - (createChildParameter - (<%=createFeature.getQualifiedFeatureAccessor()%>, - <%if (createClass.isMapEntry()) { %> - <%=createClass.getGenPackage().getQualifiedEFactoryInstanceAccessor()%>.create(<%=createClass.getQualifiedClassifierAccessor()%>))); - <%} else {%> - <%=createClass.getGenPackage().getQualifiedFactoryInstanceAccessor()%>.create<%=createClass.getName()%>())); - <%}%> -<%@ include file="ItemProvider/newChildDescriptorsReferenceFeature.insert.javajetinc" fail="silent"%> -<%@ end %><%//ItemProvider/newChildDescriptorsReferenceFeature.override.javajetinc %> - <%} else { GenDataType createDataType = (GenDataType)createClassifier;%> -<%@ include file="ItemProvider/newChildDescriptorsAttributeFeature.override.javajetinc" fail="alternative"%> -<%@ start %> - - newChildDescriptors.add - (createChildParameter - (<%=createFeature.getQualifiedFeatureAccessor()%>, - <%if (createFeature.isEnumBasedType()) {%> - <%=createFeature.getTypeGenEnum().getStaticValue(createFeature.getEcoreFeature().getDefaultValueLiteral())%>)); - <%} else if (createFeature.isStringBasedType()) {%> - <%=createFeature.getCreateChildValueLiteral()%>));<%=genModel.getNonNLS()%> - <%} else { String literal = createFeature.getCreateChildValueLiteral();%> - <%=createDataType.getGenPackage().getQualifiedEFactoryInstanceAccessor()%>.createFromString(<%=createDataType.getQualifiedClassifierAccessor()%>, <%=literal%>)));<%if (literal != null) {%><%=genModel.getNonNLS()%><%} else {%> // TODO: ensure this is a valid literal value<%}%> - <%}%> -<%@ include file="ItemProvider/newChildDescriptorsAttributeFeature.insert.javajetinc" fail="silent"%> -<%@ end %><%//ItemProvider/newChildDescriptorsAttributeFeature.override.javajetinc%> - <%}%> - <%}%> - } - - <%if (!genClass.getSharedClassCreateChildFeatures().isEmpty()) {%> - /** - * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -<%if (genModel.useClassOverrideAnnotation()) {%> - @Override -<%}%> - public String getCreateChildText(Object owner, Object feature, Object child, <%=genModel.getImportedName(genModel.useGenerics() ? "java.util.Collection<?>" : "java.util.Collection")%> selection) - { - Object childFeature = feature; - Object childObject = child; - - <%if (genClass.hasFeatureMapCreateChildFeatures()) {%> - if (childFeature instanceof <%=genModel.getImportedName("org.eclipse.emf.ecore.EStructuralFeature")%> && <%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMapUtil")%>.isFeatureMap((EStructuralFeature)childFeature)) - { - <%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Entry entry = (FeatureMap.Entry)childObject; - childFeature = entry.getEStructuralFeature(); - childObject = entry.getValue(); - } - - <%}%> - boolean qualify = - <%for (Iterator<GenFeature> i = genClass.getSharedClassCreateChildFeatures().iterator(); i.hasNext();) { GenFeature createFeature = i.next();%> - childFeature == <%=createFeature.getQualifiedFeatureAccessor()%><%=i.hasNext() ? " ||" : ";"%> - <%}%> - - if (qualify) - { - return getString - ("_UI_CreateChild_text2",<%=genModel.getNonNLS()%> - new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) }); - } - return super.getCreateChildText(owner, feature, child, selection); - } - - <%}%> -<%}%> -<%if (genClass.getProviderExtendsGenClass() == null || genClass.getProviderExtendsGenClass().getGenPackage() != genPackage && (!genPackage.isExtensibleProviderFactory() || genClass.getProviderExtendsGenClass().getGenPackage().isExtensibleProviderFactory() != genPackage.isExtensibleProviderFactory())) {%> - /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -<%if (genModel.useClassOverrideAnnotation()) {%> - @Override -<%}%> - public <%=genModel.getImportedName("org.eclipse.emf.common.util.ResourceLocator")%> getResourceLocator() - { -<%if (genPackage.isExtensibleProviderFactory()) {%> - return ((<%=genModel.getImportedName("org.eclipse.emf.edit.provider.IChildCreationExtender")%>)adapterFactory).getResourceLocator(); -<%} else {%> - return <%=genPackage.getImportedEditPluginClassName()%>.INSTANCE; -<%}%> - } - -<%}%> -<%@ include file="ItemProvider/insert.javajetinc" fail="silent" %> -} -<%genModel.emitSortedImports();%> diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates-orig/edit/ItemProviderAdapterFactory.javajet b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates-orig/edit/ItemProviderAdapterFactory.javajet deleted file mode 100644 index a2dd2821093..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates-orig/edit/ItemProviderAdapterFactory.javajet +++ /dev/null @@ -1,561 +0,0 @@ -<%@ jet package="org.eclipse.emf.codegen.ecore.templates.edit" imports="java.util.* org.eclipse.emf.codegen.ecore.genmodel.*" class="ItemProviderAdapterFactory" version="$Id: ItemProviderAdapterFactory.javajet,v 1.15 2010/04/28 20:38:09 khussey Exp $" %> -<% -/** - * <copyright> - * - * Copyright (c) 2002-2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - * - * </copyright> - */ -%> -<%GenPackage genPackage = (GenPackage)argument; GenModel genModel=genPackage.getGenModel(); /* Trick to import java.util.* without warnings */Iterator.class.getName();%> -<%@ include file="../Header.javajetinc"%> -package <%=genPackage.getProviderPackageName()%>; - -<%genModel.addImport("org.eclipse.emf.common.notify.Adapter");%> -<%genModel.addImport("org.eclipse.emf.common.notify.Notification");%> -<%genModel.addImport("org.eclipse.emf.common.notify.Notifier");%> -<%genModel.addImport("org.eclipse.emf.edit.provider.ChangeNotifier");%> -<%genModel.addImport("org.eclipse.emf.edit.provider.ComposeableAdapterFactory");%> -<%genModel.addImport("org.eclipse.emf.edit.provider.ComposedAdapterFactory");%> -<%genModel.addImport("org.eclipse.emf.edit.provider.IChangeNotifier");%> -<%genModel.addImport("org.eclipse.emf.edit.provider.IEditingDomainItemProvider");%> -<%genModel.addImport("org.eclipse.emf.edit.provider.IItemLabelProvider");%> -<%genModel.addImport("org.eclipse.emf.edit.provider.IItemPropertySource");%> -<%genModel.addImport("org.eclipse.emf.edit.provider.INotifyChangedListener");%> -<%genModel.addImport("org.eclipse.emf.edit.provider.IStructuredItemContentProvider");%> -<%genModel.addImport("org.eclipse.emf.edit.provider.ITreeItemContentProvider");%> -<%boolean useGenerics = genModel.useGenerics();%> -<%String _ArrayList = genModel.getImportedName(useGenerics ? "java.util.ArrayList<java.lang.Object>" : "java.util.ArrayList");%> -<%String _Collection = genModel.getImportedName(useGenerics ? "java.util.Collection<java.lang.Object>" : "java.util.Collection");%> -<%genModel.markImportLocation(stringBuffer);%> - -/** - * This is the factory that is used to provide the interfaces needed to support Viewers. - * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. - * The adapters also support Eclipse property sheets. - * Note that most of the adapters are shared among multiple instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -public class <%=genPackage.getItemProviderAdapterFactoryClassName()%> extends <%=genPackage.getImportedAdapterFactoryClassName()%> implements ComposeableAdapterFactory, IChangeNotifier<%if (genPackage.isDisposableProviderFactory()) {%>, <%=genModel.getImportedName("org.eclipse.emf.edit.provider.IDisposable")%><%}%><%if (genPackage.isExtensibleProviderFactory()) {%>, <%=genModel.getImportedName("org.eclipse.emf.edit.provider.IChildCreationExtender")%><%}%> -{ -<%if (genModel.hasCopyrightField()) {%> - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final <%=genModel.getImportedName("java.lang.String")%> copyright = <%=genModel.getCopyrightFieldLiteral()%>;<%=genModel.getNonNLS()%> - -<%}%> - /** - * This keeps track of the root adapter factory that delegates to this adapter factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected ComposedAdapterFactory parentAdapterFactory; - - /** - * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected IChangeNotifier changeNotifier = new ChangeNotifier(); - -<%if (genPackage.isDisposableProviderFactory() && genPackage.hasStatefulProvider()) {%> - /** - * This keeps track of all the item providers created, so that they can be {@link #dispose disposed}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected <%=genModel.getImportedName("org.eclipse.emf.edit.provider.Disposable")%> disposable = new Disposable(); - -<%}%> -<%if (genPackage.isExtensibleProviderFactory()) {%> - /** - * This helps manage the child creation extenders. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected <%=genModel.getImportedName("org.eclipse.emf.edit.provider.ChildCreationExtenderManager")%> childCreationExtenderManager = new <%=genModel.getImportedName("org.eclipse.emf.edit.provider.ChildCreationExtenderManager")%>(<%=genPackage.getImportedEditPluginClassName()%>.INSTANCE, <%=genPackage.getImportedPackageInterfaceName()%>.eNS_URI); - -<%}%> - /** - * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected <%=_Collection%> supportedTypes = new <%=_ArrayList%>(); - - /** - * This constructs an instance. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public <%=genPackage.getItemProviderAdapterFactoryClassName()%>() - { -<%for (String name : genPackage.getProviderSupportedTypes()) {%> - supportedTypes.add(<%=genModel.getImportedName(name)%>.class); -<%}%> - } - -<%for (GenPackage genDelegate : genPackage.getAdapterDelegatePackages()) {%> - /** - * This keeps track of the factory to which to delegate adapter creation for objects from that package. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected <%=genDelegate.getImportedAdapterFactoryClassName()%> <%=genPackage.getUncapAdapterFactoryDelegateName(genDelegate)%> = null; - - /** - * This determines the delegate factory for the package. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected <%=genDelegate.getImportedAdapterFactoryClassName()%> get<%=genPackage.getAdapterFactoryDelegateName(genDelegate)%>() - { - if (<%=genPackage.getUncapAdapterFactoryDelegateName(genDelegate)%> == null) - { - <%=genModel.getImportedName("org.eclipse.emf.common.notify.AdapterFactory")%> rootAdapterFactory = getRootAdapterFactory(); - if (rootAdapterFactory instanceof ComposedAdapterFactory) - { - <%=genModel.getImportedName("org.eclipse.emf.common.notify.AdapterFactory")%> delegateAdapterFactory = - ((ComposedAdapterFactory)rootAdapterFactory).getFactoryForType(<%=genDelegate.getImportedAdapterFactoryClassName()%>.getPackage()); - if (delegateAdapterFactory instanceof <%=genDelegate.getImportedAdapterFactoryClassName()%>) - { - <%=genPackage.getUncapAdapterFactoryDelegateName(genDelegate)%> = (<%=genDelegate.getImportedAdapterFactoryClassName()%>)delegateAdapterFactory; - } - } - } - return <%=genPackage.getUncapAdapterFactoryDelegateName(genDelegate)%>; - } - -<%}%> -<%for (GenClass genClass : genPackage.getGenClasses()) {%> -<%if (!genClass.isAbstract() && genClass.getProvider() != GenProviderKind.NONE_LITERAL) {%> -<%if (genClass.isProviderSingleton()) {%> - /** - * This keeps track of the one adapter used for all {@link <%=genClass.getQualifiedInterfaceName()%>} instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected <%=genClass.getProviderClassName()%> <%=genClass.getUncapName()%>ItemProvider; - - /** - * This creates an adapter for a {@link <%=genClass.getQualifiedInterfaceName()%>}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -<%if (genModel.useClassOverrideAnnotation()) {%> - @Override -<%}%> - public Adapter create<%=genClass.getName()%>Adapter() - { - if (<%=genClass.getUncapName()%>ItemProvider == null) - { - <%=genClass.getUncapName()%>ItemProvider = new <%=genClass.getProviderClassName()%>(this); - } - - return <%=genClass.getUncapName()%>ItemProvider; - } - -<%} else {%> - /** - * This creates an adapter for a {@link <%=genClass.getQualifiedInterfaceName()%>}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -<%if (genModel.useClassOverrideAnnotation()) {%> - @Override -<%}%> - public Adapter create<%=genClass.getName()%>Adapter() - { - return new <%=genClass.getProviderClassName()%>(this); - } - -<%}%> -<%}%> -<%}%> -<%for (GenClass genClass : genPackage.getAdapterDelegateSuperClasses()) {%> - /** - * <%=genClass.getName()%> of <%=genClass.getItemProviderAdapterFactoryClassName()%> - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Adapter create<%=genClass.getName()%>Adapter() - { - return - get<%=genClass.getItemProviderAdapterFactoryClassName()%>() == null ? - null : - get<%=genClass.getItemProviderAdapterFactoryClassName()%>().create<%=genClass.getName()%>Adapter(); - } - -<%}%> - /** - * This returns the root adapter factory that contains this factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public ComposeableAdapterFactory getRootAdapterFactory() - { - return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory(); - } - - /** - * This sets the composed adapter factory that contains this factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) - { - this.parentAdapterFactory = parentAdapterFactory; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -<%if (genModel.useClassOverrideAnnotation()) {%> - @Override -<%}%> - public boolean isFactoryForType(Object type) - { - return supportedTypes.contains(type) || super.isFactoryForType(type); - } - - /** - * This implementation substitutes the factory itself as the key for the adapter. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -<%if (genModel.useClassOverrideAnnotation()) {%> - @Override -<%}%> - public Adapter adapt(Notifier notifier, Object type) - { - return super.adapt(notifier, this); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -<%if (genModel.useClassOverrideAnnotation()) {%> - @Override -<%}%> - public Object adapt(Object object, Object type) - { - if (isFactoryForType(type)) - { - Object adapter = super.adapt(object, type); - if (!(type instanceof Class<%if (genModel.useGenerics()) {%><?><%}%>) || <%if (genModel.getRuntimePlatform() == GenRuntimePlatform.GWT) {%><%=genModel.getImportedName("org.eclipse.emf.common.util.Reflect")%>.isInstance((Class<%if (genModel.useGenerics()) {%><?><%}%>)type, adapter)<%} else {%>(((Class<%if (genModel.useGenerics()) {%><?><%}%>)type).isInstance(adapter))<%}%>) - { - return adapter; - } - } - - return null; - } - -<%if (genPackage.isDisposableProviderFactory() && genPackage.hasStatefulProvider()) {%> - /** - * Associates an adapter with a notifier via the base implementation, then records it to ensure it will be disposed. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -<%if (genModel.useClassOverrideAnnotation()) {%> - @Override -<%}%> - protected void associate(Adapter adapter, Notifier target) - { - super.associate(adapter, target); - if (adapter != null) - { - disposable.add(adapter); - } - } - -<%}%> -<%if (genPackage.isExtensibleProviderFactory()) {%> - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public <%=genModel.getImportedName(useGenerics ? "java.util.List<org.eclipse.emf.edit.provider.IChildCreationExtender>" : "java.util.List")%> getChildCreationExtenders() - { - return childCreationExtenderManager.getChildCreationExtenders(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public <%=genModel.getImportedName(useGenerics ? "java.util.Collection<?>" : "java.util.Collection")%> getNewChildDescriptors(Object object, <%=genModel.getImportedName("org.eclipse.emf.edit.domain.EditingDomain")%> editingDomain) - { - return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public <%=genModel.getImportedName("org.eclipse.emf.common.util.ResourceLocator")%> getResourceLocator() - { - return childCreationExtenderManager; - } - -<%}%> - /** - * This adds a listener. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void addListener(INotifyChangedListener notifyChangedListener) - { - changeNotifier.addListener(notifyChangedListener); - } - - /** - * This removes a listener. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void removeListener(INotifyChangedListener notifyChangedListener) - { - changeNotifier.removeListener(notifyChangedListener); - } - - /** - * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void fireNotifyChanged(Notification notification) - { - changeNotifier.fireNotifyChanged(notification); - - if (parentAdapterFactory != null) - { - parentAdapterFactory.fireNotifyChanged(notification); - } - } - -<%if (genPackage.isDisposableProviderFactory()) {%> - /** - * This disposes all of the item providers created by this factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void dispose() - { -<%if (genPackage.hasStatefulProvider()) {%> - disposable.dispose(); -<%} else {%> -<%for (GenClass genClass : genPackage.getGenClasses()) {%> -<%if (!genClass.isAbstract() && genClass.isProviderSingleton()) {%> - if (<%=genClass.getUncapName()%>ItemProvider != null) <%=genClass.getUncapName()%>ItemProvider.dispose(); -<%}%> -<%}%> -<%}%> - } - -<%}%> -<%if (genPackage.isChildCreationExtenders()) {%> - <%for (Map.Entry<GenPackage, Map<GenClass, List<GenClass.ChildCreationData>>> packageEntry : genPackage.getExtendedChildCreationData().entrySet()) {%> - /** - * A child creation extender for the {@link <%=packageEntry.getKey().getImportedPackageInterfaceName()%>}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static class <%=genPackage.getChildCreationExtenderName(packageEntry.getKey())%> implements <%=genModel.getImportedName("org.eclipse.emf.edit.provider.IChildCreationExtender")%> - { - /** - * The switch for creating child descriptors specific to each extended class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected static class CreationSwitch extends <%=genModel.getImportedName(packageEntry.getKey().getQualifiedSwitchClassName())%><%=useGenerics ? "<Object>" : ""%> - { - /** - * The child descriptors being populated. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected <%=genModel.getImportedName(useGenerics ? "java.util.List<Object>" : "java.util.List")%> newChildDescriptors; - - /** - * The domain in which to create the children. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected <%=genModel.getImportedName("org.eclipse.emf.edit.domain.EditingDomain")%> editingDomain; - - /** - * Creates the a switch for populating child descriptors in the given domain. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - CreationSwitch(<%=genModel.getImportedName(useGenerics ? "java.util.List<Object>" : "java.util.List")%> newChildDescriptors, <%=genModel.getImportedName("org.eclipse.emf.edit.domain.EditingDomain")%> editingDomain) - { - this.newChildDescriptors = newChildDescriptors; - this.editingDomain = editingDomain; - } - <%for (Map.Entry<GenClass, List<GenClass.ChildCreationData>> classEntry : packageEntry.getValue().entrySet()) { GenClass genClass = classEntry.getKey();%> - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ -<%if (genModel.useClassOverrideAnnotation()) {%> - @Override -<%}%> - public <%=genClass.getTypeParameters()%>Object case<%=genPackage.getClassUniqueName(genClass)%>(<%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceTypeArguments()%> object) - { - <%for (GenClass.ChildCreationData childCreationData : classEntry.getValue()) { GenFeature createFeature = childCreationData.createFeature; GenFeature delegatedFeature = childCreationData.delegatedFeature; GenClassifier createClassifier = childCreationData.createClassifier;%> - <%if (createFeature.isFeatureMapType()) {%> - <%if (delegatedFeature.isReferenceType()) { GenClass createClass = (GenClass)createClassifier;%> -<%@ include file="ItemProvider/newChildDescriptorsReferenceDelegatedFeature.override.javajetinc" fail="alternative"%> -<%@ start %> - newChildDescriptors.add - (createChildParameter - (<%=createFeature.getQualifiedFeatureAccessor()%>, - <%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMapUtil")%>.createEntry - (<%=delegatedFeature.getQualifiedFeatureAccessor()%>, - <%if (createClass.isMapEntry()) { %> - <%=createClass.getGenPackage().getQualifiedEFactoryInstanceAccessor()%>.create(<%=createClass.getQualifiedClassifierAccessor()%>)))); - <%} else {%> - <%=createClass.getGenPackage().getQualifiedFactoryInstanceAccessor()%>.create<%=createClass.getName()%>()))); - <%}%> -<%@ include file="ItemProvider/newChildDescriptorsReferenceDelegatedFeature.insert.javajetinc" fail="silent"%> -<%@ end %><%//ItemProvider/newChildDescriptorsReferenceDelegatedFeature.override.javajetinc%> - <%} else { GenDataType createDataType = (GenDataType)createClassifier;%> -<%@ include file="ItemProvider/newChildDescriptorsAttributeDelegatedFeature.override.javajetinc" fail="alternative"%> -<%@ start %> - newChildDescriptors.add - (createChildParameter - (<%=createFeature.getQualifiedFeatureAccessor()%>, - <%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMapUtil")%>.createEntry - (<%=delegatedFeature.getQualifiedFeatureAccessor()%>, - <%if (delegatedFeature.isEnumBasedType()) {%> - <%=delegatedFeature.getTypeGenEnum().getStaticValue(delegatedFeature.getEcoreFeature().getDefaultValueLiteral())%>))); - <%} else if (delegatedFeature.isStringBasedType()) {%> - <%=delegatedFeature.getCreateChildValueLiteral()%>)));<%=genModel.getNonNLS()%> - <%} else { String literal = delegatedFeature.getCreateChildValueLiteral();%> - <%=createDataType.getGenPackage().getQualifiedEFactoryInstanceAccessor()%>.createFromString(<%=createDataType.getQualifiedClassifierAccessor()%>, <%=literal%>))));<%if (literal != null) {%><%=genModel.getNonNLS()%><%} else {%> // TODO: ensure this is a valid literal value<%}%> - <%}%> -<%@ include file="ItemProvider/newChildDescriptorsAttributeDelegatedFeature.insert.javajetinc" fail="silent"%> -<%@ end %><%//ItemProvider/newChildDescriptorsAttributeDelegatedFeature.override.javajetinc%> - <%}%> - <%} else if (createFeature.isReferenceType()) { GenClass createClass = (GenClass)createClassifier;%> -<%@ include file="ItemProvider/newChildDescriptorsReferenceFeature.override.javajetinc" fail="alternative"%> -<%@ start %> - newChildDescriptors.add - (createChildParameter - (<%=createFeature.getQualifiedFeatureAccessor()%>, - <%if (createClass.isMapEntry()) { %> - <%=createClass.getGenPackage().getQualifiedEFactoryInstanceAccessor()%>.create(<%=createClass.getQualifiedClassifierAccessor()%>))); - <%} else {%> - <%=createClass.getGenPackage().getQualifiedFactoryInstanceAccessor()%>.create<%=createClass.getName()%>())); - <%}%> -<%@ include file="ItemProvider/newChildDescriptorsReferenceFeature.insert.javajetinc" fail="silent"%> -<%@ end %><%//ItemProvider/newChildDescriptorsReferenceFeature.override.javajetinc %> - <%} else { GenDataType createDataType = (GenDataType)createClassifier;%> -<%@ include file="ItemProvider/newChildDescriptorsAttributeFeature.override.javajetinc" fail="alternative"%> -<%@ start %> - newChildDescriptors.add - (createChildParameter - (<%=createFeature.getQualifiedFeatureAccessor()%>, - <%if (createFeature.isEnumBasedType()) {%> - <%=createFeature.getTypeGenEnum().getStaticValue(createFeature.getEcoreFeature().getDefaultValueLiteral())%>)); - <%} else if (createFeature.isStringBasedType()) {%> - <%=createFeature.getCreateChildValueLiteral()%>));<%=genModel.getNonNLS()%> - <%} else { String literal = createFeature.getCreateChildValueLiteral();%> - <%=createDataType.getGenPackage().getQualifiedEFactoryInstanceAccessor()%>.createFromString(<%=createDataType.getQualifiedClassifierAccessor()%>, <%=literal%>)));<%if (literal != null) {%><%=genModel.getNonNLS()%><%} else {%> // TODO: ensure this is a valid literal value<%}%> - <%}%> -<%@ include file="ItemProvider/newChildDescriptorsAttributeFeature.insert.javajetinc" fail="silent"%> -<%@ end %><%//ItemProvider/newChildDescriptorsAttributeFeature.override.javajetinc%> - <%}%> - - <%}%> - return null; - } - - <%}%> - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected <%=genModel.getImportedName("org.eclipse.emf.edit.command.CommandParameter")%> createChildParameter(Object feature, Object child) - { - return new <%=genModel.getImportedName("org.eclipse.emf.edit.command.CommandParameter")%>(null, feature, child); - } - - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public <%=_Collection%> getNewChildDescriptors(Object object, <%=genModel.getImportedName("org.eclipse.emf.edit.domain.EditingDomain")%> editingDomain) - { - <%=_ArrayList%> result = new <%=_ArrayList%>(); - new CreationSwitch(result, editingDomain).doSwitch((<%=genModel.getImportedName("org.eclipse.emf.ecore.EObject")%>)object); - return result; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public <%=genModel.getImportedName("org.eclipse.emf.common.util.ResourceLocator")%> getResourceLocator() - { - return <%=genPackage.getImportedEditPluginClassName()%>.INSTANCE; - } - } - - <%}%> -<%}%> -} -<%genModel.emitSortedImports();%> diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates-orig/model/AdapterFactoryClass.javajet b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates-orig/model/AdapterFactoryClass.javajet deleted file mode 100644 index 49809729ee6..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates-orig/model/AdapterFactoryClass.javajet +++ /dev/null @@ -1,172 +0,0 @@ -<%@ jet package="org.eclipse.emf.codegen.ecore.templates.model" imports="java.util.* org.eclipse.emf.codegen.ecore.genmodel.*" class="AdapterFactoryClass" version="$Id: AdapterFactoryClass.javajet,v 1.13 2008/12/13 15:53:17 emerks Exp $" %> -<% -/** - * <copyright> - * - * Copyright (c) 2002-2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - * - * </copyright> - */ -%> -<%GenPackage genPackage = (GenPackage)argument; GenModel genModel=genPackage.getGenModel(); /* Trick to import java.util.* without warnings */Iterator.class.getName();%> -<%@ include file="../Header.javajetinc"%> -package <%=genPackage.getUtilitiesPackageName()%>; - -<%genModel.addImport("org.eclipse.emf.common.notify.Adapter");%> -<%genModel.addImport("org.eclipse.emf.common.notify.Notifier");%> -<%genModel.addImport("org.eclipse.emf.common.notify.impl.AdapterFactoryImpl");%> -<%genModel.addImport("org.eclipse.emf.ecore.EObject");%> -<%if (!genPackage.hasJavaLangConflict() && !genPackage.getUtilitiesPackageName().equals(genPackage.getInterfacePackageName())) genModel.addImport(genPackage.getInterfacePackageName() + ".*");%> -<%String typeArgument = genModel.useGenerics() ? "<Adapter>" : "";%> -<%String returnType = genModel.useGenerics() ? "Adapter" : genModel.getImportedName("java.lang.Object");%> -<%String adapterCast = genModel.useGenerics() ? "" : "(Adapter)";%> -<%genModel.markImportLocation(stringBuffer);%> - -/** - * <!-- begin-user-doc --> - * The <b>Adapter Factory</b> for the model. - * It provides an adapter <code>createXXX</code> method for each class of the model. - * <!-- end-user-doc --> - * @see <%=genPackage.getQualifiedPackageInterfaceName()%> - * @generated - */ -public class <%=genPackage.getAdapterFactoryClassName()%> extends AdapterFactoryImpl -{ -<%if (genModel.hasCopyrightField()) {%> - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final <%=genModel.getImportedName("java.lang.String")%> copyright = <%=genModel.getCopyrightFieldLiteral()%>;<%=genModel.getNonNLS()%> - -<%}%> - /** - * The cached model package. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected static <%=genPackage.getImportedPackageInterfaceName()%> modelPackage; - - /** - * Creates an instance of the adapter factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public <%=genPackage.getAdapterFactoryClassName()%>() - { - if (modelPackage == null) - { - modelPackage = <%=genPackage.getImportedPackageInterfaceName()%>.eINSTANCE; - } - } - - /** - * Returns whether this factory is applicable for the type of the object. - * <!-- begin-user-doc --> - * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model. - * <!-- end-user-doc --> - * @return whether this factory is applicable for the type of the object. - * @generated - */ - <%if (genModel.useClassOverrideAnnotation()) {%> - @Override - <%}%> - public boolean isFactoryForType(Object object) - { - if (object == modelPackage) - { - return true; - } - if (object instanceof EObject) - { - return ((EObject)object).eClass().getEPackage() == modelPackage; - } - return false; - } - - /** - * The switch that delegates to the <code>createXXX</code> methods. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected <%=genPackage.getSwitchClassName()%><%=typeArgument%> modelSwitch = - new <%=genPackage.getSwitchClassName()%><%=typeArgument%>() - { -<%for (GenClass genClass : genPackage.getAllSwitchGenClasses()) {%> - <%if (genModel.useClassOverrideAnnotation()) {%> - @Override - <%}%> - public <%=genClass.getTypeParameters()%><%=returnType%> case<%=genPackage.getClassUniqueName(genClass)%>(<%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceTypeArguments()%> object) - { - return create<%=genPackage.getClassUniqueName(genClass)%>Adapter(); - } -<%}%> - <%if (genModel.useClassOverrideAnnotation()) {%> - @Override - <%}%> - public <%=returnType%> defaultCase(EObject object) - { - return create<%=genPackage.getClassUniqueName(null)%>Adapter(); - } - }; - - /** - * Creates an adapter for the <code>target</code>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param target the object to adapt. - * @return the adapter for the <code>target</code>. - * @generated - */ - <%if (genModel.useClassOverrideAnnotation()) {%> - @Override - <%}%> - public Adapter createAdapter(Notifier target) - { - return <%=adapterCast%>modelSwitch.doSwitch((EObject)target); - } - -<%for (GenClass genClass : genPackage.getAllSwitchGenClasses()) {%> - - /** - * Creates a new adapter for an object of class '{@link <%=genClass.getQualifiedInterfaceName()%> <em><%=genClass.getFormattedName()%></em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see <%=genClass.getQualifiedInterfaceName()%> - * @generated - */ - public Adapter create<%=genPackage.getClassUniqueName(genClass)%>Adapter() - { - return null; - } -<%}%> - - /** - * Creates a new adapter for the default case. - * <!-- begin-user-doc --> - * This default implementation returns null. - * <!-- end-user-doc --> - * @return the new adapter. - * @generated - */ - public Adapter create<%=genPackage.getClassUniqueName(null)%>Adapter() - { - return null; - } - -} //<%=genPackage.getAdapterFactoryClassName()%> -<%genModel.emitSortedImports();%> diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates-orig/model/SwitchClass.javajet b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates-orig/model/SwitchClass.javajet deleted file mode 100644 index ef6fd0eefa2..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates-orig/model/SwitchClass.javajet +++ /dev/null @@ -1,230 +0,0 @@ -<%@ jet package="org.eclipse.emf.codegen.ecore.templates.model" imports="java.util.* org.eclipse.emf.codegen.ecore.genmodel.*" class="SwitchClass" version="$Id: SwitchClass.javajet,v 1.23 2011/01/20 01:10:53 emerks Exp $" %> -<% -/** - * <copyright> - * - * Copyright (c) 2002-2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - * - * </copyright> - */ -%> -<%GenPackage genPackage = (GenPackage)argument; GenModel genModel=genPackage.getGenModel();%> -<%boolean supportsComposition = genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF27_VALUE;%> -<%@ include file="../Header.javajetinc"%> -package <%=genPackage.getUtilitiesPackageName()%>; - -<%if (supportsComposition) {%> -<%genModel.addImport("org.eclipse.emf.ecore.EObject");%> -<%genModel.addImport("org.eclipse.emf.ecore.EPackage");%> -<%genModel.addImport("org.eclipse.emf.ecore.util.Switch");%> -<%} else {%> -<%genModel.addImport("org.eclipse.emf.ecore.EClass");%> -<%genModel.addImport("org.eclipse.emf.ecore.EObject");%> -<%}%> -<%if (!genPackage.hasJavaLangConflict() && !genPackage.getUtilitiesPackageName().equals(genPackage.getInterfacePackageName())) genModel.addImport(genPackage.getInterfacePackageName() + ".*");%> -<% -String templateParameterName = null; -if (genModel.useGenerics()) -{ - Set<String> usedNames = new HashSet<String>(); - for (GenEnum genEnum : genPackage.getGenEnums()) - { - usedNames.add(genEnum.getName()); - } - for (GenClass genClass : genPackage.getAllSwitchGenClasses()) - { - if (!genClass.isDynamic() && !genClass.isExternalInterface()) - { - usedNames.add(genClass.getName()); - } - for (GenTypeParameter genTypeParameter : genClass.getGenTypeParameters()) - { - usedNames.add(genTypeParameter.getName()); - } - } - templateParameterName = "T"; - for (int i = 1; usedNames.contains(templateParameterName); ++i) - { - templateParameterName = "T" + i; - } -} -%> -<%String templateParameters = genModel.useGenerics() ? "<" + templateParameterName + ">" : "";%> -<%String returnType = genModel.useGenerics() ? templateParameterName : genModel.getImportedName("java.lang.Object");%> -<%genModel.markImportLocation(stringBuffer);%> - -/** - * <!-- begin-user-doc --> - * The <b>Switch</b> for the model's inheritance hierarchy. - * It supports the call {@link #doSwitch(EObject) doSwitch(object)} - * to invoke the <code>caseXXX</code> method for each class of the model, - * starting with the actual class of the object - * and proceeding up the inheritance hierarchy - * until a non-null result is returned, - * which is the result of the switch. - * <!-- end-user-doc --> - * @see <%=genPackage.getQualifiedPackageInterfaceName()%> - * @generated - */ -public class <%=genPackage.getSwitchClassName()%><%=templateParameters%><%if (supportsComposition){%> extends Switch<%=templateParameters%><%}%> -{ -<%if (genModel.hasCopyrightField()) {%> - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public static final <%=genModel.getImportedName("java.lang.String")%> copyright = <%=genModel.getCopyrightFieldLiteral()%>;<%=genModel.getNonNLS()%> - -<%}%> - /** - * The cached model package - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected static <%=genPackage.getImportedPackageInterfaceName()%> modelPackage; - - /** - * Creates an instance of the switch. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public <%=genPackage.getSwitchClassName()%>() - { - if (modelPackage == null) - { - modelPackage = <%=genPackage.getImportedPackageInterfaceName()%>.eINSTANCE; - } - } - -<%if (supportsComposition) {%> - /** - * Checks whether this is a switch for the given package. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @parameter ePackage the package in question. - * @return whether this is a switch for the given package. - * @generated - */ - @Override - protected boolean isSwitchFor(EPackage ePackage) - { - return ePackage == modelPackage; - } -<%} else {%> - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - public <%=returnType%> doSwitch(EObject theEObject) - { - return doSwitch(theEObject.eClass(), theEObject); - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - protected <%=returnType%> doSwitch(EClass theEClass, EObject theEObject) - { - if (theEClass.eContainer() == modelPackage) - { - return doSwitch(theEClass.getClassifierID(), theEObject); - } - else - { - <%=genModel.getImportedName("java.util.List")%><%if (genModel.useGenerics()) {%><<%=genModel.getImportedName("org.eclipse.emf.ecore.EClass")%>><%}%> eSuperTypes = theEClass.getESuperTypes(); - return - eSuperTypes.isEmpty() ? - defaultCase(theEObject) : - doSwitch(<%if (!genModel.useGenerics()) {%>(EClass)<%}%>eSuperTypes.get(0), theEObject); - } - } -<%}%> - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ -<%if (supportsComposition) {%> - @Override -<%}%> - protected <%=returnType%> doSwitch(int classifierID, EObject theEObject) - { - switch (classifierID) - { -<%for (GenClass genClass : genPackage.getGenClasses()) {%> -<%if (!genClass.isExternalInterface() && !genClass.isEObject() || genClass.isMapEntry()) { String result = "result".equals(genClass.getSafeUncapName()) ? "theResult" : "result"; %> - case <%=genPackage.getImportedPackageInterfaceName()%>.<%=genPackage.getClassifierID(genClass)%>: - { - <%if (genClass.isUncheckedCast() || genClass.isMapEntry() && genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50) {%>@SuppressWarnings("unchecked") <%}%><%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceWildTypeArguments()%> <%=genClass.getSafeUncapName()%> = (<%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceWildTypeArguments()%>)theEObject; - <%=returnType%> <%=result%> = case<%=genPackage.getClassUniqueName(genClass)%>(<%=genClass.getSafeUncapName()%>); -<%for (GenClass baseGenClass : genClass.getSwitchGenClasses()) {%> - if (<%=result%> == null) <%=result%> = case<%=genPackage.getClassUniqueName(baseGenClass)%>(<%if (genClass.isMapEntry()) {%>(<%=baseGenClass.getImportedInterfaceName()%><%=baseGenClass.getInterfaceTypeArguments()%>)<%}%><%=genClass.getSafeUncapName()%>); -<%}%> - if (<%=result%> == null) <%=result%> = defaultCase(theEObject); - return <%=result%>; - } -<%}%> -<%}%> - default: return defaultCase(theEObject); - } - } -<%for (GenClass genClass : genPackage.getAllSwitchGenClasses()) {%> - - /** - * Returns the result of interpreting the object as an instance of '<em><%=genClass.getFormattedName()%></em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em><%=genClass.getFormattedName()%></em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public <%=genClass.getTypeParameters()%><%=returnType%> case<%=genPackage.getClassUniqueName(genClass)%>(<%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceTypeArguments()%> object) - { - return null; - } -<%}%> - - /** - * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch, but this is the last case anyway. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>EObject</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) - * @generated - */ -<%if (supportsComposition) {%> - @Override -<%}%> - public <%=returnType%> defaultCase(EObject object) - { - return null; - } - -} //<%=genPackage.getSwitchClassName()%> -<%genModel.emitSortedImports();%> diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/edit/ItemProvider.javajet b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/edit/ItemProvider.javajet deleted file mode 100644 index a590b3972ef..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/edit/ItemProvider.javajet +++ /dev/null @@ -1,727 +0,0 @@ -<%@ jet package="org.eclipse.emf.codegen.ecore.templates.edit" imports="org.eclipse.uml2.codegen.ecore.genmodel.util.* org.eclipse.emf.common.util.* org.eclipse.emf.ecore.EStructuralFeature org.eclipse.emf.common.util.EList org.eclipse.emf.ecore.EClass org.eclipse.papyrus.sysml.sysmloveruml.codegen.generationUtils.SysMLOverUMLHelper java.util.* org.eclipse.emf.codegen.ecore.genmodel.*" class="ItemProvider" version="$Id: ItemProvider.javajet,v 1.44 2009/10/20 13:39:38 davidms Exp $" %>
-<%
-/**
- * <copyright>
- *
- * Copyright (c) 2002-2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- *
- * </copyright>
- */
-%>
-<%GenClass genClass = (GenClass)argument; GenPackage genPackage = genClass.getGenPackage(); GenModel genModel=genPackage.getGenModel();%>
-<%@ include file="../Header.javajetinc"%>
-package <%=genPackage.getProviderPackageName()%>;
-
-<%genModel.addImport("org.eclipse.uml2.uml.UMLPackage");%>
-<%genModel.addImport("org.eclipse.uml2.uml.util.UMLUtil");%>
-<%genModel.addImport("org.eclipse.emf.common.notify.AdapterFactory");%>
-<%genModel.addImport("org.eclipse.emf.common.notify.Notification");%>
-<%genModel.addImport("org.eclipse.emf.edit.provider.IEditingDomainItemProvider");%>
-<%genModel.addImport("org.eclipse.emf.edit.provider.IItemLabelProvider");%>
-<%genModel.addImport("org.eclipse.emf.edit.provider.IItemPropertySource");%>
-<%genModel.addImport("org.eclipse.emf.edit.provider.IStructuredItemContentProvider");%>
-<%genModel.addImport("org.eclipse.emf.edit.provider.ITreeItemContentProvider");%>
-<%genModel.addImport("org.eclipse.uml2.uml.Stereotype");%>
-<%genModel.addImport("org.eclipse.uml2.uml.Class");%>
-<%genModel.addImport("org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory");%>
-<%genModel.addImport("org.eclipse.papyrus.sysml.edit.provider.IRootAdapterFactory");%>
-<%genModel.addImport("java.util.regex.Pattern");%>
-<%genModel.addImport("org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter");%>
-<%genModel.addImport("org.eclipse.uml2.uml.NamedElement");%>
-<%genModel.addImport("org.eclipse.emf.edit.provider.ComposedImage");%>
-<%genModel.addImport("java.util.Collections");%>
-<%genModel.addImport("org.eclipse.emf.edit.provider.ItemProviderAdapter");%>
-
-
-<%String _List = genModel.getImportedName(genModel.useGenerics() ? "java.util.List<org.eclipse.emf.edit.provider.IItemPropertyDescriptor>" : "java.util.List");%>
-<%genModel.markImportLocation(stringBuffer);%>
-<%boolean hasToImplementIVisibilityOverlayImage = false;%>
-/**
- * This is the item provider adapter for a {@link <%=genClass.getQualifiedInterfaceName()%>} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class <%=genClass.getProviderClassName()%>
- extends <%=genClass.getProviderBaseClassName() != null ? genClass.getProviderBaseClassName() : genModel.getImportedName("org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter")%>
- implements
-<%for (Iterator<String> i = genPackage.getProviderSupportedTypes().iterator(); i.hasNext(); ) {%>
- <%=genModel.getImportedName(i.next())%><%if (i.hasNext()){%>,<%}%>
-<%}%>
-<% if (genClass.getProviderBaseClassName() != null) {%>
- , IVisibilityOverlayImage
- <%genModel.addImport("org.eclipse.papyrus.sysml.edit.provider.IVisibilityOverlayImage");%>
- <%hasToImplementIVisibilityOverlayImage = true;%>
-<%}%>
-
-
-{
-
-/**
- * Pattern prefix of <%=genClass.getSafeUncapName()%>
- * @generated
- */
- private static Pattern <%=SysMLOverUMLHelper.getClassifierCorrectLabel(genClass.getEcoreClass())%>_PREFIX_PATTERN = Pattern.compile("(<%=genClass.getSafeUncapName()%>, |<<<%=genClass.getSafeUncapName()%>>>|, <%=genClass.getSafeUncapName()%>)");
- <%Map<EClass,String> patternNameMap = new HashMap<EClass,String>();%>
- <%for(EClass basedClass : SysMLOverUMLHelper.getBasedElement(genClass.getEcoreClass())) {%>
- <%String patternName = SysMLOverUMLHelper.getClassifierCorrectLabel(basedClass)+"_PREFIX_PATTERN";%>
- /**
- * Get the prefix pattern of <%=patternName%>
- * @generated
- */
- <%patternNameMap.put(basedClass,patternName);%>
- private static Pattern <%=patternName%>= Pattern.compile("<%=SysMLOverUMLHelper.getElementTypeCorrectLabel(basedClass)%>");
- <%}%>
-
-<%if (genModel.hasCopyrightField()) {%>
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final <%=genModel.getImportedName("java.lang.String")%> copyright = <%=genModel.getCopyrightFieldLiteral()%>;<%=genModel.getNonNLS()%>
-
-<%}%>
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public <%=genClass.getProviderClassName()%>(AdapterFactory adapterFactory)
- {
- super(adapterFactory);
- }
-
-
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-<%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
-<%}%>
- public <%=_List%> getPropertyDescriptors(Object object)
- {
- if(object instanceof <%=genClass.getName()%>) {
- if (itemPropertyDescriptors == null)
- {
- super.getPropertyDescriptors(object);
-
-<%for (GenFeature genFeature : genClass.getPropertyFeatures()) { %>
- add<%=genFeature.getCapName()%>PropertyDescriptor(object);
-<%}%>
- }
- }
-
- <%for(EClass basedClass : SysMLOverUMLHelper.getBasedElement(genClass.getEcoreClass())) {%>
-
- /**
- * Handle <%=basedClass.getName()%> stereotyped by <%=genClass.getName()%>
- */
- if ( object instanceof <%=SysMLOverUMLHelper.getUMLInterfaceName(basedClass)%> ){
- <%=SysMLOverUMLHelper.getUMLInterfaceName(basedClass)%> element = (<%=SysMLOverUMLHelper.getUMLInterfaceName(basedClass)%>)object;
- /**
- * This is used to store all the property descriptors for a class stereotyped with a block.
- * Derived classes should add descriptors to this vector.
- */
- <%String name = "itemPropertyDescriptorsFor"+SysMLOverUMLHelper.getDisplayedClassName(basedClass);%>
- List<IItemPropertyDescriptor> <%=name%> = new ArrayList<IItemPropertyDescriptor>();
- ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.<%=SysMLOverUMLHelper.getClassifierCorrectLabel(basedClass)%>);
- final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
-
- <%=name%>.addAll(propertyDescriptors);
- <%=genClass.getName()%> steApplication = UMLUtil.getStereotypeApplication(element, <%=genClass.getName()%>.class);
- if(steApplication != null) {
- <%for (GenFeature genFeature : genClass.getPropertyFeatures()) { %>
- <%for(EClass basedClass2 : SysMLOverUMLHelper.getBasedElement(genClass.getEcoreClass())) {%>
- <%=name%>.add(create<%=genFeature.getCapName()%>PropertyDescriptorFor<%=basedClass2.getName()%>(steApplication));
- <%}%>
- <%}%>
-
- }
- return <%=name%>;
-
- }
- <%}%>
- return itemPropertyDescriptors;
- }
-
-<%for (GenFeature genFeature : genClass.getPropertyFeatures()) { %>
- /**
- * This adds a property descriptor for the <%=genFeature.getFormattedName()%> feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void add<%=genFeature.getCapName()%>PropertyDescriptor(Object object)
- {
-<%@ include file="ItemProvider/addPropertyDescriptor.override.javajetinc" fail="alternative" %>
-<%@ start %>
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((<%=genModel.getImportedName("org.eclipse.emf.edit.provider.ComposeableAdapterFactory")%>)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_<%=genFeature.getGenClass().getName()%>_<%=genFeature.getName()%>_feature"),<%=genModel.getNonNLS()%>
- <%if (genFeature.getPropertyDescription() == null || genFeature.getPropertyDescription().length() == 0) {%>
- getString("_UI_PropertyDescriptor_description", "_UI_<%=genFeature.getGenClass().getName()%>_<%=genFeature.getName()%>_feature", "_UI_<%=genFeature.getGenClass().getName()%>_type"),<%=genModel.getNonNLS()%><%=genModel.getNonNLS(2)%><%=genModel.getNonNLS(3)%>
- <%} else {%>
- getString("_UI_<%=genFeature.getGenClass().getName()%>_<%=genFeature.getName()%>_description"),<%=genModel.getNonNLS()%>
- <%}%>
- <%=genFeature.getQualifiedFeatureAccessor()%>,
- <%=genFeature.getProperty() == GenPropertyKind.EDITABLE_LITERAL ? "true" : "false"%>,
- <%=genFeature.isPropertyMultiLine() ? "true" : "false"%>,
- <%=genFeature.isPropertySortChoices() ? "true" : "false"%>,
- <%if (genFeature.isReferenceType()) {%>
- null,
- <%} else {%>
- <%=genModel.getImportedName("org.eclipse.emf.edit.provider.ItemPropertyDescriptor")%>.<%=genFeature.getPropertyImageName()%>,
- <%}%>
- <%if (genFeature.getPropertyCategory() == null || genFeature.getPropertyCategory().length() == 0) {%>
- null,
- <%} else {%>
- getString("<%=genModel.getPropertyCategoryKey(genFeature.getPropertyCategory())%>"),<%=genModel.getNonNLS()%>
- <%}%>
- <%if (genFeature.getPropertyFilterFlags().isEmpty()) {%>
- null));
- <%} else {%>
- new String[] {
- <%for (Iterator<String> j = genFeature.getPropertyFilterFlags().iterator(); j.hasNext();) { String filterFlag = j.next();%>
- <%if (filterFlag != null && filterFlag.length() > 0) {%>
- "<%=filterFlag%>"<%if (j.hasNext()) {%>,<%}%><%=genModel.getNonNLS()%>
- <%}%>
- <%}%>
- }));
- <%}%>
-<%@ end %><%//ItemProvider/addPropertyDescriptor.override.javajetinc%>
- }
-
- <%for(EClass basedClass : SysMLOverUMLHelper.getBasedElement(genClass.getEcoreClass())) {%>
- /**
- * This adds a property descriptor for the <%=genFeature.getFormattedName()%> feature for the UML element <%=basedClass.getName()%>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ItemPropertyDescriptorDecorator create<%=genFeature.getCapName()%>PropertyDescriptorFor<%=basedClass.getName()%>(Object object)
- {<%@ include file="ItemProvider/addPropertyDescriptor.override.javajetinc" fail="alternative" %>
- <%@ start %>
- return new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor
- (((<%=genModel.getImportedName("org.eclipse.emf.edit.provider.ComposeableAdapterFactory")%>)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_<%=genFeature.getGenClass().getName()%>_<%=genFeature.getName()%>_feature"),<%=genModel.getNonNLS()%>
- <%if (genFeature.getPropertyDescription() == null || genFeature.getPropertyDescription().length() == 0) {%>
- getString("_UI_PropertyDescriptor_description", "_UI_<%=genFeature.getGenClass().getName()%>_<%=genFeature.getName()%>_feature", "_UI_<%=genFeature.getGenClass().getName()%>_type"),<%=genModel.getNonNLS()%><%=genModel.getNonNLS(2)%><%=genModel.getNonNLS(3)%>
- <%} else {%>
- getString("_UI_<%=genFeature.getGenClass().getName()%>_<%=genFeature.getName()%>_description"),<%=genModel.getNonNLS()%>
- <%}%>
- <%=genFeature.getQualifiedFeatureAccessor()%>,
- <%=genFeature.getProperty() == GenPropertyKind.EDITABLE_LITERAL ? "true" : "false"%>,
- <%=genFeature.isPropertyMultiLine() ? "true" : "false"%>,
- <%=genFeature.isPropertySortChoices() ? "true" : "false"%>,
- <%if (genFeature.isReferenceType()) {%>
- null,
- <%} else {%>
- <%=genModel.getImportedName("org.eclipse.emf.edit.provider.ItemPropertyDescriptor")%>.<%=genFeature.getPropertyImageName()%>,
- <%}%>
- <%if (genFeature.getPropertyCategory() == null || genFeature.getPropertyCategory().length() == 0) {%>
- null,
- <%} else {%>
- getString("<%=genModel.getPropertyCategoryKey(genFeature.getPropertyCategory())%>"),<%=genModel.getNonNLS()%>
- <%}%>
- <%if (genFeature.getPropertyFilterFlags().isEmpty()) {%>
- null));
- <%} else {%>
- new String[] {
- <%for (Iterator<String> j = genFeature.getPropertyFilterFlags().iterator(); j.hasNext();) { String filterFlag = j.next();%>
- <%if (filterFlag != null && filterFlag.length() > 0) {%>
- "<%=filterFlag%>"<%if (j.hasNext()) {%>,<%}%><%=genModel.getNonNLS()%>
- <%}%>
- <%}%>
- })));
- <%}%>
-<%@ end %><%//ItemProvider/addPropertyDescriptor.override.javajetinc%>
- }
- <%}%>
-
-
-<%}%>
-<%if (!genClass.getChildrenFeatures().isEmpty()) {%>
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-<%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
-<%}%>
- public <%=genModel.getImportedName(genModel.useGenerics() ? "java.util.Collection<? extends org.eclipse.emf.ecore.EStructuralFeature>" : "java.util.Collection")%> getChildrenFeatures(Object object)
- {
- if (childrenFeatures == null)
- {
- super.getChildrenFeatures(object);
-<%for (GenFeature genFeature : genClass.getChildrenFeatures()) { %>
- childrenFeatures.add(<%=genFeature.getQualifiedFeatureAccessor()%>);
-<%}%>
- }
- return childrenFeatures;
- }
-
-<%if (!genClass.getChildrenFeatures().isEmpty()) {%>
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-<%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
-<%}%>
- protected <%=genModel.getImportedName("org.eclipse.emf.ecore.EStructuralFeature")%> getChildFeature(Object object, Object child)
- {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildFeature(object, child);
- }
-
-<%}%>
-<%}%>
-<%if (genClass.needsHasChildrenMethodOverride()) {%>
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-<%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
-<%}%>
- public boolean hasChildren(Object object)
- {
- return hasChildren(object, <%=genModel.isOptimizedHasChildren()%>);
- }
-
-<%}%>
-<%if (genClass.isImage()) {%>
- /**
- * This returns <%=genClass.getName()%>.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-<%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
-<%}%>
- public Object getImage(Object object)
- {
- Object composedImage = overlayImage(object, getResourceLocator().getImage("full/obj16/<%=genClass.getName()%>"));<%=genModel.getNonNLS()%>
- if(object instanceof NamedElement){
- ComposedImage aux = new ComposedImage(Collections.singletonList(composedImage));
- return (Object)composeVisibilityImage(object,aux);
- }
- return composedImage;
- }
-
-<%}%>
-<%if (genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF26_VALUE && !genModel.isCreationIcons()) {%>
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-<%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
-<%}%>
- protected boolean shouldComposeCreationImage()
- {
- return true;
- }
-
-<%}%>
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-<%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
-<%}%>
- public String getText(Object object)
- {
- /**
- * Handle Stereotype item and stereoted element
- */
- <%=genClass.getImportedInterfaceName()%> <%=SysMLOverUMLHelper.getBasedClassVariableName(genClass.getEcoreClass())%> = null;
- <%for(EClass basedClass : SysMLOverUMLHelper.getBasedElement(genClass.getEcoreClass())) {%>
- if ( object instanceof <%=SysMLOverUMLHelper.getUMLInterfaceName(basedClass)%> ){
- EObject steApplication = UMLUtil.getStereotypeApplication((<%=SysMLOverUMLHelper.getUMLInterfaceName(basedClass)%>) object, <%=genClass.getName()%>.class);
- Stereotype ste = UMLUtil.getStereotype(steApplication);
- if ( ste != null){
- IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.<%=SysMLOverUMLHelper.getClassifierCorrectLabel(basedClass)%>);
- String result = ite.getText(object);
- result = <%=SysMLOverUMLHelper.getClassifierCorrectLabel(genClass.getEcoreClass())%>_PREFIX_PATTERN.matcher(result).replaceFirst("");
- return <%=patternNameMap.get(basedClass)%>.matcher(result).replaceFirst("<%=genClass.getEcoreClass().getName()%>");
- }
-
- }
- <%}%>
- if (<%=SysMLOverUMLHelper.getBasedClassVariableName(genClass.getEcoreClass())%> == null){
- <%=SysMLOverUMLHelper.getBasedClassVariableName(genClass.getEcoreClass())%> = (<%=genClass.getImportedInterfaceName()%>) object;
- }
-
-
-<%@ include file="ItemProvider/getText.override.javajetinc" fail="alternative" %>
-<%@ start %>
-<%if (genClass.isMapEntry()) {%>
- <%=genClass.getImportedInterfaceName()%><%if (genModel.useGenerics()) {%><?, ?><%}%> <%=genClass.getSafeUncapName()%> = (<%=genClass.getImportedInterfaceName()%><%if (genModel.useGenerics()) {%><?, ?><%}%>)<%=SysMLOverUMLHelper.getBasedClassVariableName(genClass.getEcoreClass())%>;
- <%if (!genClass.getMapEntryKeyFeature().isPropertyMultiLine() && !genClass.getMapEntryValueFeature().isPropertyMultiLine()) {%>
- return "" + <%=genClass.getSafeUncapName()%>.getKey() + " -> " + <%=genClass.getSafeUncapName()%>.getValue();<%=genModel.getNonNLS()%><%=genModel.getNonNLS(2)%>
- <%} else {%>
- <%if (genClass.getMapEntryKeyFeature().isPropertyMultiLine()) {%>
- String key = crop("" + <%=genClass.getSafeUncapName()%>.getKey());<%=genModel.getNonNLS()%>
- <%} else {%>
- String key = "" + <%=genClass.getSafeUncapName()%>.getKey();<%=genModel.getNonNLS()%>
- <%}%>
- <%if (genClass.getMapEntryValueFeature().isPropertyMultiLine()) {%>
- String value = crop("" + <%=genClass.getSafeUncapName()%>.getValue());<%=genModel.getNonNLS()%>
- <%} else {%>
- String value = "" + <%=genClass.getSafeUncapName()%>.getValue();<%=genModel.getNonNLS()%>
- <%}%>
- return key + " -> " + value;<%=genModel.getNonNLS()%>
- <%}%>
-<%} else if (genClass.getLabelFeature() != null) { GenFeature labelFeature = genClass.getLabelFeature();%>
- <%if (labelFeature.isPrimitiveType() && !labelFeature.getGenClass().isDynamic() && !labelFeature.isSuppressedGetVisibility()) {%>
- <%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceWildTypeArguments()%> <%=genClass.getSafeUncapName()%> = (<%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceWildTypeArguments()%>)<%=SysMLOverUMLHelper.getBasedClassVariableName(genClass.getEcoreClass())%>;
- return getString("_UI_<%=genClass.getName()%>_type") + " " + <%=genClass.getSafeUncapName()%>.<%=genClass.getLabelFeature().getGetAccessor()%>();<%=genModel.getNonNLS()%><%=genModel.getNonNLS(2)%>
- <%} else {%>
- <%if (labelFeature.isStringType() && !labelFeature.getGenClass().isDynamic() && !labelFeature.isSuppressedGetVisibility()) {%>
- <%if (labelFeature.isPropertyMultiLine()) {%>
- String label = crop(((<%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceWildTypeArguments()%>)<%=SysMLOverUMLHelper.getBasedClassVariableName(genClass.getEcoreClass())%>).<%=labelFeature.getGetAccessor()%>());
- <%} else {%>
- String label = ((<%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceWildTypeArguments()%>)<%=SysMLOverUMLHelper.getBasedClassVariableName(genClass.getEcoreClass())%>).<%=labelFeature.getGetAccessor()%>();
- <%}%>
- <%} else {%>
- <%if (labelFeature.isSuppressedGetVisibility() || labelFeature.getGenClass().isDynamic()) {%>
- <%=genModel.getImportedName("java.lang.Object")%> labelValue = ((<%=genModel.getImportedName("org.eclipse.emf.ecore.EObject")%>)<%=SysMLOverUMLHelper.getBasedClassVariableName(genClass.getEcoreClass())%>).eGet(<%=labelFeature.getQualifiedFeatureAccessor()%>);
- <%} else {%>
- <%=labelFeature.getRawImportedType()%> labelValue = ((<%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceWildTypeArguments()%>)<%=SysMLOverUMLHelper.getBasedClassVariableName(genClass.getEcoreClass())%>).<%=labelFeature.getGetAccessor()%>();
- <%}%>
- String label = labelValue == null ? null : labelValue.toString();
- <%}%>
- return label == null || label.length() == 0 ?
- getString("_UI_<%=genClass.getName()%>_type") :<%=genModel.getNonNLS()%>
- getString("_UI_<%=genClass.getName()%>_type") + " " + label;<%=genModel.getNonNLS()%><%=genModel.getNonNLS(2)%>
- <%}%>
-<%} else {%>
- return getString("_UI_<%=genClass.getName()%>_type");<%=genModel.getNonNLS()%>
-<%}%>
-<%@ end %><%//ItemProvider/getText.override.javajetinc%>
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-<%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
-<%}%>
- public void notifyChanged(Notification notification)
- {
- updateChildren(notification);
-<%if (!genClass.getLabelNotifyFeatures().isEmpty() || !genClass.getContentNotifyFeatures().isEmpty() || !genClass.getLabelAndContentNotifyFeatures().isEmpty()) {%>
-
- switch (notification.getFeatureID(<%=genClass.getRawImportedInterfaceName()%>.class))
- {
- <%if (!genClass.getLabelNotifyFeatures().isEmpty()) {%>
- <%for (GenFeature genFeature : genClass.getLabelNotifyFeatures()) { %>
- case <%=genClass.getQualifiedFeatureID(genFeature)%>:
- <%}%>
- fireNotifyChanged(new <%=genModel.getImportedName("org.eclipse.emf.edit.provider.ViewerNotification")%>(notification, notification.getNotifier(), false, true));
- return;
- <%}%>
- <%if (!genClass.getContentNotifyFeatures().isEmpty()) {%>
- <%for (GenFeature genFeature : genClass.getContentNotifyFeatures()) { %>
- case <%=genClass.getQualifiedFeatureID(genFeature)%>:
- <%}%>
- fireNotifyChanged(new <%=genModel.getImportedName("org.eclipse.emf.edit.provider.ViewerNotification")%>(notification, notification.getNotifier(), true, false));
- return;
- <%}%>
- <%if (!genClass.getLabelAndContentNotifyFeatures().isEmpty()) {%>
- <%for (GenFeature genFeature : genClass.getLabelAndContentNotifyFeatures()) { %>
- case <%=genClass.getQualifiedFeatureID(genFeature)%>:
- <%}%>
- fireNotifyChanged(new <%=genModel.getImportedName("org.eclipse.emf.edit.provider.ViewerNotification")%>(notification, notification.getNotifier(), true, true));
- return;
- <%}%>
- }
-
-
-<%}%>
-
- /**
- * Notify UML element
- */
- if ((adapterFactory instanceof IComposableAdapterFactory) && ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory() != null) {
-
- <%for(EClass basedClass : SysMLOverUMLHelper.getBasedElement(genClass.getEcoreClass())) {%>
-
- /**
- * Handle <%=basedClass.getName()%> stereotyped by <%=genClass.getName()%>
- */
-
-
- if (notification.getFeatureID(<%=SysMLOverUMLHelper.getUMLInterfaceName(basedClass)%>.class) != Notification.NO_FEATURE_ID){
- ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.<%=SysMLOverUMLHelper.getClassifierCorrectLabel(basedClass)%>);
- ite.notifyChanged(notification);
- return;
-
- }
- <%}%>
- }
-
- super.notifyChanged(notification);
- }
-
-<%if (genModel.isCreationCommands()) {%>
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-<%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
-<%}%>
- protected void collectNewChildDescriptors(<%=genModel.getImportedName(genModel.useGenerics() ? "java.util.Collection<java.lang.Object>" : "java.util.Collection")%> newChildDescriptors, Object object)
- {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- <%for (GenClass.ChildCreationData childCreationData : genClass.getChildCreationData()) { GenFeature createFeature = childCreationData.createFeature; GenFeature delegatedFeature = childCreationData.delegatedFeature; GenClassifier createClassifier = childCreationData.createClassifier;%>
- <%if (createFeature.isFeatureMapType()) {%>
- <%if (delegatedFeature.isReferenceType()) { GenClass createClass = (GenClass)createClassifier;%>
-<%@ include file="ItemProvider/newChildDescriptorsReferenceDelegatedFeature.override.javajetinc" fail="alternative"%>
-<%@ start %>
-
- newChildDescriptors.add
- (createChildParameter
- (<%=createFeature.getQualifiedFeatureAccessor()%>,
- <%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMapUtil")%>.createEntry
- (<%=delegatedFeature.getQualifiedFeatureAccessor()%>,
- <%if (createClass.isMapEntry()) { %>
- <%=createClass.getGenPackage().getQualifiedEFactoryInstanceAccessor()%>.create(<%=createClass.getQualifiedClassifierAccessor()%>))));
- <%} else {%>
- <%=createClass.getGenPackage().getQualifiedFactoryInstanceAccessor()%>.create<%=createClass.getName()%>())));
- <%}%>
-<%@ include file="ItemProvider/newChildDescriptorsReferenceDelegatedFeature.insert.javajetinc" fail="silent"%>
-<%@ end %><%//ItemProvider/newChildDescriptorsReferenceDelegatedFeature.override.javajetinc%>
- <%} else { GenDataType createDataType = (GenDataType)createClassifier;%>
-<%@ include file="ItemProvider/newChildDescriptorsAttributeDelegatedFeature.override.javajetinc" fail="alternative"%>
-<%@ start %>
-
- newChildDescriptors.add
- (createChildParameter
- (<%=createFeature.getQualifiedFeatureAccessor()%>,
- <%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMapUtil")%>.createEntry
- (<%=delegatedFeature.getQualifiedFeatureAccessor()%>,
- <%if (delegatedFeature.isEnumBasedType()) {%>
- <%=delegatedFeature.getTypeGenEnum().getStaticValue(delegatedFeature.getEcoreFeature().getDefaultValueLiteral())%>)));
- <%} else if (delegatedFeature.isStringBasedType()) {%>
- <%=delegatedFeature.getCreateChildValueLiteral()%>)));<%=genModel.getNonNLS()%>
- <%} else { String literal = delegatedFeature.getCreateChildValueLiteral();%>
- <%=createDataType.getGenPackage().getQualifiedEFactoryInstanceAccessor()%>.createFromString(<%=createDataType.getQualifiedClassifierAccessor()%>, <%=literal%>))));<%if (literal != null) {%><%=genModel.getNonNLS()%><%} else {%> // TODO: ensure this is a valid literal value<%}%>
- <%}%>
-<%@ include file="ItemProvider/newChildDescriptorsAttributeDelegatedFeature.insert.javajetinc" fail="silent"%>
-<%@ end %><%//ItemProvider/newChildDescriptorsAttributeDelegatedFeature.override.javajetinc%>
- <%}%>
- <%} else if (createFeature.isReferenceType()) { GenClass createClass = (GenClass)createClassifier;%>
-<%@ include file="ItemProvider/newChildDescriptorsReferenceFeature.override.javajetinc" fail="alternative"%>
-<%@ start %>
-
- newChildDescriptors.add
- (createChildParameter
- (<%=createFeature.getQualifiedFeatureAccessor()%>,
- <%if (createClass.isMapEntry()) { %>
- <%=createClass.getGenPackage().getQualifiedEFactoryInstanceAccessor()%>.create(<%=createClass.getQualifiedClassifierAccessor()%>)));
- <%} else {%>
- <%=createClass.getGenPackage().getQualifiedFactoryInstanceAccessor()%>.create<%=createClass.getName()%>()));
- <%}%>
-<%@ include file="ItemProvider/newChildDescriptorsReferenceFeature.insert.javajetinc" fail="silent"%>
-<%@ end %><%//ItemProvider/newChildDescriptorsReferenceFeature.override.javajetinc %>
- <%} else { GenDataType createDataType = (GenDataType)createClassifier;%>
-<%@ include file="ItemProvider/newChildDescriptorsAttributeFeature.override.javajetinc" fail="alternative"%>
-<%@ start %>
-
- newChildDescriptors.add
- (createChildParameter
- (<%=createFeature.getQualifiedFeatureAccessor()%>,
- <%if (createFeature.isEnumBasedType()) {%>
- <%=createFeature.getTypeGenEnum().getStaticValue(createFeature.getEcoreFeature().getDefaultValueLiteral())%>));
- <%} else if (createFeature.isStringBasedType()) {%>
- <%=createFeature.getCreateChildValueLiteral()%>));<%=genModel.getNonNLS()%>
- <%} else { String literal = createFeature.getCreateChildValueLiteral();%>
- <%=createDataType.getGenPackage().getQualifiedEFactoryInstanceAccessor()%>.createFromString(<%=createDataType.getQualifiedClassifierAccessor()%>, <%=literal%>)));<%if (literal != null) {%><%=genModel.getNonNLS()%><%} else {%> // TODO: ensure this is a valid literal value<%}%>
- <%}%>
-<%@ include file="ItemProvider/newChildDescriptorsAttributeFeature.insert.javajetinc" fail="silent"%>
-<%@ end %><%//ItemProvider/newChildDescriptorsAttributeFeature.override.javajetinc%>
- <%}%>
- <%}%>
- }
-
- <%if (!genClass.getSharedClassCreateChildFeatures().isEmpty()) {%>
- /**
- * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-<%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
-<%}%>
- public String getCreateChildText(Object owner, Object feature, Object child, <%=genModel.getImportedName(genModel.useGenerics() ? "java.util.Collection<?>" : "java.util.Collection")%> selection)
- {
- Object childFeature = feature;
- Object childObject = child;
-
- <%if (genClass.hasFeatureMapCreateChildFeatures()) {%>
- if (childFeature instanceof <%=genModel.getImportedName("org.eclipse.emf.ecore.EStructuralFeature")%> && <%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMapUtil")%>.isFeatureMap((EStructuralFeature)childFeature))
- {
- <%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMap")%>.Entry entry = (FeatureMap.Entry)childObject;
- childFeature = entry.getEStructuralFeature();
- childObject = entry.getValue();
- }
-
- <%}%>
- boolean qualify =
- <%for (Iterator<GenFeature> i = genClass.getSharedClassCreateChildFeatures().iterator(); i.hasNext();) { GenFeature createFeature = i.next();%>
- childFeature == <%=createFeature.getQualifiedFeatureAccessor()%><%=i.hasNext() ? " ||" : ";"%>
- <%}%>
-
- if (qualify)
- {
- return getString
- ("_UI_CreateChild_text2",<%=genModel.getNonNLS()%>
- new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
- }
- return super.getCreateChildText(owner, feature, child, selection);
- }
-
- <%}%>
-<%}%>
-<%if (genClass.getProviderExtendsGenClass() == null || genClass.getProviderExtendsGenClass().getGenPackage() != genPackage && (!genPackage.isExtensibleProviderFactory() || genClass.getProviderExtendsGenClass().getGenPackage().isExtensibleProviderFactory() != genPackage.isExtensibleProviderFactory())) {%>
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-<%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
-<%}%>
- public <%=genModel.getImportedName("org.eclipse.emf.common.util.ResourceLocator")%> getResourceLocator()
- {
-<%if (genPackage.isExtensibleProviderFactory()) {%>
- return ((<%=genModel.getImportedName("org.eclipse.emf.edit.provider.IChildCreationExtender")%>)adapterFactory).getResourceLocator();
-<%} else {%>
- return <%=genPackage.getImportedEditPluginClassName()%>.INSTANCE;
-<%}%>
- }
-
-<%}%>
-
-<% if(hasToImplementIVisibilityOverlayImage) {%>
- /**
- * Compose the image with specific visibility logo
- * Copied from UML implementation
- *
- * @param object
- * @param composedImage
- * @return {@link ComposedImage}
- */
- public ComposedImage composeVisibilityImage(Object object, ComposedImage composedImage) {
- NamedElement namedElement = (NamedElement)object;
-
- if(namedElement.isSetVisibility()) {
- composedImage.getImages().add(UMLEditPlugin.INSTANCE.getImage("full/ovr16/VisibilityKind_" //$NON-NLS-1$
- + namedElement.getVisibility().getName()));
- }
-
- return composedImage;
- }
-<%}%>
-
-
- /**
- * Override in order to handle has children for based class
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public Collection<?> getChildren(Object object) {
- Collection<Object> result = (Collection<Object>)super.getChildren(object);
- if (object instanceof EObject){
- EObject eObject = (EObject)object;
- /**
- * Handle based elements type
- */
- if(((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory() != null) {
- <%for(EClass basedClass : SysMLOverUMLHelper.getBasedElement(genClass.getEcoreClass())) {%>
- /**
- * Handle <%=basedClass.getName()%> stereotyped by <%=genClass.getName()%>
- */
- if (UMLPackage.Literals.<%=SysMLOverUMLHelper.getClassifierCorrectLabel(basedClass)%>.equals(eObject.eClass())){
- ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.<%=SysMLOverUMLHelper.getClassifierCorrectLabel(basedClass)%>);
- result.addAll((Collection<Object>)ite.getChildren(object));
- return result;
- }
- <%}%>
- }
- }
- return result;
- }
-
- /**
- * Override in order to handle has children for based class
- * @generated
- */
- @Override
- public boolean hasChildren(Object object) {
- if (object instanceof EObject){
- EObject eObject = (EObject)object;
- /**
- * Handle based elements type
- */
- if(((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory() != null) {
- <%for(EClass basedClass : SysMLOverUMLHelper.getBasedElement(genClass.getEcoreClass())) {%>
- /**
- * Handle <%=basedClass.getName()%> stereotyped by <%=genClass.getName()%>
- */
- if (UMLPackage.Literals.<%=SysMLOverUMLHelper.getClassifierCorrectLabel(basedClass)%>.equals(eObject.eClass())){
- ItemProviderAdapter ite = ((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.<%=SysMLOverUMLHelper.getClassifierCorrectLabel(basedClass)%>);
- return super.hasChildren(object) || ite.hasChildren(object);
- }
- <%}%>
- }
- }
- return super.hasChildren(object);
- }
-
-
-<%@ include file="ItemProvider/insert.javajetinc" fail="silent" %>
-}
-<%genModel.emitSortedImports();%>
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/edit/ItemProviderAdapterFactory.javajet b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/edit/ItemProviderAdapterFactory.javajet deleted file mode 100644 index ac057ef6766..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/edit/ItemProviderAdapterFactory.javajet +++ /dev/null @@ -1,587 +0,0 @@ -<%@ jet package="org.eclipse.emf.codegen.ecore.templates.edit" imports="java.util.* org.eclipse.emf.codegen.ecore.genmodel.*" class="ItemProviderAdapterFactory" version="$Id: ItemProviderAdapterFactory.javajet,v 1.15 2010/04/28 20:38:09 khussey Exp $" %>
-<%
-/**
- * <copyright>
- *
- * Copyright (c) 2002-2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- *
- * </copyright>
- */
-%>
-<%GenPackage genPackage = (GenPackage)argument; GenModel genModel=genPackage.getGenModel(); /* Trick to import java.util.* without warnings */Iterator.class.getName();%>
-<%@ include file="../Header.javajetinc"%>
-package <%=genPackage.getProviderPackageName()%>;
-<%genModel.addImport("org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory");%>
-<%genModel.addImport("org.eclipse.papyrus.sysml.edit.provider.IRootAdapterFactory");%>
-<%genModel.addImport("org.eclipse.uml2.uml.UMLPackage");%>
-<%genModel.addImport("org.eclipse.emf.common.notify.Adapter");%>
-<%genModel.addImport("org.eclipse.emf.common.notify.Notification");%>
-<%genModel.addImport("org.eclipse.emf.common.notify.Notifier");%>
-<%genModel.addImport("org.eclipse.emf.edit.provider.ChangeNotifier");%>
-<%genModel.addImport("org.eclipse.emf.edit.provider.ComposeableAdapterFactory");%>
-<%genModel.addImport("org.eclipse.emf.edit.provider.ComposedAdapterFactory");%>
-<%genModel.addImport("org.eclipse.emf.edit.provider.IChangeNotifier");%>
-<%genModel.addImport("org.eclipse.emf.edit.provider.IEditingDomainItemProvider");%>
-<%genModel.addImport("org.eclipse.emf.edit.provider.IItemLabelProvider");%>
-<%genModel.addImport("org.eclipse.emf.edit.provider.IItemPropertySource");%>
-<%genModel.addImport("org.eclipse.emf.edit.provider.INotifyChangedListener");%>
-<%genModel.addImport("org.eclipse.emf.edit.provider.IStructuredItemContentProvider");%>
-<%genModel.addImport("org.eclipse.emf.edit.provider.ITreeItemContentProvider");%>
-<%boolean useGenerics = genModel.useGenerics();%>
-<%String _ArrayList = genModel.getImportedName(useGenerics ? "java.util.ArrayList<java.lang.Object>" : "java.util.ArrayList");%>
-<%String _Collection = genModel.getImportedName(useGenerics ? "java.util.Collection<java.lang.Object>" : "java.util.Collection");%>
-<%genModel.markImportLocation(stringBuffer);%>
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class <%=genPackage.getItemProviderAdapterFactoryClassName()%> extends <%=genPackage.getImportedAdapterFactoryClassName()%> implements ComposeableAdapterFactory, IChangeNotifier, IComposableAdapterFactory <%if (genPackage.isDisposableProviderFactory()) {%>, <%=genModel.getImportedName("org.eclipse.emf.edit.provider.IDisposable")%><%}%><%if (genPackage.isExtensibleProviderFactory()) {%>, <%=genModel.getImportedName("org.eclipse.emf.edit.provider.IChildCreationExtender")%><%}%>
-{
-/**
- * Get the root adapter factory ( SysMLOverULM layer )
- * @generated
- */
- protected IRootAdapterFactory rootAdapterFactory;
- /**
- * {@link this#rootAdapterFactory}
- * @generated
- */
- public IRootAdapterFactory getIRootAdapterFactory() {
- return rootAdapterFactory;
- }
- /**
- * {@link this#rootAdapterFactory}
- * @generated
- */
- public void setRootAdapterFactory(IRootAdapterFactory root) {
- if(root instanceof IRootAdapterFactory){
- rootAdapterFactory = (IRootAdapterFactory)root;
- } else {
- throw new RuntimeException(root+" do not implement IRootAdapterFactory");
- }
- }
-<%if (genModel.hasCopyrightField()) {%>
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final <%=genModel.getImportedName("java.lang.String")%> copyright = <%=genModel.getCopyrightFieldLiteral()%>;<%=genModel.getNonNLS()%>
-
-<%}%>
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-<%if (genPackage.isDisposableProviderFactory() && genPackage.hasStatefulProvider()) {%>
- /**
- * This keeps track of all the item providers created, so that they can be {@link #dispose disposed}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected <%=genModel.getImportedName("org.eclipse.emf.edit.provider.Disposable")%> disposable = new Disposable();
-
-<%}%>
-<%if (genPackage.isExtensibleProviderFactory()) {%>
- /**
- * This helps manage the child creation extenders.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected <%=genModel.getImportedName("org.eclipse.emf.edit.provider.ChildCreationExtenderManager")%> childCreationExtenderManager = new <%=genModel.getImportedName("org.eclipse.emf.edit.provider.ChildCreationExtenderManager")%>(<%=genPackage.getImportedEditPluginClassName()%>.INSTANCE, <%=genPackage.getImportedPackageInterfaceName()%>.eNS_URI);
-
-<%}%>
- /**
- * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected <%=_Collection%> supportedTypes = new <%=_ArrayList%>();
-
- /**
- * This constructs an instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public <%=genPackage.getItemProviderAdapterFactoryClassName()%>()
- {
-<%for (String name : genPackage.getProviderSupportedTypes()) {%>
- supportedTypes.add(<%=genModel.getImportedName(name)%>.class);
-<%}%>
- }
-
-<%for (GenPackage genDelegate : genPackage.getAdapterDelegatePackages()) {%>
- /**
- * This keeps track of the factory to which to delegate adapter creation for objects from that package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected <%=genDelegate.getImportedAdapterFactoryClassName()%> <%=genPackage.getUncapAdapterFactoryDelegateName(genDelegate)%> = null;
-
- /**
- * This determines the delegate factory for the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected <%=genDelegate.getImportedAdapterFactoryClassName()%> get<%=genPackage.getAdapterFactoryDelegateName(genDelegate)%>()
- {
- if (<%=genPackage.getUncapAdapterFactoryDelegateName(genDelegate)%> == null)
- {
- <%=genModel.getImportedName("org.eclipse.emf.common.notify.AdapterFactory")%> rootAdapterFactory = getRootAdapterFactory();
- if (rootAdapterFactory instanceof ComposedAdapterFactory)
- {
- <%=genModel.getImportedName("org.eclipse.emf.common.notify.AdapterFactory")%> delegateAdapterFactory =
- ((ComposedAdapterFactory)rootAdapterFactory).getFactoryForType(<%=genDelegate.getImportedAdapterFactoryClassName()%>.getPackage());
- if (delegateAdapterFactory instanceof <%=genDelegate.getImportedAdapterFactoryClassName()%>)
- {
- <%=genPackage.getUncapAdapterFactoryDelegateName(genDelegate)%> = (<%=genDelegate.getImportedAdapterFactoryClassName()%>)delegateAdapterFactory;
- }
- }
- }
- return <%=genPackage.getUncapAdapterFactoryDelegateName(genDelegate)%>;
- }
-
-<%}%>
-<%for (GenClass genClass : genPackage.getGenClasses()) {%>
-<%if (!genClass.isAbstract() && genClass.getProvider() != GenProviderKind.NONE_LITERAL) {%>
-<%if (genClass.isProviderSingleton()) {%>
- /**
- * This keeps track of the one adapter used for all {@link <%=genClass.getQualifiedInterfaceName()%>} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected <%=genClass.getProviderClassName()%> <%=genClass.getUncapName()%>ItemProvider;
-
- /**
- * This creates an adapter for a {@link <%=genClass.getQualifiedInterfaceName()%>}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-<%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
-<%}%>
- public Adapter create<%=genClass.getName()%>Adapter()
- {
- if (<%=genClass.getUncapName()%>ItemProvider == null)
- {
- <%=genClass.getUncapName()%>ItemProvider = new <%=genClass.getProviderClassName()%>(this);
- }
-
- return <%=genClass.getUncapName()%>ItemProvider;
- }
-
-<%} else {%>
- /**
- * This creates an adapter for a {@link <%=genClass.getQualifiedInterfaceName()%>}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-<%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
-<%}%>
- public Adapter create<%=genClass.getName()%>Adapter()
- {
- return new <%=genClass.getProviderClassName()%>(this);
- }
-
-<%}%>
-<%}%>
-<%}%>
-<%for (GenClass genClass : genPackage.getAdapterDelegateSuperClasses()) {%>
- /**
- * <%=genClass.getName()%> of <%=genClass.getItemProviderAdapterFactoryClassName()%>
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter create<%=genClass.getName()%>Adapter()
- {
- return
- get<%=genClass.getItemProviderAdapterFactoryClassName()%>() == null ?
- null :
- get<%=genClass.getItemProviderAdapterFactoryClassName()%>().create<%=genClass.getName()%>Adapter();
- }
-
-<%}%>
- /**
- * This returns the root adapter factory that contains this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ComposeableAdapterFactory getRootAdapterFactory()
- {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- /**
- * This sets the composed adapter factory that contains this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)
- {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-<%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
-<%}%>
- public boolean isFactoryForType(Object type)
- {
- return supportedTypes.contains(type) || super.isFactoryForType(type);
- }
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-<%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
-<%}%>
- public Adapter adapt(Notifier notifier, Object type)
- {
- return super.adapt(notifier, this);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-<%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
-<%}%>
- public Object adapt(Object object, Object type)
- {
- if (isFactoryForType(type))
- {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class<%if (genModel.useGenerics()) {%><?><%}%>) || <%if (genModel.getRuntimePlatform() == GenRuntimePlatform.GWT) {%><%=genModel.getImportedName("org.eclipse.emf.common.util.Reflect")%>.isInstance((Class<%if (genModel.useGenerics()) {%><?><%}%>)type, adapter)<%} else {%>(((Class<%if (genModel.useGenerics()) {%><?><%}%>)type).isInstance(adapter))<%}%>)
- {
- return adapter;
- }
- }
-
- return null;
- }
-
-<%if (genPackage.isDisposableProviderFactory() && genPackage.hasStatefulProvider()) {%>
- /**
- * Associates an adapter with a notifier via the base implementation, then records it to ensure it will be disposed.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-<%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
-<%}%>
- protected void associate(Adapter adapter, Notifier target)
- {
- super.associate(adapter, target);
- if (adapter != null)
- {
- disposable.add(adapter);
- }
- }
-
-<%}%>
-<%if (genPackage.isExtensibleProviderFactory()) {%>
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public <%=genModel.getImportedName(useGenerics ? "java.util.List<org.eclipse.emf.edit.provider.IChildCreationExtender>" : "java.util.List")%> getChildCreationExtenders()
- {
- return childCreationExtenderManager.getChildCreationExtenders();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public <%=genModel.getImportedName(useGenerics ? "java.util.Collection<?>" : "java.util.Collection")%> getNewChildDescriptors(Object object, <%=genModel.getImportedName("org.eclipse.emf.edit.domain.EditingDomain")%> editingDomain)
- {
- return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public <%=genModel.getImportedName("org.eclipse.emf.common.util.ResourceLocator")%> getResourceLocator()
- {
- return childCreationExtenderManager;
- }
-
-<%}%>
- /**
- * This adds a listener.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener)
- {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener)
- {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void fireNotifyChanged(Notification notification)
- {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null)
- {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
-<%if (genPackage.isDisposableProviderFactory()) {%>
- /**
- * This disposes all of the item providers created by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void dispose()
- {
-<%if (genPackage.hasStatefulProvider()) {%>
- disposable.dispose();
-<%} else {%>
-<%for (GenClass genClass : genPackage.getGenClasses()) {%>
-<%if (!genClass.isAbstract() && genClass.isProviderSingleton()) {%>
- if (<%=genClass.getUncapName()%>ItemProvider != null) <%=genClass.getUncapName()%>ItemProvider.dispose();
-<%}%>
-<%}%>
-<%}%>
- }
-
-<%}%>
-<%if (genPackage.isChildCreationExtenders()) {%>
- <%for (Map.Entry<GenPackage, Map<GenClass, List<GenClass.ChildCreationData>>> packageEntry : genPackage.getExtendedChildCreationData().entrySet()) {%>
- /**
- * A child creation extender for the {@link <%=packageEntry.getKey().getImportedPackageInterfaceName()%>}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static class <%=genPackage.getChildCreationExtenderName(packageEntry.getKey())%> implements <%=genModel.getImportedName("org.eclipse.emf.edit.provider.IChildCreationExtender")%>
- {
- /**
- * The switch for creating child descriptors specific to each extended class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static class CreationSwitch extends <%=genModel.getImportedName(packageEntry.getKey().getQualifiedSwitchClassName())%><%=useGenerics ? "<Object>" : ""%>
- {
- /**
- * The child descriptors being populated.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected <%=genModel.getImportedName(useGenerics ? "java.util.List<Object>" : "java.util.List")%> newChildDescriptors;
-
- /**
- * The domain in which to create the children.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected <%=genModel.getImportedName("org.eclipse.emf.edit.domain.EditingDomain")%> editingDomain;
-
- /**
- * Creates the a switch for populating child descriptors in the given domain.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- CreationSwitch(<%=genModel.getImportedName(useGenerics ? "java.util.List<Object>" : "java.util.List")%> newChildDescriptors, <%=genModel.getImportedName("org.eclipse.emf.edit.domain.EditingDomain")%> editingDomain)
- {
- this.newChildDescriptors = newChildDescriptors;
- this.editingDomain = editingDomain;
- }
- <%for (Map.Entry<GenClass, List<GenClass.ChildCreationData>> classEntry : packageEntry.getValue().entrySet()) { GenClass genClass = classEntry.getKey();%>
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-<%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
-<%}%>
- public <%=genClass.getTypeParameters()%>Object case<%=genPackage.getClassUniqueName(genClass)%>(<%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceTypeArguments()%> object)
- {
- <%for (GenClass.ChildCreationData childCreationData : classEntry.getValue()) { GenFeature createFeature = childCreationData.createFeature; GenFeature delegatedFeature = childCreationData.delegatedFeature; GenClassifier createClassifier = childCreationData.createClassifier;%>
- <%if (createFeature.isFeatureMapType()) {%>
- <%if (delegatedFeature.isReferenceType()) { GenClass createClass = (GenClass)createClassifier;%>
-<%@ include file="ItemProvider/newChildDescriptorsReferenceDelegatedFeature.override.javajetinc" fail="alternative"%>
-<%@ start %>
- newChildDescriptors.add
- (createChildParameter
- (<%=createFeature.getQualifiedFeatureAccessor()%>,
- <%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMapUtil")%>.createEntry
- (<%=delegatedFeature.getQualifiedFeatureAccessor()%>,
- <%if (createClass.isMapEntry()) { %>
- <%=createClass.getGenPackage().getQualifiedEFactoryInstanceAccessor()%>.create(<%=createClass.getQualifiedClassifierAccessor()%>))));
- <%} else {%>
- <%=createClass.getGenPackage().getQualifiedFactoryInstanceAccessor()%>.create<%=createClass.getName()%>())));
- <%}%>
-<%@ include file="ItemProvider/newChildDescriptorsReferenceDelegatedFeature.insert.javajetinc" fail="silent"%>
-<%@ end %><%//ItemProvider/newChildDescriptorsReferenceDelegatedFeature.override.javajetinc%>
- <%} else { GenDataType createDataType = (GenDataType)createClassifier;%>
-<%@ include file="ItemProvider/newChildDescriptorsAttributeDelegatedFeature.override.javajetinc" fail="alternative"%>
-<%@ start %>
- newChildDescriptors.add
- (createChildParameter
- (<%=createFeature.getQualifiedFeatureAccessor()%>,
- <%=genModel.getImportedName("org.eclipse.emf.ecore.util.FeatureMapUtil")%>.createEntry
- (<%=delegatedFeature.getQualifiedFeatureAccessor()%>,
- <%if (delegatedFeature.isEnumBasedType()) {%>
- <%=delegatedFeature.getTypeGenEnum().getStaticValue(delegatedFeature.getEcoreFeature().getDefaultValueLiteral())%>)));
- <%} else if (delegatedFeature.isStringBasedType()) {%>
- <%=delegatedFeature.getCreateChildValueLiteral()%>)));<%=genModel.getNonNLS()%>
- <%} else { String literal = delegatedFeature.getCreateChildValueLiteral();%>
- <%=createDataType.getGenPackage().getQualifiedEFactoryInstanceAccessor()%>.createFromString(<%=createDataType.getQualifiedClassifierAccessor()%>, <%=literal%>))));<%if (literal != null) {%><%=genModel.getNonNLS()%><%} else {%> // TODO: ensure this is a valid literal value<%}%>
- <%}%>
-<%@ include file="ItemProvider/newChildDescriptorsAttributeDelegatedFeature.insert.javajetinc" fail="silent"%>
-<%@ end %><%//ItemProvider/newChildDescriptorsAttributeDelegatedFeature.override.javajetinc%>
- <%}%>
- <%} else if (createFeature.isReferenceType()) { GenClass createClass = (GenClass)createClassifier;%>
-<%@ include file="ItemProvider/newChildDescriptorsReferenceFeature.override.javajetinc" fail="alternative"%>
-<%@ start %>
- newChildDescriptors.add
- (createChildParameter
- (<%=createFeature.getQualifiedFeatureAccessor()%>,
- <%if (createClass.isMapEntry()) { %>
- <%=createClass.getGenPackage().getQualifiedEFactoryInstanceAccessor()%>.create(<%=createClass.getQualifiedClassifierAccessor()%>)));
- <%} else {%>
- <%=createClass.getGenPackage().getQualifiedFactoryInstanceAccessor()%>.create<%=createClass.getName()%>()));
- <%}%>
-<%@ include file="ItemProvider/newChildDescriptorsReferenceFeature.insert.javajetinc" fail="silent"%>
-<%@ end %><%//ItemProvider/newChildDescriptorsReferenceFeature.override.javajetinc %>
- <%} else { GenDataType createDataType = (GenDataType)createClassifier;%>
-<%@ include file="ItemProvider/newChildDescriptorsAttributeFeature.override.javajetinc" fail="alternative"%>
-<%@ start %>
- newChildDescriptors.add
- (createChildParameter
- (<%=createFeature.getQualifiedFeatureAccessor()%>,
- <%if (createFeature.isEnumBasedType()) {%>
- <%=createFeature.getTypeGenEnum().getStaticValue(createFeature.getEcoreFeature().getDefaultValueLiteral())%>));
- <%} else if (createFeature.isStringBasedType()) {%>
- <%=createFeature.getCreateChildValueLiteral()%>));<%=genModel.getNonNLS()%>
- <%} else { String literal = createFeature.getCreateChildValueLiteral();%>
- <%=createDataType.getGenPackage().getQualifiedEFactoryInstanceAccessor()%>.createFromString(<%=createDataType.getQualifiedClassifierAccessor()%>, <%=literal%>)));<%if (literal != null) {%><%=genModel.getNonNLS()%><%} else {%> // TODO: ensure this is a valid literal value<%}%>
- <%}%>
-<%@ include file="ItemProvider/newChildDescriptorsAttributeFeature.insert.javajetinc" fail="silent"%>
-<%@ end %><%//ItemProvider/newChildDescriptorsAttributeFeature.override.javajetinc%>
- <%}%>
-
- <%}%>
- return null;
- }
-
- <%}%>
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected <%=genModel.getImportedName("org.eclipse.emf.edit.command.CommandParameter")%> createChildParameter(Object feature, Object child)
- {
- return new <%=genModel.getImportedName("org.eclipse.emf.edit.command.CommandParameter")%>(null, feature, child);
- }
-
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public <%=_Collection%> getNewChildDescriptors(Object object, <%=genModel.getImportedName("org.eclipse.emf.edit.domain.EditingDomain")%> editingDomain)
- {
- <%=_ArrayList%> result = new <%=_ArrayList%>();
- new CreationSwitch(result, editingDomain).doSwitch((<%=genModel.getImportedName("org.eclipse.emf.ecore.EObject")%>)object);
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public <%=genModel.getImportedName("org.eclipse.emf.common.util.ResourceLocator")%> getResourceLocator()
- {
- return <%=genPackage.getImportedEditPluginClassName()%>.INSTANCE;
- }
- }
-
-
- <%}%>
-<%}%>
-}
-<%genModel.emitSortedImports();%>
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/edit/SysMLAdapterFactoryRegistery.javajet b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/edit/SysMLAdapterFactoryRegistery.javajet deleted file mode 100644 index 3694bc5580a..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/edit/SysMLAdapterFactoryRegistery.javajet +++ /dev/null @@ -1,193 +0,0 @@ -<%@ jet package="org.eclipse.emf.codegen.ecore.templates.model" imports="import java.util.HashMap org.eclipse.papyrus.sysml.sysmloveruml.codegen.generationUtils.SysMLOverUMLHelper org.eclipse.emf.ecore.EClass java.util.* org.eclipse.emf.codegen.ecore.genmodel.*" class="SysMLadapterFactoryRegistryMap" version="$Id: SysMLadapterFactoryRegistryMap.javajet,v 1.13 2011/09/01 15:53:17 emerks Exp $" %>
-<%
-/*****************************************************************************
- * Copyright (c) 2011 Atos.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Atos - Initial API and implementation
- *
- *****************************************************************************/
-%>
-<%GenModel genModel = (GenModel)argument; /* Trick to import java.util.* without warnings */Iterator.class.getName();%>
-/*****************************************************************************
- * Copyright (c) 2011 Atos.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Atos - Initial API and implementation
- *****************************************************************************/
-package <%=SysMLOverUMLHelper.getAdapterFactoryRegistryPackageName()%>;
-<%genModel.addImport("org.eclipse.uml2.uml.Package");%>
-<%genModel.addImport("org.eclipse.emf.edit.provider.ItemProviderAdapter");%>
-<%genModel.addImport("org.eclipse.uml2.uml.Class");%>
-<%genModel.addImport("org.eclipse.emf.common.notify.Adapter");%>
-<%genModel.addImport("org.eclipse.emf.common.notify.Notifier");%>
-<%genModel.addImport("org.eclipse.emf.common.notify.impl.AdapterFactoryImpl");%>
-<%genModel.addImport("org.eclipse.emf.ecore.EObject");%>
-<%genModel.addImport("org.eclipse.emf.ecore.EPackage");%>
-<%genModel.addImport("org.eclipse.uml2.uml.*");%>
-<%genModel.addImport("org.eclipse.papyrus.sysml.extendedelements.IComposableAdapterFactory");%>
-<%genModel.addImport("org.eclipse.uml2.uml.UMLPackage");%>
-
-
-<%genModel.addImport("org.eclipse.papyrus.sysml.extendedelements.AdapterFactoryImplExtended");%>
-<%for ( GenPackage genPackage : genModel.getAllGenPackagesWithConcreteClasses() ) { %>
- <%genModel.addImport(genPackage.getItemProviderAdapterFactoryClassName());%>
-<%}%>
-
-/**
- * Get a registry of all SysML Adapter Factory classified by the UML class their
- * correspond.
- *
- * Example:
- *
- * <Class.class> ->[ModelelementsItemProviderAdapterFactory,
- * BlocksAdapterItemProviderFactory, RequirementsAdapterItemProviderFactory]
- *
- * @generated
- */
-public class <%=SysMLOverUMLHelper.getAdapterFactoryRegistryClassName()%>
-{
- <%HashMap<GenPackage,String> varaibleStoreName = new HashMap<GenPackage,String>();%>
- <%for ( GenPackage genPackage : genModel.getAllGenPackagesWithConcreteClasses() ) { %>
- /**
- * Keep track of the item provider of type <%=genPackage.getItemProviderAdapterFactoryClassName()%>
- * @generated
- */
- <%varaibleStoreName.put(genPackage,genPackage.getUncapAdapterFactoryClassName()+"ItemProvider");%>
- protected <%=genPackage.getItemProviderAdapterFactoryClassName()%> <%=genPackage.getUncapAdapterFactoryClassName()%>ItemProvider;
- <%}%>
- /**
- * Registry for all SysML AdapterFactory
- * @generated
- */
- private List<AdapterFactory> adapterFactoryRegistry = new ArrayList<AdapterFactory>(<%=genModel.getAllGenPackagesWithConcreteClasses().size()%>);
-
-
- /**
- * Registry of all {@link AdapterFactory} classified by corresponding UML element
- * @generated
- */
- private HashMap<EClass,ArrayList<AdapterFactory>> adapterFactoryRegistryMap = new HashMap<EClass,ArrayList<AdapterFactory>>();
- /**
- * Default adapterFactory
- * @generated
- */
- private UMLItemProviderAdapterFactory defaultAdapterFactory = new UMLItemProviderAdapterFactory();
- /**
- * Constructor + initialize
- * @generated
- */
- private <%=SysMLOverUMLHelper.getAdapterFactoryRegistryClassName()%> (){
- /**
- * Initialize all AdapterFactories
- */
- <%for ( GenPackage genPackage : genModel.getAllGenPackagesWithConcreteClasses() ) { %>
- <%=varaibleStoreName.get(genPackage)%> = new <%=genPackage.getItemProviderAdapterFactoryClassName()%>();
- adapterFactoryRegistry.add(<%=varaibleStoreName.get(genPackage)%>);
- <%}%>
- <% TreeMap<String, Set<GenPackage>> result = SysMLOverUMLHelper.getSortedEClassBasedElementFromModel(genModel);%>
- <%for(Map.Entry<String,Set<GenPackage>> entry : result.entrySet()) {%>
- <%boolean isFirst = true;%>
- <%String key = entry.getKey();%>
- <%Set<GenPackage> value = entry.getValue();%>
- <% for (GenPackage genPackageAux : value) {%>
- <% if (isFirst) {%>
- <%isFirst = false;%>
- /**
- * AdapterFactories for the <%=key%> elements
- */
- adapterFactoryRegistryMap.put(UMLPackage.Literals.<%=key%>,new ArrayList<AdapterFactory>(Collections.singletonList(<%=varaibleStoreName.get(genPackageAux)%>)));
- <%} else { %>
- adapterFactoryRegistryMap.get(UMLPackage.Literals.<%=key%>).add(<%=varaibleStoreName.get(genPackageAux)%>);
- <%}%>
- <%}%>
- <%}%>
- }
- /**
- * Singleton holder
- * @generated
- */
- private static class SingletonHolder {
- protected static <%=SysMLOverUMLHelper.getAdapterFactoryRegistryClassName()%> instance = null;
- static {
- instance = new <%=SysMLOverUMLHelper.getAdapterFactoryRegistryClassName()%>();
- }
- }
- /**
- * @generated
- */
- public static <%=SysMLOverUMLHelper.getAdapterFactoryRegistryClassName()%> getSingleton() {
- return SingletonHolder.instance;
- }
- /**
- * Get the default AdapterFactory
- * @return List<AdapterFactory> return the default adapter factory (UML)
- * @generated
- */
- public AdapterFactory getDefaultAdapterFactory() {
- return (AdapterFactory)defaultAdapterFactory;
- }
-
- /**
- * Get the list of all AdapterFactory for this type
- * @param Object element
- * @return List<AdapterFactory> List of all the adapter factories which can handle the object element
- * @generated
- */
- public List<AdapterFactory> getAdapterFactoriesForType(Object element){
- if (element instanceof EObject) {
- EObject eObject = (EObject) element;
- ArrayList<AdapterFactory> result = adapterFactoryRegistryMap.get(eObject.eClass());
- if ( result != null){
- return result;
- } else {
- return Collections.singletonList(getDefaultAdapterFactory());
- }
- } else {
- throw new RuntimeException("org.eclipse.papyrus.sysml.edit.utils.SysmlRegistryAdapterFactoryRegistery : This factory only works with EOBjects");
- }
- }
-
- /**
- * Set the the root AdapterFactory for all registered adapter factory
- * @param AdapterFactory The adapter factory which will be the root
- * @generated
- */
- public void setRootAdapterFactory(IRootAdapterFactory adapter){
- for (AdapterFactory adap : adapterFactoryRegistry) {
- if ( adap instanceof IComposableAdapterFactory){
- ((IComposableAdapterFactory)adap).setRootAdapterFactory(adapter);
- }
- }
- }
- /**
- * Get a map of all UML ItemProvider needed
- * @generated
- */
- public HashMap<EClass,ItemProviderAdapter> getUMLItemProviderClassifedByUMLElement(AdapterFactory rootAdapterFactory){
- HashMap<EClass,ItemProviderAdapter> result = new HashMap<EClass,ItemProviderAdapter>();
- <%for (EClass umlElement: SysMLOverUMLHelper.getAllUMLElementNameFromModel(genModel)) { %>
- result.put(UMLPackage.Literals.<%=SysMLOverUMLHelper.getClassifierCorrectLabel(umlElement)%>,new <%=umlElement.getName()%>ItemProvider(rootAdapterFactory));
- <%}%>
- return result;
- }
-
-
-
-
-
-
-} //<%=SysMLOverUMLHelper.getAdapterFactoryRegistryPackageName()%>;
-<%genModel.emitSortedImports();%>
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/model/AdapterFactoryClass.javajet b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/model/AdapterFactoryClass.javajet deleted file mode 100644 index 7e857787e3a..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/model/AdapterFactoryClass.javajet +++ /dev/null @@ -1,188 +0,0 @@ -<%@ jet package="org.eclipse.emf.codegen.ecore.templates.model" imports="org.eclipse.papyrus.sysml.sysmloveruml.codegen.generationUtils.SysMLOverUMLHelper org.eclipse.emf.ecore.EClass java.util.* org.eclipse.emf.codegen.ecore.genmodel.*" class="AdapterFactoryClass" version="$Id: AdapterFactoryClass.javajet,v 1.13 2008/12/13 15:53:17 emerks Exp $" %>
-<%
-/**
- * <copyright>
- *
- * Copyright (c) 2002-2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- *
- * </copyright>
- */
-%>
-<%GenPackage genPackage = (GenPackage)argument; GenModel genModel=genPackage.getGenModel(); /* Trick to import java.util.* without warnings */Iterator.class.getName();%>
-<%@ include file="../Header.javajetinc"%>
-package <%=genPackage.getUtilitiesPackageName()%>;
-<%genModel.addImport("org.eclipse.uml2.uml.Package");%>
-<%genModel.addImport("org.eclipse.uml2.uml.Class");%>
-<%genModel.addImport("org.eclipse.emf.common.notify.Adapter");%>
-<%genModel.addImport("org.eclipse.emf.common.notify.Notifier");%>
-<%genModel.addImport("org.eclipse.emf.common.notify.impl.AdapterFactoryImpl");%>
-<%genModel.addImport("org.eclipse.emf.ecore.EObject");%>
-<%genModel.addImport("org.eclipse.emf.ecore.EPackage");%>
-<%genModel.addImport("org.eclipse.uml2.uml.*");%>
-
-<%if (!genPackage.hasJavaLangConflict() && !genPackage.getUtilitiesPackageName().equals(genPackage.getInterfacePackageName())) genModel.addImport(genPackage.getInterfacePackageName() + ".*");%>
-<%String typeArgument = genModel.useGenerics() ? "<Adapter>" : "";%>
-<%String returnType = genModel.useGenerics() ? "Adapter" : genModel.getImportedName("java.lang.Object");%>
-<%String adapterCast = genModel.useGenerics() ? "" : "(Adapter)";%>
-<%genModel.markImportLocation(stringBuffer);%>
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see <%=genPackage.getQualifiedPackageInterfaceName()%>
- * @generated
- */
-public class <%=genPackage.getAdapterFactoryClassName()%> extends AdapterFactoryImpl
-{
-<%if (genModel.hasCopyrightField()) {%>
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final <%=genModel.getImportedName("java.lang.String")%> copyright = <%=genModel.getCopyrightFieldLiteral()%>;<%=genModel.getNonNLS()%>
-
-<%}%>
- /**
- * The cached model package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static <%=genPackage.getImportedPackageInterfaceName()%> modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public <%=genPackage.getAdapterFactoryClassName()%>()
- {
- if (modelPackage == null)
- {
- modelPackage = <%=genPackage.getImportedPackageInterfaceName()%>.eINSTANCE;
- }
- }
-
- /**
- * Returns whether this factory is applicable for the type of the object.
- * <!-- begin-user-doc -->
- * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
- * <!-- end-user-doc -->
- * @return whether this factory is applicable for the type of the object.
- * @generated
- */
- <%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
- <%}%>
- public boolean isFactoryForType(Object object)
- {
- if (object == modelPackage || object == UMLPackage.eINSTANCE)
- {
- return true;
- }
- if (object instanceof EObject)
- {
- EPackage ePackage = ((EObject)object).eClass().getEPackage() ;
- return ePackage != null && (ePackage == modelPackage || ePackage == UMLPackage.eINSTANCE);
- }
- return false;
- }
-
- /**
- * The switch that delegates to the <code>createXXX</code> methods.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected <%=genPackage.getSwitchClassName()%><%=typeArgument%> modelSwitch =
- new <%=genPackage.getSwitchClassName()%><%=typeArgument%>()
- {
- <%for (GenClass genClass : genPackage.getGenClasses()) {%>
- <%for (EClass eClass : SysMLOverUMLHelper.getBasedElement(genClass.getEcoreClass())) {%>
- @Override
- public <%=genClass.getTypeParameters()%><%=returnType%> <%=SysMLOverUMLHelper.getCaseXStereotypedByYLabelFunction(genClass,eClass)%>(<%=eClass.getName()%> <%=SysMLOverUMLHelper.getBasedClassVariableName(eClass)%>) {
- if(<%=SysMLOverUMLHelper.getIsXFromYLabelFunction(genClass,eClass)%>(<%=SysMLOverUMLHelper.getBasedClassVariableName(eClass)%>)){
- return create<%=genPackage.getClassUniqueName(genClass)%>Adapter();
- }
- return null;
- }
- <%}%>
- <%}%>
-<%for (GenClass genClass : genPackage.getAllSwitchGenClasses()) {%>
- <%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
- <%}%>
- public <%=genClass.getTypeParameters()%><%=returnType%> case<%=genPackage.getClassUniqueName(genClass)%>(<%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceTypeArguments()%> object)
- {
- return create<%=genPackage.getClassUniqueName(genClass)%>Adapter();
- }
-<%}%>
- <%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
- <%}%>
- public <%=returnType%> defaultCase(EObject object)
- {
- return create<%=genPackage.getClassUniqueName(null)%>Adapter();
- }
- };
-
- /**
- * Creates an adapter for the <code>target</code>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param target the object to adapt.
- * @return the adapter for the <code>target</code>.
- * @generated
- */
- <%if (genModel.useClassOverrideAnnotation()) {%>
- @Override
- <%}%>
- public Adapter createAdapter(Notifier target)
- {
- return <%=adapterCast%>modelSwitch.doSwitch((EObject)target);
- }
-
-<%for (GenClass genClass : genPackage.getAllSwitchGenClasses()) {%>
-
- /**
- * Creates a new adapter for an object of class '{@link <%=genClass.getQualifiedInterfaceName()%> <em><%=genClass.getFormattedName()%></em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see <%=genClass.getQualifiedInterfaceName()%>
- * @generated
- */
- public Adapter create<%=genPackage.getClassUniqueName(genClass)%>Adapter()
- {
- return null;
- }
-<%}%>
-
- /**
- * Creates a new adapter for the default case.
- * <!-- begin-user-doc -->
- * This default implementation returns null.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @generated
- */
- public Adapter create<%=genPackage.getClassUniqueName(null)%>Adapter()
- {
- return null;
- }
-
-} //<%=genPackage.getAdapterFactoryClassName()%>
-<%genModel.emitSortedImports();%>
diff --git a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/model/SwitchClass.javajet b/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/model/SwitchClass.javajet deleted file mode 100644 index 166b6362e8a..00000000000 --- a/plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen/templates/model/SwitchClass.javajet +++ /dev/null @@ -1,306 +0,0 @@ -<%@ jet package="org.eclipse.emf.codegen.ecore.templates.model" imports="org.eclipse.emf.ecore.EClass java.util.* org.eclipse.papyrus.sysml.sysmloveruml.codegen.generationUtils.SysMLOverUMLHelper org.eclipse.emf.codegen.ecore.genmodel.*" class="SwitchClass" version="$Id: SwitchClass.javajet,v 1.23 2011/01/20 01:10:53 emerks Exp $" %>
-<%
-/**
- * <copyright>
- *
- * Copyright (c) 2002-2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- *
- * </copyright>
- */
-%>
-<%GenPackage genPackage = (GenPackage)argument; GenModel genModel=genPackage.getGenModel();%>
-<%boolean supportsComposition = genModel.getRuntimeVersion().getValue() >= GenRuntimeVersion.EMF27_VALUE;%>
-<%@ include file="../Header.javajetinc"%>
-package <%=genPackage.getUtilitiesPackageName()%>;
-
-<%genModel.addImport("org.eclipse.uml2.uml.Package");%>
-<%genModel.addImport("org.eclipse.uml2.uml.Class");%>
-<%genModel.addImport("org.eclipse.uml2.uml.*");%>
-<%genModel.addImport("org.eclipse.uml2.uml.util.UMLUtil");%>
-<%if (supportsComposition) {%>
-<%genModel.addImport("org.eclipse.emf.ecore.EObject");%>
-<%genModel.addImport("org.eclipse.emf.ecore.EPackage");%>
-<%genModel.addImport("org.eclipse.emf.ecore.util.Switch");%>
-<%} else {%>
-<%genModel.addImport("org.eclipse.emf.ecore.EClass");%>
-<%genModel.addImport("org.eclipse.emf.ecore.EObject");%>
-<%}%>
-<%if (!genPackage.hasJavaLangConflict() && !genPackage.getUtilitiesPackageName().equals(genPackage.getInterfacePackageName())) genModel.addImport(genPackage.getInterfacePackageName() + ".*");%>
-<%
-String templateParameterName = null;
-if (genModel.useGenerics())
-{
- Set<String> usedNames = new HashSet<String>();
- for (GenEnum genEnum : genPackage.getGenEnums())
- {
- usedNames.add(genEnum.getName());
- }
- for (GenClass genClass : genPackage.getAllSwitchGenClasses())
- {
- if (!genClass.isDynamic() && !genClass.isExternalInterface())
- {
- usedNames.add(genClass.getName());
- }
- for (GenTypeParameter genTypeParameter : genClass.getGenTypeParameters())
- {
- usedNames.add(genTypeParameter.getName());
- }
- }
- templateParameterName = "T";
- for (int i = 1; usedNames.contains(templateParameterName); ++i)
- {
- templateParameterName = "T" + i;
- }
-}
-%>
-<%String templateParameters = genModel.useGenerics() ? "<" + templateParameterName + ">" : "";%>
-<%String returnType = genModel.useGenerics() ? templateParameterName : genModel.getImportedName("java.lang.Object");%>
-<%genModel.markImportLocation(stringBuffer);%>
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see <%=genPackage.getQualifiedPackageInterfaceName()%>
- * @generated
- */
-public class <%=genPackage.getSwitchClassName()%><%=templateParameters%><%if (supportsComposition){%> extends Switch<%=templateParameters%><%}%>
-{
-<%if (genModel.hasCopyrightField()) {%>
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final <%=genModel.getImportedName("java.lang.String")%> copyright = <%=genModel.getCopyrightFieldLiteral()%>;<%=genModel.getNonNLS()%>
-
-<%}%>
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static <%=genPackage.getImportedPackageInterfaceName()%> modelPackage;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public <%=genPackage.getSwitchClassName()%>()
- {
- if (modelPackage == null)
- {
- modelPackage = <%=genPackage.getImportedPackageInterfaceName()%>.eINSTANCE;
- }
- }
-
-<%if (supportsComposition) {%>
- /**
- * Checks whether this is a switch for the given package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @parameter ePackage the package in question.
- * @return whether this is a switch for the given package.
- * @generated
- */
- @Override
- protected boolean isSwitchFor(EPackage ePackage)
- {
- /**
- * ePackage == UMLPackage.eINSTANCE in order to accept UML element
- */
- return ePackage == modelPackage || ePackage == UMLPackage.eINSTANCE;
- }
-<%} else {%>
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- public <%=returnType%> doSwitch(EObject theEObject)
- {
- return doSwitch(theEObject.eClass(), theEObject);
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected <%=returnType%> doSwitch(EClass theEClass, EObject theEObject)
- {
- if (theEClass.eContainer() == modelPackage)
- {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- else
- {
- <%=genModel.getImportedName("java.util.List")%><%if (genModel.useGenerics()) {%><<%=genModel.getImportedName("org.eclipse.emf.ecore.EClass")%>><%}%> eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch(<%if (!genModel.useGenerics()) {%>(EClass)<%}%>eSuperTypes.get(0), theEObject);
- }
- }
-<%}%>
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
-<%if (supportsComposition) {%>
- @Override
-<%}%>
- protected <%=returnType%> doSwitch(int classifierID, EObject theEObject)
- {
- if(theEObject.eClass().getEPackage() == UMLPackage.eINSTANCE){
- switch(classifierID)
- {
- <%//BEGIN : Handling UML element %>
- <%String currentClassifier = "";%>
- <%TreeMap<String,List<GenClass>> sortedBasedElement = SysMLOverUMLHelper.getSortedBasedElementFromPackage(genPackage);%>
- <%for (Map.Entry<String,List<GenClass>> entry : sortedBasedElement.entrySet()){%>
- <%String key = entry.getKey();%>
- <%List<GenClass> value = entry.getValue();%>
- <%int ite = 0;%>
- <%for (GenClass genClass : value) { %>
- <% if (ite == 0) {%>
- case UMLPackage.<%=SysMLOverUMLHelper.getClassifierCorrectLabel(key)%>:{
- <%=key%> umlElement = (<%=key%>) theEObject;
- T result;
- <%}%>
- result = <%=SysMLOverUMLHelper.getCaseXStereotypedByYLabelFunction(genClass,key)%>(umlElement);
- if (result != null){
- return result;
- }
- <% if(ite == (value.size()-1)) {%>
- return null;
- }
- <%}%>
- <%ite++;%>
- <%}%>
- <%if(key.equals(sortedBasedElement.lastKey())){%>
- default :
- return defaultCase(theEObject);
- }
- <%}%>
- <%}%>
- <%// END : Handling UML element %>
-
- } else {
- switch (classifierID)
- {
-<%for (GenClass genClass : genPackage.getGenClasses()) {%>
- <%if (!genClass.isExternalInterface() && !genClass.isEObject() || genClass.isMapEntry()) { String result = "result".equals(genClass.getSafeUncapName()) ? "theResult" : "result"; %>
- case <%=genPackage.getImportedPackageInterfaceName()%>.<%=genPackage.getClassifierID(genClass)%>:
- {
- <%if (genClass.isUncheckedCast() || genClass.isMapEntry() && genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50) {%>@SuppressWarnings("unchecked") <%}%><%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceWildTypeArguments()%> <%=genClass.getSafeUncapName()%> = (<%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceWildTypeArguments()%>)theEObject;
- <%=returnType%> <%=result%> = case<%=genPackage.getClassUniqueName(genClass)%>(<%=genClass.getSafeUncapName()%>);
- <%for (GenClass baseGenClass : genClass.getSwitchGenClasses()) {%>
- if (<%=result%> == null) <%=result%> = case<%=genPackage.getClassUniqueName(baseGenClass)%>(<%if (genClass.isMapEntry()) {%>(<%=baseGenClass.getImportedInterfaceName()%><%=baseGenClass.getInterfaceTypeArguments()%>)<%}%><%=genClass.getSafeUncapName()%>);
- <%}%>
- if (<%=result%> == null) <%=result%> = defaultCase(theEObject);
- return <%=result%>;
- }
- <%}%>
-<%}%>
- default: return defaultCase(theEObject);
- }
- }
- }
-<%for (GenClass genClass : genPackage.getAllSwitchGenClasses()) {%>
-
- /**
- * Returns the result of interpreting the object as an instance of '<em><%=genClass.getFormattedName()%></em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em><%=genClass.getFormattedName()%></em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public <%=genClass.getTypeParameters()%><%=returnType%> case<%=genPackage.getClassUniqueName(genClass)%>(<%=genClass.getImportedInterfaceName()%><%=genClass.getInterfaceTypeArguments()%> object)
- {
- return null;
- }
-<%}%>
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch, but this is the last case anyway.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
- */
-<%if (supportsComposition) {%>
- @Override
-<%}%>
- public <%=returnType%> defaultCase(EObject object)
- {
- return null;
- }
-
- <%for (GenClass genClass : genPackage.getGenClasses()) {%>
- <%for (EClass eClass : SysMLOverUMLHelper.getBasedElement(genClass.getEcoreClass())) {%>
- /**
- * Tell if the <%=eClass.getName()%> is a <%=genClass.getEcoreClass().getName()%> implementation
- * @param <%=eClass.getName()%>
- * @return
- * @generated
- */
- protected Boolean <%=SysMLOverUMLHelper.getIsXFromYLabelFunction(genClass,eClass) %>(<%=eClass.getName()%> <%=SysMLOverUMLHelper.getBasedClassVariableName(eClass)%>) {
- if(UMLUtil.getStereotypeApplication(<%=SysMLOverUMLHelper.getBasedClassVariableName(eClass)%>, <%=genPackage.getClassUniqueName(genClass)%>.class) != null) {
- return true;
- }
- return false;
- }
-
-
- /**
- * Returns the result of interpreting the object as an instance of '<em><%=genClass.getEcoreClass().getName()%></em>' from <%=eClass.getName()%> object. <!--
- * begin-user-doc --> This implementation returns null; returning a non-null result will
- * terminate the switch. <!-- end-user-doc -->
- *
- * @param object
- * the target of the switch.
- * @return the result of interpreting the object as an instance of '<em><%=genClass.getEcoreClass().getName()%></em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T <%=SysMLOverUMLHelper.getCaseXStereotypedByYLabelFunction(genClass,eClass)%>(<%=eClass.getName()%> <%=SysMLOverUMLHelper.getBasedClassVariableName(eClass)%>) {
- return null;
- }
- <%}%>
- <%}%>
-
-} //<%=genPackage.getSwitchClassName()%>
-<%genModel.emitSortedImports();%>
diff --git a/releng/Dev.launch b/releng/Dev.launch index 83214400eeb..7e4069c2b4f 100644 --- a/releng/Dev.launch +++ b/releng/Dev.launch @@ -7,6 +7,7 @@ <stringAttribute key="M2_PROFILES" value=""/>
<listAttribute key="M2_PROPERTIES">
<listEntry value="papyrus.repo.main=file:/${project_loc:releng}/main/target/repository"/>
+<listEntry value="papyrus.repo.extra=file:/${project_loc:releng}/extras/target/repository"/>
</listAttribute>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
diff --git a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup index bcbd7386757..53bc2cdef19 100644 --- a/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup +++ b/releng/org.eclipse.papyrus.oomph/setups/papyrus.setup @@ -2778,6 +2778,41 @@ </stream> <description>Release engineering tools, including the POM and Oomph Setup dependencies updater actions.</description> </project> + <project + name="devtools" + label="Developer Tools"> + <stream + name="master" + label="master (Mars/1.1)"> + <setupTask + xsi:type="setup:VariableTask" + name="papyrus.bugzilla.version" + value="1.0.0&version=1.0.1&version=1.0.2&version=1.1.0"/> + <setupTask + xsi:type="setup.p2:P2Task"> + <requirement + name="org.eclipse.papyrus.dev.feature.feature.group"/> + <repository + url="https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/releng/dev/target/repository/"/> + </setupTask> + </stream> + <stream + name="streams/1.0-maintenance" + label="streams/1.0-maintenance (Luna/1.0.x)"> + <setupTask + xsi:type="setup:VariableTask" + name="papyrus.bugzilla.version" + value="1.0.0&version=1.0.1&version=1.0.2"/> + <setupTask + xsi:type="setup.p2:P2Task"> + <requirement + name="org.eclipse.papyrus.dev.feature.feature.group"/> + <repository + url="https://hudson.eclipse.org/papyrus/job/Papyrus-Luna-Developer/lastSuccessfulBuild/artifact/releng/dev/target/repository/"/> + </setupTask> + </stream> + <description>Installs developer tools, including the code generator for Papyrus diagram plug-ins and various debugging aids such as "spy" views. Source code is not included.</description> + </project> <stream name="master" label="master (Mars/1.1)"> @@ -2794,7 +2829,7 @@ name="papyrus.bugzilla.version" value="1.0.0&version=1.0.1&version=1.0.2"/> </stream> - <description>Sources and tools required for working on the Papyrus developer tools (not part of the product).</description> + <description>Sources and tools required for working on the Papyrus developer tools (not part of the product). Does not install the developer tools in your IDE: use the Developer Tools sub-project for that.</description> </project> <stream name="master" label="master (Mars/1.1)"> diff --git a/releng/top-pom-dev.xml b/releng/top-pom-dev.xml index fce4c78ae9c..a915d9fb6c7 100644 --- a/releng/top-pom-dev.xml +++ b/releng/top-pom-dev.xml @@ -8,7 +8,7 @@ <modules> <module>../plugins/developer/org.eclipse.papyrus.codegen</module> <module>../plugins/developer/org.eclipse.papyrus.dev.java.utils</module> - <!-- <module>../plugins/developer/org.eclipse.papyrus.dev.project.management</module> --> + <module>../plugins/developer/org.eclipse.papyrus.dev.project.management</module> <module>../plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request</module> <module>../plugins/developer/org.eclipse.papyrus.developer.profile</module> <!-- <module>../plugins/developer/org.eclipse.papyrus.diagramdev.modelexplorer</module> --> @@ -22,11 +22,10 @@ <module>../plugins/developer/org.eclipse.papyrus.gmf.editpoliciesstates</module> <module>../plugins/developer/org.eclipse.papyrus.gmf.figureview</module> <module>../plugins/developer/org.eclipse.papyrus.gmfgenextension</module> - <!-- <module>../plugins/developer/org.eclipse.papyrus.infra.emf.commandstack</module>--> + <module>../plugins/developer/org.eclipse.papyrus.infra.emf.commandstack</module> <module>../plugins/developer/org.eclipse.papyrus.infra.extendedtypes.elementtypeview</module> <module>../plugins/developer/org.eclipse.papyrus.mwe2.utils</module> - <!-- <module>../plugins/developer/org.eclipse.papyrus.releng.tools</module>--> - <!-- <module>../plugins/developer/org.eclipse.papyrus.sysml.sysmloveruml.codegen</module> --> + <module>../plugins/developer/org.eclipse.papyrus.releng.tools</module> <module>../plugins/developer/org.eclipse.papyrus.uml.developer.mde</module> <module>../plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.debug</module> <module>../features/papyrus-dev-features/org.eclipse.papyrus.dev.feature</module> @@ -35,13 +34,14 @@ <properties> <tycho-version>0.22.0</tycho-version> <tychoExtrasVersion>0.22.0</tychoExtrasVersion> - <papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/mars</papyrus.repo.main> + <papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/mars/main</papyrus.repo.main> + <papyrus.repo.extra>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/mars/extra</papyrus.repo.extra> </properties> <repositories> <repository> <id>eclipse</id> <layout>p2</layout> - <url>http://download.eclipse.org/releases/staging</url> + <url>http://download.eclipse.org/releases/mars</url> </repository> <repository> <id>ep</id> @@ -56,10 +56,21 @@ <url>http://download.eclipse.org/modeling/emf/cdo/drops/R20140610-0212</url> </repository> <repository> + <id>b3</id> + <layout>p2</layout> + <!-- B3 is not in the release train. Always targets the latest released version (i.e. Luna for Mars Development) --> + <url>http://download.eclipse.org/modeling/emft/b3/updates-4.4</url> + </repository> + <repository> <id>papyrus-main</id> <layout>p2</layout> <url>${papyrus.repo.main}</url> </repository> + <repository> + <id>papyrus-extra</id> + <layout>p2</layout> + <url>${papyrus.repo.extra}</url> + </repository> </repositories> <build> <plugins> @@ -76,8 +87,8 @@ <artifactId>tycho-compiler-plugin</artifactId> <version>${tycho-version}</version> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> <optimize>true</optimize> <showWarnings>true</showWarnings> </configuration> diff --git a/releng/top-pom-extras.xml b/releng/top-pom-extras.xml index 0b203677845..dc6454dea21 100755..100644 --- a/releng/top-pom-extras.xml +++ b/releng/top-pom-extras.xml @@ -1,645 +1,647 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.papyrus</groupId>
- <artifactId>org.eclipse.papyrus</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <modules>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.cdo.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.diagramtemplate.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.eastadl.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.properties.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.textedit.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.migration.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.moka.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.compare.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.umlrt.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.java.generator.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.java.profile.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.java.reverse.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.layers.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.uml.export.feature</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.acceleo</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.acceleo.debug</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.acceleo.ui</module>
- <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.core</module>
- <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.ui</module>
- <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties</module>
- <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink</module>
- <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui</module>
- <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui</module>
- <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui</module>
- <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems</module>
- <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.codegen.base</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.codegen</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.examples</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.profile</module>
- <module>../plugins/customization/org.eclipse.papyrus.customization</module>
- <module>../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate</module>
- <module>../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit</module>
- <module>../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor</module>
- <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation</module>
- <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator</module>
- <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model</module>
- <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui</module>
- <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties</module>
- <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard</module>
- <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl</module>
- <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable</module>
- <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation</module>
- <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config</module>
- <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu</module>
- <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types</module>
- <module>../plugins/infra/org.eclipse.papyrus.eclipse.project.editors</module>
- <module>../extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile</module>
- <module>../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.generator.ui</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.profile</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.profile.edit</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.profile.editor</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.reverse</module>
- <module>../extraplugins/java/org.eclipse.papyrus.java.reverse.ui</module>
- <module>../extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit</module>
- <module>../extraplugins/layers/org.eclipse.papyrus.layers.runtime</module>
- <module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel</module>
- <module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram</module>
- <module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit</module>
- <module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor</module>
- <module>../extraplugins/layers/org.eclipse.papyrus.layers.ui</module>
- <module>../extraplugins/marte/properties/org.eclipse.papyrus.marte.properties</module>
- <module>../extraplugins/marte/org.eclipse.papyrus.marte.static.profile</module>
- <module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext</module>
- <module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui</module>
- <module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext</module>
- <module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui</module>
- <module>../extraplugins/marte/org.eclipse.papyrus.marte.vsl</module>
- <module>../extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui</module>
- <module>../extraplugins/migration/org.eclipse.papyrus.migration.properties.model</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka.alf.resources</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka.async.fuml</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka.composites</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka.composites.utils</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.activeobjectcontrollerlibrary</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.assertionlibrary</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation</module>
- <module>../extraplugins/moka/org.eclipse.papyrus.moka.ui</module>
- <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core</module>
- <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc</module>
- <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui</module>
- <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation</module>
- <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl</module>
- <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core</module>
- <module>../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing</module>
- <module>../extraplugins/robotml/org.eclipse.papyrus.robotml</module>
- <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.deployment</module>
- <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common</module>
- <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.ui</module>
- <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.doc</module>
- <module>../extraplugins/robotml/generators/org.eclipse.papyrus.robotml.generators.common</module>
- <module>../extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps</module>
- <module>../extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui</module>
- <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.perspective</module>
- <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.templaterepository</module>
- <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.validation</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.texteditor.model</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer</module>
- <module>../extraplugins/uml/compare/org.eclipse.papyrus.uml.compare</module>
- <module>../extraplugins/uml/org.eclipse.papyrus.uml.export</module>
-
- <!-- Papyrus Uml Rt -->
- <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt</module>
- <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.elementtypes</module>
- <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties</module>
- <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation</module>
- <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.wizard</module>
-
- <module>../extraplugins/migration/org.eclipse.papyrus.m2m.qvto</module>
- <module>../extraplugins/migration/org.eclipse.papyrus.migration.rsa</module>
- <module>../extraplugins/codegen/org.eclipse.papyrus.views.cpp</module>
- <module>../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints</module>
- <!-- Papyrus Uml Diagram Ecore -->
- <module>../extraplugins/papyrus4ecore/org.eclipse.papyrus.uml.diagram.ecore</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.uml.diagram.ecore.feature</module>
- <!-- Module EPF -->
- <module>../extraplugins/epf-richtext/org.eclipse.papyrus.infra.widgets.epf.richtext.extension</module>
- <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.epf.richtext.feature</module>
- <module>extras</module>
- </modules>
- <properties>
- <tycho-version>0.22.0</tycho-version>
- <tychoExtrasVersion>0.22.0</tychoExtrasVersion>
- <xtext.version>2.7.3</xtext.version>
- <java.source.version>1.6</java.source.version>
- <java.target.version>1.6</java.target.version>
- <papyrus.eclipse.target>mars</papyrus.eclipse.target>
- <papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}</papyrus.repo.main>
- </properties>
- <repositories>
- <repository>
- <id>org.eclipse.epf.richtext_1.5.1.6-update-site</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/modeling/mdt/papyrus/updates/epf/main</url>
- </repository>
- <repository>
- <id>papyrus-main</id>
- <layout>p2</layout>
- <url>${papyrus.repo.main}</url>
- </repository>
- <repository>
- <id>cdt</id>
- <layout>p2</layout>
- <!-- updateFrom("CDT",0) -->
- <url>http://download.eclipse.org/tools/cdt/builds/mars/milestones</url>
- </repository>
- <repository>
- <id>emft-emffacet</id>
- <layout>p2</layout>
- <!-- updateFrom("EMF Facet",0) -->
- <url>http://download.eclipse.org/facet/updates/integration/1.0.0/I201411271427/</url>
- </repository>
- <repository>
- <id>emf-cdo</id>
- <layout>p2</layout>
- <!-- updateFrom("EMF CDO",0) -->
- <url>http://download.eclipse.org/modeling/emf/cdo/drops/R20140610-0212</url>
- </repository>
- <repository>
- <id>emf-compare</id>
- <layout>p2</layout>
- <!-- updateFrom("EMF COMPARE",0) -->
- <url>http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.1/S201412161011</url>
- </repository>
- <repository>
- <id>emf-emf</id>
- <layout>p2</layout>
- <!-- updateFrom("EMF (Core)",0) -->
- <url>http://download.eclipse.org/modeling/emf/emf/updates/2.11milestones/</url>
- </repository>
- <repository>
- <id>emft-mwe[0]</id>
- <layout>p2</layout>
- <!-- updateFrom("EMFT MWE",0) -->
- <url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201412160330/mwe</url>
- </repository>
- <repository>
- <id>emft-mwe[1]</id>
- <layout>p2</layout>
- <!-- updateFrom("EMFT MWE",1) -->
- <url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201412160441/mwe2lang</url>
- </repository>
- <repository>
- <id>emf-query</id>
- <layout>p2</layout>
- <!-- updateFrom("EMF Query",0) -->
- <url>http://download.eclipse.org/modeling/emf/query/updates/milestones/S201412161725/</url>
- </repository>
- <repository>
- <id>emf-transaction</id>
- <layout>p2</layout>
- <!-- updateFrom("EMF TRANSACTION",0) -->
- <url>http://download.eclipse.org/modeling/emf/transaction/updates/milestones/S201412161904</url>
- </repository>
- <repository>
- <id>emf-validation</id>
- <layout>p2</layout>
- <!-- updateFrom("EMF VALIDATION",0) -->
- <url>http://download.eclipse.org/modeling/emf/validation/updates/milestones/S201412161741</url>
- </repository>
- <repository>
- <id>ep</id>
- <layout>p2</layout>
- <!-- updateFrom("Eclipse",0) -->
- <url>http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M4-201412102000/</url>
- </repository>
- <repository>
- <id>gef</id>
- <layout>p2</layout>
- <!-- updateFrom("GEF",0) -->
- <url>http://download.eclipse.org/tools/gef/updates/milestones</url>
- </repository>
- <repository>
- <id>gmp-gmf-notation</id>
- <layout>p2</layout>
- <!-- updateFrom("GMF Notation",0) -->
- <url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201412161742</url>
- </repository>
- <repository>
- <id>gmp-gmf-runtime</id>
- <layout>p2</layout>
- <!-- updateFrom("GMF Runtime",0) -->
- <url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201412162002</url>
- </repository>
- <repository>
- <id>gmf-tooling</id>
- <layout>p2</layout>
- <!-- updateFrom("GMF Tooling",0) -->
- <url>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/M4</url>
- </repository>
- <repository>
- <id>m2t-acceleo</id>
- <layout>p2</layout>
- <!-- updateFrom("M2T ACCELEO",0) -->
- <url>http://download.eclipse.org/acceleo/updates/milestones/3.6/S201408190816</url>
- </repository>
- <repository>
- <id>m2t-xpand</id>
- <layout>p2</layout>
- <!-- updateFrom("M2T XPAND",0) -->
- <url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201412160338/</url>
- </repository>
- <repository>
- <id>mdt-ocl</id>
- <layout>p2</layout>
- <!-- updateFrom("MDT OCL 5.1",0) -->
- <url>http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/5.1.0/S201412151441</url>
- </repository>
- <repository>
- <id>mdt-uml2</id>
- <layout>p2</layout>
- <!-- updateFrom("MDT UML2",0) -->
- <url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.1milestones</url>
- </repository>
- <repository>
- <id>mmt-qvto</id>
- <layout>p2</layout>
- <!-- updateFrom("QVT Operational",0) -->
- <url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.5.0/S201412161054</url>
- </repository>
- <repository>
- <id>nattable</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/nattable/releases/1.1.0/repository/</url>
- </repository>
- <repository>
- <id>orbit</id>
- <layout>p2</layout>
- <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository</url>
- </repository>
- <repository>
- <id>subversive</id>
- <layout>p2</layout>
- <!-- updateFrom("Subversive",0) -->
- <url>http://download.eclipse.org/technology/subversive/2.0/mars-site/</url>
- </repository>
- <repository>
- <id>tmf-xtext</id>
- <layout>p2</layout>
- <!-- updateFrom("Xtext, Xtend",0) -->
- <url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201412160421/</url>
- </repository>
- <repository>
- <id>webtools</id>
- <layout>p2</layout>
- <!-- updateFrom("WebTools",0) -->
- <url>http://download.eclipse.org/webtools/downloads/drops/R3.7.0/S-3.7.0M4-20141211000148/repository/</url>
- </repository>
- <repository>
- <id>XWT</id>
- <layout>p2</layout>
- <!-- updateFrom("XWT",0) -->
- <url>http://download.eclipse.org/xwt/release-1.1.0</url>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>org.eclipse.cbi.maven.plugins</id>
- <name>Eclipse CBI</name>
- <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- <build>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
- <configuration>
- <source>${java.source.version}</source>
- <target>${java.target.version}</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.6</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.9.1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.xtend</groupId>
- <artifactId>xtend-maven-plugin</artifactId>
- <version>${xtext.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-compiler-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <source>${java.source.version}</source>
- <target>${java.target.version}</target>
- <optimize>true</optimize>
- <showWarnings>true</showWarnings>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-maven-plugin</artifactId>
- <version>${tycho-version}</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <environments>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-repository-plugin</artifactId>
- <version>${tycho-version}</version>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>plugin-source</id>
- <goals>
- <goal>plugin-source</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <version>${tychoExtrasVersion}</version>
- <executions>
- <execution>
- <id>source-feature</id>
- <phase>package</phase>
- <goals>
- <goal>source-feature</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.9</version>
- <executions>
- <execution>
- <id>purge-local-dependencies</id>
- <phase>process-sources</phase>
- <goals>
- <goal>purge-local-repository</goal>
- </goals>
- <configuration>
- <includes>
- <include>org.eclipse.papyrus</include>
- </includes>
- <verbose>true</verbose>
- <resolutionFuzziness>groupId</resolutionFuzziness>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-
- <profiles>
-
- <profile>
- <id>defaultProfile</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>attach-p2-metadata</id>
- <phase>package</phase>
- <goals>
- <goal>p2-metadata</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- </profile>
-
- <profile>
- <id>packAndSign</id> <!-- Stable release profile. Takes +30min. Eclipse servers only -->
- <!-- Pack200 -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-pack200a-plugin</artifactId>
- <version>${tychoExtrasVersion}</version>
- <executions>
- <execution>
- <id>pack200-normalize</id>
- <goals>
- <goal>normalize</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.cbi.maven.plugins</groupId>
- <artifactId>eclipse-jarsigner-plugin</artifactId>
- <version>1.0.5</version>
- <executions>
- <execution>
- <id>sign</id>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-pack200b-plugin</artifactId>
- <version>${tychoExtrasVersion}</version>
- <executions>
- <execution>
- <id>pack200-pack</id>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>attach-p2-metadata</id>
- <phase>package</phase>
- <goals>
- <goal>p2-metadata</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <defaultP2Metadata>false</defaultP2Metadata>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <activation>
- <property>
- <name>SIGN</name>
- <value>true</value>
- </property>
- </activation>
- </profile>
-
-
- <profile>
- <id>pack</id> <!-- Nightly profile. Artifacts can be consumed, but are not signed -->
- <build>
- <plugins>
- <!-- Pack200 -->
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-pack200b-plugin</artifactId>
- <version>${tychoExtrasVersion}</version>
- <executions>
- <execution>
- <id>pack200-pack</id>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>attach-p2-metadata</id>
- <phase>package</phase>
- <goals>
- <goal>p2-metadata</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <defaultP2Metadata>false</defaultP2Metadata>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <activation>
- <property>
- <name>SIGN</name>
- <value>false</value>
- </property>
- </activation>
- </profile>
-
- <!-- profile dedicated to activate the repository linked to nightly artifacts, useful for daily life of developers -->
- <profile>
- <id>nightly</id>
- <repositories>
- <repository>
- <id>papyrus</id>
- <layout>p2</layout>
- <url>${papyrus.repo.main}</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- </repository>
- </repositories>
- <activation>
- <property>
- <name>env</name>
- <value>devnightly</value>
- </property>
- <activeByDefault>false</activeByDefault>
- </activation>
- </profile>
- </profiles>
-</project>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>pom</packaging> + <modules> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.cdo.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.diagramtemplate.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.dsml.validation.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.eastadl.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.properties.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.marte.textedit.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.migration.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.moka.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.basic.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.qompass.designer.tracing.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.robotml.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.uml.compare.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.umlrt.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.java.generator.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.java.profile.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.java.reverse.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.layers.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.uml.export.feature</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.migration.rsa.feature</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.acceleo</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.acceleo.debug</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.acceleo.ui</module> + <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.core</module> + <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.ui</module> + <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties</module> + <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink</module> + <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui</module> + <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui</module> + <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui</module> + <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems</module> + <module>../extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.codegen.base</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.codegen.extensionpoints</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.cdtproject</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.codegen</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.examples</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.cpp.profile</module> + <module>../plugins/customization/org.eclipse.papyrus.customization</module> + <module>../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate</module> + <module>../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.edit</module> + <module>../extraplugins/diagramtemplate/org.eclipse.papyrus.diagramtemplate.editor</module> + <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation</module> + <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.generator</module> + <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model</module> + <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.model.ui</module> + <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.properties</module> + <module>../extraplugins/dsml.validation/org.eclipse.papyrus.dsml.validation.wizard</module> + <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl</module> + <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable</module> + <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation</module> + <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config</module> + <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu</module> + <module>../extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types</module> + <module>../plugins/infra/org.eclipse.papyrus.eclipse.project.editors</module> + <module>../extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile</module> + <module>../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracepoints</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.generator.jdtsynchronizer</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.edit</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.generator.metamodel.jdt.editor</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.generator.transfo.umltojdt</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.generator.ui</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.profile</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.profile.edit</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.profile.editor</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.reverse</module> + <module>../extraplugins/java/org.eclipse.papyrus.java.reverse.ui</module> + <module>../extraplugins/layers/org.eclipse.papyrus.layers.notationmodel.edit</module> + <module>../extraplugins/layers/org.eclipse.papyrus.layers.runtime</module> + <module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel</module> + <module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.diagram</module> + <module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.edit</module> + <module>../extraplugins/layers/org.eclipse.papyrus.layers.stackmodel.editor</module> + <module>../extraplugins/layers/org.eclipse.papyrus.layers.ui</module> + <module>../extraplugins/marte/properties/org.eclipse.papyrus.marte.properties</module> + <module>../extraplugins/marte/org.eclipse.papyrus.marte.static.profile</module> + <module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext</module> + <module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.constraintwithvsl.xtext.ui</module> + <module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext</module> + <module>../extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui</module> + <module>../extraplugins/marte/org.eclipse.papyrus.marte.vsl</module> + <module>../extraplugins/marte/org.eclipse.papyrus.marte.vsl.ui</module> + <module>../extraplugins/migration/org.eclipse.papyrus.migration.properties.model</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka.alf.resources</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka.async.fuml</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka.composites</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka.composites.utils</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.activeobjectcontrollerlibrary</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.assertionlibrary</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka.fuml.validation</module> + <module>../extraplugins/moka/org.eclipse.papyrus.moka.ui</module> + <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core</module> + <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.doc</module> + <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.ui</module> + <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.validation</module> + <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.vsl</module> + <module>../extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core</module> + <module>../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing</module> + <module>../extraplugins/robotml/org.eclipse.papyrus.robotml</module> + <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.deployment</module> + <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.common</module> + <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.diagram.ui</module> + <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.doc</module> + <module>../extraplugins/robotml/generators/org.eclipse.papyrus.robotml.generators.common</module> + <module>../extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps</module> + <module>../extraplugins/robotml/generators/rtmaps/org.eclipse.papyrus.robotml.generators.intempora.rtmaps.ui</module> + <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.perspective</module> + <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.templaterepository</module> + <module>../extraplugins/robotml/org.eclipse.papyrus.robotml.validation</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.texteditor.model</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.texteditor.modelexplorer</module> + <module>../extraplugins/uml/compare/org.eclipse.papyrus.uml.compare</module> + <module>../extraplugins/uml/org.eclipse.papyrus.uml.export</module> + + <!-- Papyrus Uml Rt --> + <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt</module> + <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.elementtypes</module> + <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties</module> + <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.validation</module> + <module>../extraplugins/umlrt/org.eclipse.papyrus.umlrt.wizard</module> + + <module>../extraplugins/migration/org.eclipse.papyrus.m2m.qvto</module> + <module>../extraplugins/migration/org.eclipse.papyrus.migration.rsa</module> + <module>../extraplugins/codegen/org.eclipse.papyrus.views.cpp</module> + <module>../extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints</module> + <!-- Papyrus Uml Diagram Ecore --> + <module>../extraplugins/papyrus4ecore/org.eclipse.papyrus.uml.diagram.ecore</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.uml.diagram.ecore.feature</module> + <!-- Papyrus 4 Education --> + <module>../extraplugins/papyrus4education/org.eclipse.papyrus.uml.diagram.education</module> + <!-- Module EPF --> + <module>../extraplugins/epf-richtext/org.eclipse.papyrus.infra.widgets.epf.richtext.extension</module> + <module>../features/papyrus-extra-features/org.eclipse.papyrus.extra.epf.richtext.feature</module> + <module>extras</module> + </modules> + <properties> + <tycho-version>0.22.0</tycho-version> + <tychoExtrasVersion>0.22.0</tychoExtrasVersion> + <xtext.version>2.7.3</xtext.version> + <java.source.version>1.6</java.source.version> + <java.target.version>1.6</java.target.version> + <papyrus.eclipse.target>mars</papyrus.eclipse.target> + <papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}</papyrus.repo.main> + </properties> + <repositories> + <repository> + <id>org.eclipse.epf.richtext_1.5.1.6-update-site</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/mdt/papyrus/updates/epf/main</url> + </repository> + <repository> + <id>papyrus-main</id> + <layout>p2</layout> + <url>${papyrus.repo.main}</url> + </repository> + <repository> + <id>cdt</id> + <layout>p2</layout> + <!-- updateFrom("CDT",0) --> + <url>http://download.eclipse.org/tools/cdt/builds/mars/milestones</url> + </repository> + <repository> + <id>emft-emffacet</id> + <layout>p2</layout> + <!-- updateFrom("EMF Facet",0) --> + <url>http://download.eclipse.org/facet/updates/integration/1.0.0/I201411271427/</url> + </repository> + <repository> + <id>emf-cdo</id> + <layout>p2</layout> + <!-- updateFrom("EMF CDO",0) --> + <url>http://download.eclipse.org/modeling/emf/cdo/drops/R20140610-0212</url> + </repository> + <repository> + <id>emf-compare</id> + <layout>p2</layout> + <!-- updateFrom("EMF COMPARE",0) --> + <url>http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.1/S201412161011</url> + </repository> + <repository> + <id>emf-emf</id> + <layout>p2</layout> + <!-- updateFrom("EMF (Core)",0) --> + <url>http://download.eclipse.org/modeling/emf/emf/updates/2.11milestones/</url> + </repository> + <repository> + <id>emft-mwe[0]</id> + <layout>p2</layout> + <!-- updateFrom("EMFT MWE",0) --> + <url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201412160330/mwe</url> + </repository> + <repository> + <id>emft-mwe[1]</id> + <layout>p2</layout> + <!-- updateFrom("EMFT MWE",1) --> + <url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201412160441/mwe2lang</url> + </repository> + <repository> + <id>emf-query</id> + <layout>p2</layout> + <!-- updateFrom("EMF Query",0) --> + <url>http://download.eclipse.org/modeling/emf/query/updates/milestones/S201412161725/</url> + </repository> + <repository> + <id>emf-transaction</id> + <layout>p2</layout> + <!-- updateFrom("EMF TRANSACTION",0) --> + <url>http://download.eclipse.org/modeling/emf/transaction/updates/milestones/S201412161904</url> + </repository> + <repository> + <id>emf-validation</id> + <layout>p2</layout> + <!-- updateFrom("EMF VALIDATION",0) --> + <url>http://download.eclipse.org/modeling/emf/validation/updates/milestones/S201412161741</url> + </repository> + <repository> + <id>ep</id> + <layout>p2</layout> + <!-- updateFrom("Eclipse",0) --> + <url>http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M4-201412102000/</url> + </repository> + <repository> + <id>gef</id> + <layout>p2</layout> + <!-- updateFrom("GEF",0) --> + <url>http://download.eclipse.org/tools/gef/updates/milestones</url> + </repository> + <repository> + <id>gmp-gmf-notation</id> + <layout>p2</layout> + <!-- updateFrom("GMF Notation",0) --> + <url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones/S201412161742</url> + </repository> + <repository> + <id>gmp-gmf-runtime</id> + <layout>p2</layout> + <!-- updateFrom("GMF Runtime",0) --> + <url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S201412162002</url> + </repository> + <repository> + <id>gmf-tooling</id> + <layout>p2</layout> + <!-- updateFrom("GMF Tooling",0) --> + <url>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.3/M4</url> + </repository> + <repository> + <id>m2t-acceleo</id> + <layout>p2</layout> + <!-- updateFrom("M2T ACCELEO",0) --> + <url>http://download.eclipse.org/acceleo/updates/milestones/3.6/S201408190816</url> + </repository> + <repository> + <id>m2t-xpand</id> + <layout>p2</layout> + <!-- updateFrom("M2T XPAND",0) --> + <url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201412160338/</url> + </repository> + <repository> + <id>mdt-ocl</id> + <layout>p2</layout> + <!-- updateFrom("MDT OCL 5.1",0) --> + <url>http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/5.1.0/S201412151441</url> + </repository> + <repository> + <id>mdt-uml2</id> + <layout>p2</layout> + <!-- updateFrom("MDT UML2",0) --> + <url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.1milestones</url> + </repository> + <repository> + <id>mmt-qvto</id> + <layout>p2</layout> + <!-- updateFrom("QVT Operational",0) --> + <url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.5.0/S201412161054</url> + </repository> + <repository> + <id>nattable</id> + <layout>p2</layout> + <url>http://download.eclipse.org/nattable/releases/1.1.0/repository/</url> + </repository> + <repository> + <id>orbit</id> + <layout>p2</layout> + <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository</url> + </repository> + <repository> + <id>subversive</id> + <layout>p2</layout> + <!-- updateFrom("Subversive",0) --> + <url>http://download.eclipse.org/technology/subversive/2.0/mars-site/</url> + </repository> + <repository> + <id>tmf-xtext</id> + <layout>p2</layout> + <!-- updateFrom("Xtext, Xtend",0) --> + <url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201412160421/</url> + </repository> + <repository> + <id>webtools</id> + <layout>p2</layout> + <!-- updateFrom("WebTools",0) --> + <url>http://download.eclipse.org/webtools/downloads/drops/R3.7.0/S-3.7.0M4-20141211000148/repository/</url> + </repository> + <repository> + <id>XWT</id> + <layout>p2</layout> + <!-- updateFrom("XWT",0) --> + <url>http://download.eclipse.org/xwt/release-1.1.0</url> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>org.eclipse.cbi.maven.plugins</id> + <name>Eclipse CBI</name> + <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> + <build> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.2</version> + <configuration> + <source>${java.source.version}</source> + <target>${java.target.version}</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <version>2.6</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.9.1</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>1.2.1</version> + </plugin> + <plugin> + <groupId>org.eclipse.xtend</groupId> + <artifactId>xtend-maven-plugin</artifactId> + <version>${xtext.version}</version> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <configuration> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-compiler-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <source>${java.source.version}</source> + <target>${java.target.version}</target> + <optimize>true</optimize> + <showWarnings>true</showWarnings> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tycho-version}</version> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <environments> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86_64</arch> + </environment> + </environments> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-repository-plugin</artifactId> + <version>${tycho-version}</version> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>plugin-source</id> + <goals> + <goal>plugin-source</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-source-feature-plugin</artifactId> + <version>${tychoExtrasVersion}</version> + <executions> + <execution> + <id>source-feature</id> + <phase>package</phase> + <goals> + <goal>source-feature</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.9</version> + <executions> + <execution> + <id>purge-local-dependencies</id> + <phase>process-sources</phase> + <goals> + <goal>purge-local-repository</goal> + </goals> + <configuration> + <includes> + <include>org.eclipse.papyrus</include> + </includes> + <verbose>true</verbose> + <resolutionFuzziness>groupId</resolutionFuzziness> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + + <profiles> + + <profile> + <id>defaultProfile</id> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>attach-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + </profile> + + <profile> + <id>packAndSign</id> <!-- Stable release profile. Takes +30min. Eclipse servers only --> + <!-- Pack200 --> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-pack200a-plugin</artifactId> + <version>${tychoExtrasVersion}</version> + <executions> + <execution> + <id>pack200-normalize</id> + <goals> + <goal>normalize</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.cbi.maven.plugins</groupId> + <artifactId>eclipse-jarsigner-plugin</artifactId> + <version>1.0.5</version> + <executions> + <execution> + <id>sign</id> + <goals> + <goal>sign</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-pack200b-plugin</artifactId> + <version>${tychoExtrasVersion}</version> + <executions> + <execution> + <id>pack200-pack</id> + <goals> + <goal>pack</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>attach-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + <configuration> + <defaultP2Metadata>false</defaultP2Metadata> + </configuration> + </plugin> + </plugins> + </build> + <activation> + <property> + <name>SIGN</name> + <value>true</value> + </property> + </activation> + </profile> + + + <profile> + <id>pack</id> <!-- Nightly profile. Artifacts can be consumed, but are not signed --> + <build> + <plugins> + <!-- Pack200 --> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-pack200b-plugin</artifactId> + <version>${tychoExtrasVersion}</version> + <executions> + <execution> + <id>pack200-pack</id> + <goals> + <goal>pack</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>attach-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + <configuration> + <defaultP2Metadata>false</defaultP2Metadata> + </configuration> + </plugin> + </plugins> + </build> + <activation> + <property> + <name>SIGN</name> + <value>false</value> + </property> + </activation> + </profile> + + <!-- profile dedicated to activate the repository linked to nightly artifacts, useful for daily life of developers --> + <profile> + <id>nightly</id> + <repositories> + <repository> + <id>papyrus</id> + <layout>p2</layout> + <url>${papyrus.repo.main}</url> + <releases> + <enabled>true</enabled> + <updatePolicy>daily</updatePolicy> + <checksumPolicy>warn</checksumPolicy> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>daily</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + </repository> + </repositories> + <activation> + <property> + <name>env</name> + <value>devnightly</value> + </property> + <activeByDefault>false</activeByDefault> + </activation> + </profile> + </profiles> +</project> diff --git a/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/qvt/AbstractTransformationTest.java b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/qvt/AbstractTransformationTest.java index 1f67fed5697..2d72e0c78f9 100644 --- a/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/qvt/AbstractTransformationTest.java +++ b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/qvt/AbstractTransformationTest.java @@ -17,6 +17,8 @@ import java.util.List; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.IPath; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.util.EcoreUtil; @@ -77,12 +79,14 @@ public class AbstractTransformationTest extends AbstractPapyrusTest { launcher.waitForCompletion(); Assert.assertTrue("The transformation didn't complete normally", launcher.getResult().isOK()); + checkResultFile(mainModelFile); } else { ImportTransformation transformation = new ImportTransformation(sourceURI); transformation.run(false); transformation.waitForCompletion(); Assert.assertTrue("The transformation didn't complete normally", transformation.getStatus().isOK()); + checkResultFile(mainModelFile); } } @@ -129,6 +133,24 @@ public class AbstractTransformationTest extends AbstractPapyrusTest { launcher.waitForCompletion(); Assert.assertTrue("The transformation didn't complete normally", launcher.getResult().isOK()); + + for (IFile sourceFile : mainModelFiles){ + checkResultFile(sourceFile); + } + } + + protected void checkResultFile(IFile sourceFile){ + IPath targetPath; + if ("emx".equals(sourceFile.getFullPath().getFileExtension())){ + targetPath = sourceFile.getFullPath().removeFileExtension().addFileExtension("uml"); + } else if ("epx".equals(sourceFile.getFullPath().getFileExtension())){ + targetPath = sourceFile.getFullPath().removeFileExtension().addFileExtension("profile.uml"); + } else { + return; + } + + IFile targetFile = ResourcesPlugin.getWorkspace().getRoot().getFile(targetPath); + Assert.assertTrue(targetFile.exists()); } protected void assertRSAModelsRemoved(boolean resolveAll) { diff --git a/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/qvt/BatchImportTest.java b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/qvt/BatchImportTest.java index 4b4c57348c5..c33bb5ba9f0 100644 --- a/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/qvt/BatchImportTest.java +++ b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/qvt/BatchImportTest.java @@ -86,6 +86,9 @@ public class BatchImportTest extends AbstractTransformationTest { launcher.waitForCompletion(); Assert.assertTrue("The transformation didn't complete normally", launcher.getResult().isOK()); + for (IFile sourceFile : mainModelFiles){ + checkResultFile(sourceFile); + } // /////////////////////////////////////////// } diff --git a/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/qvt/ImportDiagramTest.java b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/qvt/ImportDiagramTest.java index 121de8e2a30..34f36115df9 100644 --- a/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/qvt/ImportDiagramTest.java +++ b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/qvt/ImportDiagramTest.java @@ -21,6 +21,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
@@ -108,11 +109,21 @@ public class ImportDiagramTest extends AbstractPapyrusTest { fileProfile = URI.createPlatformResourceURI(Activator.PLUGIN_ID + ".testProject" + "/Profile.epx", true);
ImportTransformation transfoProfile = new ImportTransformation(fileProfile);
+ //Run in sequence, since individual transformations are not thread safe
+
transfoDiagram.run(false);
- transfoProfile.run(false);
-
transfoDiagram.waitForCompletion();
+
+ transfoProfile.run(false);
transfoProfile.waitForCompletion();
+
+ URI umlModelURI = fileDiagram.trimFileExtension().appendFileExtension("uml");
+ IFile umlModelFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(umlModelURI.toPlatformString(true)));
+ Assert.assertTrue(umlModelFile.exists());
+
+ URI umlProfileURI = fileProfile.trimFileExtension().appendFileExtension("profile.uml");
+ IFile umlProfileFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(umlProfileURI.toPlatformString(true)));
+ Assert.assertTrue(umlProfileFile.exists());
}
diff --git a/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/qvt/ImportProfilesTest.java b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/qvt/ImportProfilesTest.java index 4230702cec0..f0b563afca8 100644 --- a/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/qvt/ImportProfilesTest.java +++ b/tests/junit/extraplugins/migration/org.eclipse.papyrus.migration.rsa.tests/src/org/eclipse/papyrus/migration/rsa/tests/qvt/ImportProfilesTest.java @@ -20,7 +20,6 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.papyrus.junit.framework.classification.FailingTest; import org.eclipse.papyrus.umlrt.UMLRealTime.Capsule; import org.eclipse.papyrus.umlrt.UMLRealTime.Protocol; import org.eclipse.papyrus.umlrt.UMLRealTime.ProtocolContainer; @@ -120,7 +119,6 @@ public class ImportProfilesTest extends AbstractTransformationTest { // resources/rt+fragments/* @Test - @FailingTest("Bug 457430/457433") // Fragmented StateMachines are not found in QVTo, thus are not stereotyped public void testFragmentedRTModel() throws Exception { String path = "resources/rt+fragments/"; |
