Update version to 0.13.0

dice-project · Dec 5, 2017 · f997024 · f997024
1 parent 5394033
commit f997024
Show file tree

Hide file tree

Showing 33 changed files with 151 additions and 196 deletions.
diff --git a/bundles/com.masdes.dam.static.profile.ui/META-INF/MANIFEST.MF b/bundles/com.masdes.dam.static.profile.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.masdes.dam.static.profile.ui;singleton:=true
-Bundle-Version: 0.12.8.qualifier
+Bundle-Version: 0.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: com.masdes.dam.profile.ui.DAMEditPlugin$Implementation
 Bundle-Vendor: %providerName

diff --git a/bundles/com.masdes.dam.static.profile/META-INF/MANIFEST.MF b/bundles/com.masdes.dam.static.profile/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.masdes.dam.static.profile;singleton:=true
-Bundle-Version: 0.12.8.qualifier
+Bundle-Version: 0.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

diff --git a/bundles/es.unizar.disco.dice.static.profile/META-INF/MANIFEST.MF b/bundles/es.unizar.disco.dice.static.profile/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: es.unizar.disco.dice.static.profile;singleton:=true
-Bundle-Version: 0.12.8.qualifier
+Bundle-Version: 0.13.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -15,8 +15,6 @@ Export-Package: es.unizar.disco.dice.Basic_Enumeration_Types,
  es.unizar.disco.dice.DDSM,
  es.unizar.disco.dice.DDSM.impl,
  es.unizar.disco.dice.DDSM.util,
- es.unizar.disco.dice.DICE_UML_Extensions,
- es.unizar.disco.dice.DICE_UML_Extensions.impl,
  es.unizar.disco.dice.DICE,
  es.unizar.disco.dice.DICE.impl,
  es.unizar.disco.dice.DPIM,

diff --git a/bundles/es.unizar.disco.dice.static.profile/resources/DICE.ecore b/bundles/es.unizar.disco.dice.static.profile/resources/DICE.ecore
diff --git a/bundles/es.unizar.disco.dice.static.profile/resources/DICE.genmodel b/bundles/es.unizar.disco.dice.static.profile/resources/DICE.genmodel
@@ -3,8 +3,8 @@
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
     modelDirectory="/es.unizar.disco.dice.static.profile/src" modelPluginID="es.unizar.disco.dice.static.profile"
     modelName="DICE" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="8.0" copyrightFields="false"
-    usedGenPackages="../../com.masdes.dam.static.profile/resources/DAM.genmodel#//DAM ../../com.masdes.dam.static.profile/resources/DAM.genmodel#//DAM_Library ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.marte.static.profile/resources/MARTE.genmodel#//MARTE ../../org.eclipse.papyrus.marte.static.profile/resources/MARTE.genmodel#//MARTE_Library ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml ../../org.eclipse.papyrus.marte.static.profile/resources/MARTE.genmodel#//MARTE_Library/BasicNFP_Types"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"
+    usedGenPackages="../../com.masdes.dam.static.profile/resources/DAM.genmodel#//DAM ../../com.masdes.dam.static.profile/resources/DAM.genmodel#//DAM_Library ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.papyrus.marte.static.profile/resources/MARTE.genmodel#//MARTE ../../org.eclipse.papyrus.marte.static.profile/resources/MARTE.genmodel#//MARTE_Library ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml"
     importOrganizing="true">
   <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
     <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>
@@ -30,9 +30,11 @@
     <details key="CAMEL_CASE_NAMES" value="IGNORE"/>
     <details key="SUPER_CLASS_ORDER" value="PROCESS"/>
   </genAnnotations>
-  <foreignModel>DICE.profile.uml</foreignModel>
+  <foreignModel>DICE.ecore</foreignModel>
+  <foreignModel>DICE_Library.ecore</foreignModel>
   <genPackages xsi:type="genmodel:GenPackage" prefix="DICE" basePackage="es.unizar.disco.dice"
       disposableProviderFactory="true" ecorePackage="DICE.ecore#/">
+    <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="DICE.ecore#//Dummy"/>
     <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="DICE_UML_Extensions"
         basePackage="es.unizar.disco.dice" disposableProviderFactory="true" ecorePackage="DICE.ecore#//DICE_UML_Extensions">
       <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="DPIM" basePackage="es.unizar.disco.dice"
@@ -249,7 +251,6 @@
                 propertySortChoices="true" ecoreFeature="ecore:EReference DICE.ecore#//DICE_UML_Extensions/DTSM/Cassandra/CassandraDB/base_Node"/>
           </genClasses>
         </nestedGenPackages>
