Task #207 revert the xmi with the development branches.

virtualsatellite · Feb 6, 2024 · 751b183 · 751b183
1 parent d09a99e
commit 751b183
Show file tree

Hide file tree

Showing 6 changed files with 146 additions and 146 deletions.
diff --git a/de.dlr.sc.virsat.model.extension.cef.interfaces/concept/concept.xmi b/de.dlr.sc.virsat.model.extension.cef.interfaces/concept/concept.xmi
@@ -39,20 +39,20 @@
         </left>
         <right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="de.dlr.sc.virsat.model.extension.cef.interfaces.EquipmentDataParameters.DataDutyCycle"/>
       </expression>
-      <result xsi:type="dvlm_calc:EquationIntermediateResult" uuid="d493630b-b37e-4db4-ae1e-3c348a6a141d" name="DataCombinedDutyCycle"/>
+      <result xsi:type="dvlm_calc:EquationIntermediateResult" uuid="b4f41b65-ac2d-4bc3-8cb0-853c76c57529" name="DataCombinedDutyCycle"/>
     </equationDefinitions>
     <equationDefinitions>
       <expression xsi:type="dvlm_calc:AdditionAndSubtraction">
         <left xsi:type="dvlm_calc:MultiplicationAndDivision" operator="*">
           <left xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="de.dlr.sc.virsat.model.extension.cef.interfaces.EquipmentDataParameters.DataPerUnitOnWithMargin"/>
-          <right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="d493630b-b37e-4db4-ae1e-3c348a6a141d"/>
+          <right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="b4f41b65-ac2d-4bc3-8cb0-853c76c57529"/>
         </left>
         <right xsi:type="dvlm_calc:MultiplicationAndDivision" operator="*">
           <left xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="de.dlr.sc.virsat.model.extension.cef.interfaces.EquipmentDataParameters.DataPerUnitStbyWithMargin"/>
           <right xsi:type="dvlm_calc:Parenthesis">
             <right xsi:type="dvlm_calc:AdditionAndSubtraction" operator="-">
               <left xsi:type="dvlm_calc:NumberLiteral" value="1"/>
-              <right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="d493630b-b37e-4db4-ae1e-3c348a6a141d"/>
+              <right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="b4f41b65-ac2d-4bc3-8cb0-853c76c57529"/>
             </right>
           </right>
         </right>
@@ -89,17 +89,17 @@
     <properties xsi:type="dvlm_cppd:ComposedProperty" name="DataAvgWithMargin" quantityKindName="Data rate" unitName="Megabyte Per Second">
       <type href="platform:/resource/de.dlr.sc.virsat.model.extension.cef/concept/concept.concept#de.dlr.sc.virsat.model.extension.cef.Parameter"/>
     </properties>
-    <extendsCategory href="platform:/resource/de.dlr.sc.virsat.model.ext.core/concept/concept.xmi#de.dlr.sc.virsat.model.ext.core.GenericCategory"/>
+    <extendsCategory href="platform:/plugin/de.dlr.sc.virsat.model.ext.core/concept/concept.xmi#de.dlr.sc.virsat.model.ext.core.GenericCategory"/>
   </categories>
   <categories name="DataInterfaceTypes" applicableFor="de.dlr.sc.virsat.model.extension.cef.interfaces.DataInterfaceTypeCollection">
     <properties xsi:type="dvlm_cppd:StringProperty" name="note"/>
-    <extendsCategory href="platform:/resource/de.dlr.sc.virsat.model.ext.core/concept/concept.xmi#de.dlr.sc.virsat.model.ext.core.GenericCategory"/>
+    <extendsCategory href="platform:/plugin/de.dlr.sc.virsat.model.ext.core/concept/concept.xmi#de.dlr.sc.virsat.model.ext.core.GenericCategory"/>
   </categories>
   <categories name="AInterfaceEnd" isAbstract="true">
     <applicableFor href="platform:/resource/de.dlr.sc.virsat.model.extension.cef/concept/concept.concept#de.dlr.sc.virsat.model.extension.cef.Equipment"/>
     <properties xsi:type="dvlm_cppd:IntProperty" name="quantity" quantityKindName="Dimensionless" unitName="No Unit" defaultValue="1"/>
     <properties xsi:type="dvlm_cppd:StringProperty" name="note"/>