-      </nestedGenPackages>
         <nestedGenPackages xsi:type="genmodel:GenPackage" prefix="Tez" basePackage="es.unizar.disco.dice.DTSM"
             disposableProviderFactory="true" ecorePackage="DICE.ecore#//DICE_UML_Extensions/DTSM/Tez">
           <genClasses xsi:type="genmodel:GenClass" ecoreClass="DICE.ecore#//DICE_UML_Extensions/DTSM/Tez/TezVertex">
@@ -630,16 +631,16 @@
           <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DICE_Library.ecore#//Basic_DICE_Types/Basic_Enumeration_Types/LanguageType/scala"/>
           <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DICE_Library.ecore#//Basic_DICE_Types/Basic_Enumeration_Types/LanguageType/R"/>
         </genEnums>
-        <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="DICE_Library.ecore#//Basic_DICE_Types/Basic_Enumeration_Types/DataMovementType">
-          <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DICE_Library.ecore#//Basic_DICE_Types/Basic_Enumeration_Types/DataMovementType/OneToOne"/>
-          <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DICE_Library.ecore#//Basic_DICE_Types/Basic_Enumeration_Types/DataMovementType/ScatterGather"/>
-          <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DICE_Library.ecore#//Basic_DICE_Types/Basic_Enumeration_Types/DataMovementType/Broadcast"/>
-        </genEnums>
         <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="DICE_Library.ecore#//Basic_DICE_Types/Basic_Enumeration_Types/CassandraConsistencyLevelType">
           <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DICE_Library.ecore#//Basic_DICE_Types/Basic_Enumeration_Types/CassandraConsistencyLevelType/one"/>
           <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DICE_Library.ecore#//Basic_DICE_Types/Basic_Enumeration_Types/CassandraConsistencyLevelType/quorum"/>
           <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DICE_Library.ecore#//Basic_DICE_Types/Basic_Enumeration_Types/CassandraConsistencyLevelType/all"/>
         </genEnums>
+        <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="DICE_Library.ecore#//Basic_DICE_Types/Basic_Enumeration_Types/DataMovementType">
+          <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DICE_Library.ecore#//Basic_DICE_Types/Basic_Enumeration_Types/DataMovementType/OneToOne"/>
+          <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DICE_Library.ecore#//Basic_DICE_Types/Basic_Enumeration_Types/DataMovementType/ScatterGather"/>
+          <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DICE_Library.ecore#//Basic_DICE_Types/Basic_Enumeration_Types/DataMovementType/Broadcast"/>
+        </genEnums>
         <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="DICE_Library.ecore#//Basic_DICE_Types/Basic_Enumeration_Types/ComputationType">
           <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DICE_Library.ecore#//Basic_DICE_Types/Basic_Enumeration_Types/ComputationType/distributed"/>
           <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DICE_Library.ecore#//Basic_DICE_Types/Basic_Enumeration_Types/ComputationType/parallel"/>

diff --git a/bundles/es.unizar.disco.dice.static.profile/resources/DICE_Library.notation b/bundles/es.unizar.disco.dice.static.profile/resources/DICE_Library.notation
@@ -254,7 +254,7 @@
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p5fyZCyzEeagadxR5JgrcA"/>
               </children>
               <element xmi:type="uml:Enumeration" href="DICE_Library.uml#_upZtkClyEeaibdPncpUwfA"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p5dWISyzEeagadxR5JgrcA" x="183" y="303"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p5dWISyzEeagadxR5JgrcA" x="120" y="294"/>
             </children>
             <children xmi:type="notation:Shape" xmi:id="_p7Z24CyzEeagadxR5JgrcA" type="Enumeration_Shape_CN">
               <children xmi:type="notation:DecorationNode" xmi:id="_p7Z24iyzEeagadxR5JgrcA" type="Enumeration_NameLabel_CN"/>
@@ -392,7 +392,7 @@
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AOK8uTiZEeaFI4EbHcf0UA"/>
               </children>
               <element xmi:type="uml:Enumeration" href="DICE_Library.uml#_AOBLsDiZEeaFI4EbHcf0UA"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AOK8sTiZEeaFI4EbHcf0UA" x="601" y="134"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AOK8sTiZEeaFI4EbHcf0UA" x="618" y="137"/>
             </children>
             <children xmi:type="notation:Shape" xmi:id="_HOU5YD4CEeahGZm0A1o1gg" type="Enumeration_Shape_CN">
               <children xmi:type="notation:DecorationNode" xmi:id="_HOVgcD4CEeahGZm0A1o1gg" type="Enumeration_NameLabel_CN"/>
@@ -418,7 +418,7 @@
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HOVgdz4CEeahGZm0A1o1gg"/>
               </children>
               <element xmi:type="uml:Enumeration" href="DICE_Library.uml#_HOIsID4CEeahGZm0A1o1gg"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HOU5YT4CEeahGZm0A1o1gg" x="606" y="297"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HOU5YT4CEeahGZm0A1o1gg" x="146" y="439"/>
             </children>
             <children xmi:type="notation:Shape" xmi:id="_TolL4D4IEeahGZm0A1o1gg" type="Enumeration_Shape_CN">
               <children xmi:type="notation:DecorationNode" xmi:id="_TolL4j4IEeahGZm0A1o1gg" type="Enumeration_NameLabel_CN"/>
@@ -444,7 +444,7 @@
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TolL6T4IEeahGZm0A1o1gg"/>
               </children>
               <element xmi:type="uml:Enumeration" href="DICE_Library.uml#_ToY-oD4IEeahGZm0A1o1gg"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TolL4T4IEeahGZm0A1o1gg" x="607" y="401"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TolL4T4IEeahGZm0A1o1gg" x="141" y="558"/>
             </children>
             <children xmi:type="notation:Shape" xmi:id="_JBRnQD4OEeahGZm0A1o1gg" type="Enumeration_Shape_CN">
               <children xmi:type="notation:DecorationNode" xmi:id="_JBRnQj4OEeahGZm0A1o1gg" type="Enumeration_NameLabel_CN"/>
@@ -482,7 +482,7 @@
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JBRnST4OEeahGZm0A1o1gg"/>
               </children>
               <element xmi:type="uml:Enumeration" href="DICE_Library.uml#_JBGoID4OEeahGZm0A1o1gg"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JBRnQT4OEeahGZm0A1o1gg" x="708" y="134"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JBRnQT4OEeahGZm0A1o1gg" x="732" y="175"/>
             </children>
             <children xmi:type="notation:Shape" xmi:id="_4IPfIIlwEeaFpJw9Inr05g" type="Enumeration_Shape_CN">
               <children xmi:type="notation:DecorationNode" xmi:id="_4IQGMIlwEeaFpJw9Inr05g" type="Enumeration_NameLabel_CN"/>
@@ -578,7 +578,7 @@
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zfVTG_dQEeauAqwbCM80KA"/>
               </children>
               <element xmi:type="uml:Enumeration" href="DICE_Library.uml#_zfUr4PdQEeauAqwbCM80KA"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zfVTH_dQEeauAqwbCM80KA" x="629" y="510" height="213"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zfVTH_dQEeauAqwbCM80KA" x="600" y="352" height="213"/>
             </children>
             <children xmi:type="notation:Shape" xmi:id="_zfVS9vdQEeauAqwbCM80KA" type="Enumeration_Shape">
               <children xmi:type="notation:DecorationNode" xmi:id="_zfVS9_dQEeauAqwbCM80KA" type="Enumeration_NameLabel"/>
@@ -668,7 +668,7 @@
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zfVTCPdQEeauAqwbCM80KA"/>
               </children>
               <element xmi:type="uml:Enumeration" href="DICE_Library.uml#_zfVS8PdQEeauAqwbCM80KA"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zfVTDPdQEeauAqwbCM80KA" x="780" y="294" height="371"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zfVTDPdQEeauAqwbCM80KA" x="733" y="330" height="371"/>
             </children>
             <children xmi:type="notation:Shape" xmi:id="_CDOc8P8iEeae0ceaALtJ7Q" type="Enumeration_Shape">
               <children xmi:type="notation:DecorationNode" xmi:id="_CDOc8f8iEeae0ceaALtJ7Q" type="Enumeration_NameLabel"/>
@@ -690,7 +690,7 @@
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CDOc_v8iEeae0ceaALtJ7Q"/>
               </children>
               <element xmi:type="uml:Enumeration" href="DICE_Library.uml#_CC_MYP8iEeae0ceaALtJ7Q"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CDOdAv8iEeae0ceaALtJ7Q" x="506" y="448"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CDOdAv8iEeae0ceaALtJ7Q" x="5" y="438"/>
             </children>
             <children xmi:type="notation:Shape" xmi:id="_Vd6JwAAvEee5FrQsk8AM1w" type="Enumeration_Shape_CN">
               <children xmi:type="notation:DecorationNode" xmi:id="_Vd6w0AAvEee5FrQsk8AM1w" type="Enumeration_NameLabel_CN"/>