-    <extendsCategory href="platform:/resource/de.dlr.sc.virsat.model.ext.core/concept/concept.xmi#de.dlr.sc.virsat.model.ext.core.GenericCategory"/>
+    <extendsCategory href="platform:/plugin/de.dlr.sc.virsat.model.ext.core/concept/concept.xmi#de.dlr.sc.virsat.model.ext.core.GenericCategory"/>
   </categories>
   <categories name="PowerInterfaceEnd" extendsCategory="de.dlr.sc.virsat.model.extension.cef.interfaces.AInterfaceEnd">
     <properties xsi:type="dvlm_cppd:FloatProperty" name="voltageMin" quantityKindName="Electric potential difference" unitName="Volt"/>
@@ -112,7 +112,7 @@
   <categories name="AInterface" isAbstract="true">
     <applicableFor href="platform:/resource/de.dlr.sc.virsat.model.extension.cef/concept/concept.concept#de.dlr.sc.virsat.model.extension.cef.Equipment"/>
     <properties xsi:type="dvlm_cppd:StringProperty" name="note"/>
-    <extendsCategory href="platform:/resource/de.dlr.sc.virsat.model.ext.core/concept/concept.xmi#de.dlr.sc.virsat.model.ext.core.GenericCategory"/>
+    <extendsCategory href="platform:/plugin/de.dlr.sc.virsat.model.ext.core/concept/concept.xmi#de.dlr.sc.virsat.model.ext.core.GenericCategory"/>
   </categories>
   <categories name="PointToPointInterface" extendsCategory="de.dlr.sc.virsat.model.extension.cef.interfaces.AInterface">
     <properties xsi:type="dvlm_cppd:ReferenceProperty" name="fromInterfaceEnd" referenceType="de.dlr.sc.virsat.model.extension.cef.interfaces.AInterfaceEnd"/>

diff --git a/de.dlr.sc.virsat.model.extension.cef.interfaces/concept/concept_v1_1.xmi b/de.dlr.sc.virsat.model.extension.cef.interfaces/concept/concept_v1_1.xmi
@@ -39,20 +39,20 @@
         </left>
         <right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="de.dlr.sc.virsat.model.extension.cef.interfaces.EquipmentDataParameters.DataDutyCycle"/>
       </expression>
-      <result xsi:type="dvlm_calc:EquationIntermediateResult" uuid="d493630b-b37e-4db4-ae1e-3c348a6a141d" name="DataCombinedDutyCycle"/>
+      <result xsi:type="dvlm_calc:EquationIntermediateResult" uuid="b4f41b65-ac2d-4bc3-8cb0-853c76c57529" name="DataCombinedDutyCycle"/>
     </equationDefinitions>
     <equationDefinitions>
       <expression xsi:type="dvlm_calc:AdditionAndSubtraction">
         <left xsi:type="dvlm_calc:MultiplicationAndDivision" operator="*">
           <left xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="de.dlr.sc.virsat.model.extension.cef.interfaces.EquipmentDataParameters.DataPerUnitOnWithMargin"/>
-          <right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="d493630b-b37e-4db4-ae1e-3c348a6a141d"/>
+          <right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="b4f41b65-ac2d-4bc3-8cb0-853c76c57529"/>
         </left>
         <right xsi:type="dvlm_calc:MultiplicationAndDivision" operator="*">
           <left xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="de.dlr.sc.virsat.model.extension.cef.interfaces.EquipmentDataParameters.DataPerUnitStbyWithMargin"/>
           <right xsi:type="dvlm_calc:Parenthesis">
             <right xsi:type="dvlm_calc:AdditionAndSubtraction" operator="-">
               <left xsi:type="dvlm_calc:NumberLiteral" value="1"/>
-              <right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="d493630b-b37e-4db4-ae1e-3c348a6a141d"/>
+              <right xsi:type="dvlm_calc:ReferencedDefinitionInput" reference="b4f41b65-ac2d-4bc3-8cb0-853c76c57529"/>
             </right>
           </right>
         </right>
@@ -89,17 +89,17 @@
     <properties xsi:type="dvlm_cppd:ComposedProperty" name="DataAvgWithMargin" quantityKindName="Data rate" unitName="Megabyte Per Second">
       <type href="platform:/resource/de.dlr.sc.virsat.model.extension.cef/concept/concept.concept#de.dlr.sc.virsat.model.extension.cef.Parameter"/>
     </properties>
-    <extendsCategory href="platform:/resource/de.dlr.sc.virsat.model.ext.core/concept/concept.xmi#de.dlr.sc.virsat.model.ext.core.GenericCategory"/>
+    <extendsCategory href="platform:/plugin/de.dlr.sc.virsat.model.ext.core/concept/concept.xmi#de.dlr.sc.virsat.model.ext.core.GenericCategory"/>
   </categories>
   <categories name="DataInterfaceTypes" applicableFor="de.dlr.sc.virsat.model.extension.cef.interfaces.DataInterfaceTypeCollection">
     <properties xsi:type="dvlm_cppd:StringProperty" name="note"/>
-    <extendsCategory href="platform:/resource/de.dlr.sc.virsat.model.ext.core/concept/concept.xmi#de.dlr.sc.virsat.model.ext.core.GenericCategory"/>
+    <extendsCategory href="platform:/plugin/de.dlr.sc.virsat.model.ext.core/concept/concept.xmi#de.dlr.sc.virsat.model.ext.core.GenericCategory"/>
   </categories>
   <categories name="AInterfaceEnd" isAbstract="true">
     <applicableFor href="platform:/resource/de.dlr.sc.virsat.model.extension.cef/concept/concept.concept#de.dlr.sc.virsat.model.extension.cef.Equipment"/>
     <properties xsi:type="dvlm_cppd:IntProperty" name="quantity" quantityKindName="Dimensionless" unitName="No Unit" defaultValue="1"/>
     <properties xsi:type="dvlm_cppd:StringProperty" name="note"/>
-    <extendsCategory href="platform:/resource/de.dlr.sc.virsat.model.ext.core/concept/concept.xmi#de.dlr.sc.virsat.model.ext.core.GenericCategory"/>
+    <extendsCategory href="platform:/plugin/de.dlr.sc.virsat.model.ext.core/concept/concept.xmi#de.dlr.sc.virsat.model.ext.core.GenericCategory"/>
   </categories>
   <categories name="PowerInterfaceEnd" extendsCategory="de.dlr.sc.virsat.model.extension.cef.interfaces.AInterfaceEnd">
     <properties xsi:type="dvlm_cppd:FloatProperty" name="voltageMin" quantityKindName="Electric potential difference" unitName="Volt"/>
@@ -112,7 +112,7 @@
   <categories name="AInterface" isAbstract="true">
     <applicableFor href="platform:/resource/de.dlr.sc.virsat.model.extension.cef/concept/concept.concept#de.dlr.sc.virsat.model.extension.cef.Equipment"/>
     <properties xsi:type="dvlm_cppd:StringProperty" name="note"/>
-    <extendsCategory href="platform:/resource/de.dlr.sc.virsat.model.ext.core/concept/concept.xmi#de.dlr.sc.virsat.model.ext.core.GenericCategory"/>
+    <extendsCategory href="platform:/plugin/de.dlr.sc.virsat.model.ext.core/concept/concept.xmi#de.dlr.sc.virsat.model.ext.core.GenericCategory"/>
   </categories>
   <categories name="PointToPointInterface" extendsCategory="de.dlr.sc.virsat.model.extension.cef.interfaces.AInterface">
     <properties xsi:type="dvlm_cppd:ReferenceProperty" name="fromInterfaceEnd" referenceType="de.dlr.sc.virsat.model.extension.cef.interfaces.AInterfaceEnd"/>