@@ -738,7 +738,7 @@
                 <layoutConstraint xmi:type="notation:Bounds" xmi:id="_diX3SWY8EeeWJ7BBNSdFOw"/>
               </children>
               <element xmi:type="uml:Enumeration" href="DICE_Library.uml#_dhj-8GY8EeeWJ7BBNSdFOw"/>
-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_diX3QWY8EeeWJ7BBNSdFOw" x="733" y="41"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_diX3QWY8EeeWJ7BBNSdFOw" x="286" y="523"/>
             </children>
             <children xmi:type="notation:Shape" xmi:id="_8-JDQEnwEeejV93_VexjFw" type="Enumeration_Shape_CN">
               <children xmi:type="notation:DecorationNode" xmi:id="_8-JqUEnwEeejV93_VexjFw" type="Enumeration_NameLabel_CN"/>

diff --git a/...file/src/es/unizar/disco/dice/Basic_Enumeration_Types/Basic_Enumeration_TypesPackage.java b/...file/src/es/unizar/disco/dice/Basic_Enumeration_Types/Basic_Enumeration_TypesPackage.java
@@ -252,7 +252,7 @@ public interface Basic_Enumeration_TypesPackage extends EPackage {
 	 * @see es.unizar.disco.dice.Basic_Enumeration_Types.impl.Basic_Enumeration_TypesPackageImpl#getDataMovementType()
 	 * @generated
 	 */
-	int DATA_MOVEMENT_TYPE = 21;
+	int DATA_MOVEMENT_TYPE = 20;
 
   /**
 	 * The meta object id for the '{@link es.unizar.disco.dice.Basic_Enumeration_Types.CassandraConsistencyLevelType <em>Cassandra Consistency Level Type</em>}' enum.
@@ -272,7 +272,7 @@ public interface Basic_Enumeration_TypesPackage extends EPackage {
 	 * @see es.unizar.disco.dice.Basic_Enumeration_Types.impl.Basic_Enumeration_TypesPackageImpl#getComputationType()
 	 * @generated
 	 */
-	int COMPUTATION_TYPE = 20;
+	int COMPUTATION_TYPE = 21;
 
 
 	/**

diff --git a/...es/unizar/disco/dice/Basic_Enumeration_Types/impl/Basic_Enumeration_TypesFactoryImpl.java b/...es/unizar/disco/dice/Basic_Enumeration_Types/impl/Basic_Enumeration_TypesFactoryImpl.java
@@ -108,10 +108,10 @@ public Object createFromString(EDataType eDataType, String initialValue) {
 				return createSparkOperationFromString(eDataType, initialValue);
 			case Basic_Enumeration_TypesPackage.LANGUAGE_TYPE:
 				return createLanguageTypeFromString(eDataType, initialValue);
-			case Basic_Enumeration_TypesPackage.DATA_MOVEMENT_TYPE:
-				return createDataMovementTypeFromString(eDataType, initialValue);
 			case Basic_Enumeration_TypesPackage.CASSANDRA_CONSISTENCY_LEVEL_TYPE:
 				return createCassandraConsistencyLevelTypeFromString(eDataType, initialValue);
+			case Basic_Enumeration_TypesPackage.DATA_MOVEMENT_TYPE:
+				return createDataMovementTypeFromString(eDataType, initialValue);
 			case Basic_Enumeration_TypesPackage.COMPUTATION_TYPE:
 				return createComputationTypeFromString(eDataType, initialValue);
 			default:
@@ -165,10 +165,10 @@ public String convertToString(EDataType eDataType, Object instanceValue) {
 				return convertSparkOperationToString(eDataType, instanceValue);
 			case Basic_Enumeration_TypesPackage.LANGUAGE_TYPE:
 				return convertLanguageTypeToString(eDataType, instanceValue);
-			case Basic_Enumeration_TypesPackage.DATA_MOVEMENT_TYPE:
-				return convertDataMovementTypeToString(eDataType, instanceValue);
 			case Basic_Enumeration_TypesPackage.CASSANDRA_CONSISTENCY_LEVEL_TYPE:
 				return convertCassandraConsistencyLevelTypeToString(eDataType, instanceValue);
+			case Basic_Enumeration_TypesPackage.DATA_MOVEMENT_TYPE:
+				return convertDataMovementTypeToString(eDataType, instanceValue);
 			case Basic_Enumeration_TypesPackage.COMPUTATION_TYPE:
 				return convertComputationTypeToString(eDataType, instanceValue);
 			default: