diff --git a/src/main/resources/all-activity.ucls b/src/main/resources/all-activity.ucls index 5731eea..89f8a6b 100644 --- a/src/main/resources/all-activity.ucls +++ b/src/main/resources/all-activity.ucls @@ -16,7 +16,7 @@ project="gcube-model" file="/gcube-model/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/EService.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="699" y="144"/> + <position height="-1" width="-1" x="728" y="144"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -38,7 +38,7 @@ project="gcube-model" file="/gcube-model/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Service.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="714" y="76"/> + <position height="-1" width="-1" x="743" y="76"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -72,7 +72,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE17_Curated_Data_EService.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="215" y="828"/> + <position height="-1" width="-1" x="191" y="801"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -96,7 +96,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE11_Software_Curating_Service.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="328" y="611"/> + <position height="-1" width="-1" x="345" y="607"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -108,7 +108,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE13_Software_Computing_EService.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="796" y="713"/> + <position height="-1" width="-1" x="836" y="701"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -144,7 +144,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE33_EAccess_Brokering_Service.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="409" y="475"/> + <position height="-1" width="-1" x="372" y="475"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -156,7 +156,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE14_Software_Delivery_EService.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="1084" y="713"/> + <position height="-1" width="-1" x="1129" y="701"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -168,7 +168,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE10_Digital_Curating_Service.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="182" y="475"/> + <position height="-1" width="-1" x="92" y="475"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -192,7 +192,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE12_Data_Curating_Service.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="101" y="611"/> + <position height="-1" width="-1" x="84" y="607"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -216,7 +216,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE6_Software_Hosting_Service.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="1088" y="611"/> + <position height="-1" width="-1" x="1121" y="607"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -228,7 +228,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE7_Data_Hosting_Service.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="614" y="611"/> + <position height="-1" width="-1" x="631" y="607"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -240,7 +240,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE16_Curated_Software_EService.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="537" y="828"/> + <position height="-1" width="-1" x="472" y="801"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -252,7 +252,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE15_Data_EService.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="554" y="713"/> + <position height="-1" width="-1" x="514" y="701"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -264,7 +264,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/parthenos/PE5_Digital_Hosting_Service.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="860" y="475"/> + <position height="-1" width="-1" x="901" y="475"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -295,137 +295,137 @@ </display> </interface> <generalization id="26"> - <end type="SOURCE" refId="8"/> - <end type="TARGET" refId="24"/> - </generalization> - <generalization id="27"> - <end type="SOURCE" refId="22"/> - <end type="TARGET" refId="20"/> - </generalization> - <generalization id="28"> - <end type="SOURCE" refId="2"/> - <end type="TARGET" refId="4"/> - </generalization> - <generalization id="29"> - <end type="SOURCE" refId="21"/> - <end type="TARGET" refId="14"/> - </generalization> - <generalization id="30"> - <end type="SOURCE" refId="4"/> - <end type="TARGET" refId="1"/> - </generalization> - <generalization id="31"> - <end type="SOURCE" refId="19"/> - <end type="TARGET" refId="23"/> - </generalization> - <generalization id="32"> - <end type="SOURCE" refId="24"/> - <end type="TARGET" refId="4"/> - </generalization> - <generalization id="33"> <end type="SOURCE" refId="5"/> <end type="TARGET" refId="6"/> </generalization> - <generalization id="34"> - <end type="SOURCE" refId="25"/> - <end type="TARGET" refId="1"/> - </generalization> - <generalization id="35"> - <end type="SOURCE" refId="24"/> - <end type="TARGET" refId="6"/> - </generalization> - <generalization id="36"> - <end type="SOURCE" refId="10"/> - <end type="TARGET" refId="12"/> - </generalization> - <generalization id="37"> - <end type="SOURCE" refId="14"/> - <end type="TARGET" refId="19"/> - </generalization> - <generalization id="38"> - <end type="SOURCE" refId="6"/> - <end type="TARGET" refId="25"/> - </generalization> - <generalization id="39"> - <end type="SOURCE" refId="10"/> - <end type="TARGET" refId="19"/> - </generalization> - <generalization id="40"> - <end type="SOURCE" refId="12"/> - <end type="TARGET" refId="2"/> - </generalization> - <generalization id="41"> - <end type="SOURCE" refId="15"/> - <end type="TARGET" refId="8"/> - </generalization> - <generalization id="42"> - <end type="SOURCE" refId="18"/> - <end type="TARGET" refId="24"/> - </generalization> - <generalization id="43"> - <end type="SOURCE" refId="11"/> - <end type="TARGET" refId="6"/> - </generalization> - <generalization id="44"> - <end type="SOURCE" refId="20"/> - <end type="TARGET" refId="23"/> - </generalization> - <generalization id="45"> - <end type="SOURCE" refId="22"/> - <end type="TARGET" refId="12"/> - </generalization> - <generalization id="46"> - <end type="SOURCE" refId="23"/> - <end type="TARGET" refId="18"/> - </generalization> - <generalization id="47"> - <end type="SOURCE" refId="12"/> - <end type="TARGET" refId="24"/> - </generalization> - <generalization id="48"> - <end type="SOURCE" refId="7"/> - <end type="TARGET" refId="22"/> - </generalization> - <generalization id="49"> - <end type="SOURCE" refId="14"/> - <end type="TARGET" refId="12"/> - </generalization> - <generalization id="50"> - <end type="SOURCE" refId="13"/> - <end type="TARGET" refId="12"/> - </generalization> - <generalization id="51"> - <end type="SOURCE" refId="3"/> - <end type="TARGET" refId="4"/> - </generalization> - <generalization id="52"> - <end type="SOURCE" refId="7"/> - <end type="TARGET" refId="17"/> - </generalization> - <generalization id="53"> - <end type="SOURCE" refId="19"/> - <end type="TARGET" refId="3"/> - </generalization> - <generalization id="54"> - <end type="SOURCE" refId="21"/> - <end type="TARGET" refId="9"/> - </generalization> - <generalization id="55"> + <generalization id="27"> <end type="SOURCE" refId="16"/> <end type="TARGET" refId="6"/> </generalization> - <generalization id="56"> - <end type="SOURCE" refId="17"/> - <end type="TARGET" refId="15"/> + <generalization id="28"> + <end type="SOURCE" refId="8"/> + <end type="TARGET" refId="24"/> </generalization> - <generalization id="57"> + <generalization id="29"> + <end type="SOURCE" refId="20"/> + <end type="TARGET" refId="23"/> + </generalization> + <generalization id="30"> + <end type="SOURCE" refId="14"/> + <end type="TARGET" refId="12"/> + </generalization> + <generalization id="31"> + <end type="SOURCE" refId="21"/> + <end type="TARGET" refId="9"/> + </generalization> + <generalization id="32"> + <end type="SOURCE" refId="19"/> + <end type="TARGET" refId="3"/> + </generalization> + <generalization id="33"> + <end type="SOURCE" refId="3"/> + <end type="TARGET" refId="4"/> + </generalization> + <generalization id="34"> + <end type="SOURCE" refId="11"/> + <end type="TARGET" refId="6"/> + </generalization> + <generalization id="35"> + <end type="SOURCE" refId="24"/> + <end type="TARGET" refId="4"/> + </generalization> + <generalization id="36"> + <end type="SOURCE" refId="19"/> + <end type="TARGET" refId="23"/> + </generalization> + <generalization id="37"> + <end type="SOURCE" refId="6"/> + <end type="TARGET" refId="25"/> + </generalization> + <generalization id="38"> <end type="SOURCE" refId="9"/> <end type="TARGET" refId="15"/> </generalization> - <generalization id="58"> + <generalization id="39"> + <end type="SOURCE" refId="22"/> + <end type="TARGET" refId="12"/> + </generalization> + <generalization id="40"> + <end type="SOURCE" refId="22"/> + <end type="TARGET" refId="20"/> + </generalization> + <generalization id="41"> + <end type="SOURCE" refId="10"/> + <end type="TARGET" refId="19"/> + </generalization> + <generalization id="42"> + <end type="SOURCE" refId="2"/> + <end type="TARGET" refId="4"/> + </generalization> + <generalization id="43"> + <end type="SOURCE" refId="18"/> + <end type="TARGET" refId="24"/> + </generalization> + <generalization id="44"> + <end type="SOURCE" refId="10"/> + <end type="TARGET" refId="12"/> + </generalization> + <generalization id="45"> + <end type="SOURCE" refId="23"/> + <end type="TARGET" refId="18"/> + </generalization> + <generalization id="46"> + <end type="SOURCE" refId="25"/> + <end type="TARGET" refId="1"/> + </generalization> + <generalization id="47"> + <end type="SOURCE" refId="4"/> + <end type="TARGET" refId="1"/> + </generalization> + <generalization id="48"> + <end type="SOURCE" refId="13"/> + <end type="TARGET" refId="12"/> + </generalization> + <generalization id="49"> + <end type="SOURCE" refId="7"/> + <end type="TARGET" refId="17"/> + </generalization> + <generalization id="50"> + <end type="SOURCE" refId="14"/> + <end type="TARGET" refId="19"/> + </generalization> + <generalization id="51"> + <end type="SOURCE" refId="17"/> + <end type="TARGET" refId="15"/> + </generalization> + <generalization id="52"> + <end type="SOURCE" refId="24"/> + <end type="TARGET" refId="6"/> + </generalization> + <generalization id="53"> + <end type="SOURCE" refId="12"/> + <end type="TARGET" refId="2"/> + </generalization> + <generalization id="54"> + <end type="SOURCE" refId="7"/> + <end type="TARGET" refId="22"/> + </generalization> + <generalization id="55"> + <end type="SOURCE" refId="21"/> + <end type="TARGET" refId="14"/> + </generalization> + <generalization id="56"> + <end type="SOURCE" refId="12"/> + <end type="TARGET" refId="24"/> + </generalization> + <generalization id="57"> <end type="SOURCE" refId="21"/> <end type="TARGET" refId="10"/> </generalization> + <generalization id="58"> + <end type="SOURCE" refId="15"/> + <end type="TARGET" refId="8"/> + </generalization> <classifier-display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> diff --git a/src/main/resources/cdoc-crm-classes.ucls b/src/main/resources/cdoc-crm-classes.ucls index d162ec0..a46b2db 100644 --- a/src/main/resources/cdoc-crm-classes.ucls +++ b/src/main/resources/cdoc-crm-classes.ucls @@ -17,7 +17,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E29_Design_or_Procedure.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="296" y="463"/> + <position height="-1" width="-1" x="280" y="458"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -28,7 +28,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E53_Place.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="679" y="298"/> + <position height="-1" width="-1" x="679" y="302"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -39,7 +39,7 @@ name="org.gcube.parthenosentities.model.reference.entity.resource.cidoc.E65_Creation" project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E65_Creation.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="253" y="376"/> + <position height="-1" width="-1" x="253" y="361"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -50,7 +50,7 @@ name="org.gcube.parthenosentities.model.reference.entity.resource.cidoc.E54_Dimension" project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E54_Dimension.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="556" y="298"/> + <position height="-1" width="-1" x="556" y="302"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -61,7 +61,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E74_Group.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="969" y="450"/> + <position height="-1" width="-1" x="969" y="458"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -72,7 +72,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E70_Thing.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="669" y="359"/> + <position height="-1" width="-1" x="669" y="361"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -95,7 +95,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E19_Physical_Object.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="700" y="454"/> + <position height="-1" width="-1" x="700" y="458"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -107,7 +107,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E77_Persistent_Item.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="818" y="298"/> + <position height="-1" width="-1" x="818" y="302"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -119,7 +119,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/D1_Digital_Object.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="531" y="453"/> + <position height="-1" width="-1" x="531" y="458"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -130,7 +130,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E21_Person.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="1117" y="456"/> + <position height="-1" width="-1" x="1117" y="458"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -142,7 +142,7 @@ file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E40_Legal_Body.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="1024" y="556"/> + <position height="-1" width="-1" x="1024" y="538"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -153,7 +153,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E39_Actor.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="908" y="359"/> + <position height="-1" width="-1" x="908" y="361"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -164,7 +164,7 @@ project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E55_Type.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="846" y="454"/> + <position height="-1" width="-1" x="846" y="458"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -175,7 +175,7 @@ name="org.gcube.parthenosentities.model.reference.entity.resource.cidoc.E7_Activity" project="parthenos-entities" file="/parthenos-entities/src/main/java/org/gcube/parthenosentities/model/reference/entity/resource/cidoc/E7_Activity.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="356" y="308"/> + <position height="-1" width="-1" x="356" y="302"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -209,7 +209,7 @@ project="gcube-model" file="/gcube-model/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Plugin.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="214" y="317"/> + <position height="-1" width="-1" x="181" y="302"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -220,7 +220,7 @@ project="gcube-model" file="/gcube-model/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/LegalBody.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="1032" y="299"/> + <position height="-1" width="-1" x="1032" y="302"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -231,7 +231,7 @@ project="gcube-model" file="/gcube-model/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Software.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="265" y="238"/> + <position height="-1" width="-1" x="238" y="223"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -253,7 +253,7 @@ project="gcube-model" file="/gcube-model/src/main/java/org/gcube/resourcemanagement/model/reference/entities/resources/Actor.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="1032" y="232"/> + <position height="-1" width="-1" x="1032" y="223"/> <display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false"> <attributes public="false" package="false" protected="false" private="false" static="false"/> @@ -261,83 +261,83 @@ </display> </interface> <generalization id="24"> - <end type="SOURCE" refId="22"/> - <end type="TARGET" refId="23"/> - </generalization> - <generalization id="25"> - <end type="SOURCE" refId="5"/> - <end type="TARGET" refId="1"/> - </generalization> - <generalization id="26"> - <end type="SOURCE" refId="14"/> - <end type="TARGET" refId="10"/> - </generalization> - <generalization id="27"> - <end type="SOURCE" refId="1"/> - <end type="TARGET" refId="18"/> - </generalization> - <generalization id="28"> - <end type="SOURCE" refId="3"/> - <end type="TARGET" refId="1"/> - </generalization> - <generalization id="29"> - <end type="SOURCE" refId="23"/> - <end type="TARGET" refId="18"/> - </generalization> - <generalization id="30"> - <end type="SOURCE" refId="15"/> - <end type="TARGET" refId="7"/> - </generalization> - <generalization id="31"> - <end type="SOURCE" refId="11"/> - <end type="TARGET" refId="7"/> - </generalization> - <generalization id="32"> - <end type="SOURCE" refId="17"/> - <end type="TARGET" refId="5"/> - </generalization> - <generalization id="33"> - <end type="SOURCE" refId="13"/> - <end type="TARGET" refId="6"/> - </generalization> - <generalization id="34"> - <end type="SOURCE" refId="8"/> - <end type="TARGET" refId="11"/> - </generalization> - <generalization id="35"> - <end type="SOURCE" refId="9"/> - <end type="TARGET" refId="7"/> - </generalization> - <generalization id="36"> - <end type="SOURCE" refId="20"/> - <end type="TARGET" refId="23"/> - </generalization> - <generalization id="37"> - <end type="SOURCE" refId="12"/> - <end type="TARGET" refId="14"/> - </generalization> - <generalization id="38"> - <end type="SOURCE" refId="4"/> - <end type="TARGET" refId="16"/> - </generalization> - <generalization id="39"> - <end type="SOURCE" refId="16"/> - <end type="TARGET" refId="1"/> - </generalization> - <generalization id="40"> - <end type="SOURCE" refId="21"/> - <end type="TARGET" refId="18"/> - </generalization> - <generalization id="41"> <end type="SOURCE" refId="7"/> <end type="TARGET" refId="10"/> </generalization> - <generalization id="42"> + <generalization id="25"> + <end type="SOURCE" refId="16"/> + <end type="TARGET" refId="1"/> + </generalization> + <generalization id="26"> + <end type="SOURCE" refId="9"/> + <end type="TARGET" refId="7"/> + </generalization> + <generalization id="27"> + <end type="SOURCE" refId="12"/> + <end type="TARGET" refId="14"/> + </generalization> + <generalization id="28"> <end type="SOURCE" refId="12"/> <end type="TARGET" refId="22"/> </generalization> + <generalization id="29"> + <end type="SOURCE" refId="13"/> + <end type="TARGET" refId="6"/> + </generalization> + <generalization id="30"> + <end type="SOURCE" refId="23"/> + <end type="TARGET" refId="18"/> + </generalization> + <generalization id="31"> + <end type="SOURCE" refId="10"/> + <end type="TARGET" refId="1"/> + </generalization> + <generalization id="32"> + <end type="SOURCE" refId="13"/> + <end type="TARGET" refId="20"/> + </generalization> + <generalization id="33"> + <end type="SOURCE" refId="3"/> + <end type="TARGET" refId="1"/> + </generalization> + <generalization id="34"> + <end type="SOURCE" refId="19"/> + <end type="TARGET" refId="21"/> + </generalization> + <generalization id="35"> + <end type="SOURCE" refId="1"/> + <end type="TARGET" refId="18"/> + </generalization> + <generalization id="36"> + <end type="SOURCE" refId="22"/> + <end type="TARGET" refId="23"/> + </generalization> + <generalization id="37"> + <end type="SOURCE" refId="21"/> + <end type="TARGET" refId="18"/> + </generalization> + <generalization id="38"> + <end type="SOURCE" refId="5"/> + <end type="TARGET" refId="1"/> + </generalization> + <generalization id="39"> + <end type="SOURCE" refId="8"/> + <end type="TARGET" refId="11"/> + </generalization> + <generalization id="40"> + <end type="SOURCE" refId="14"/> + <end type="TARGET" refId="23"/> + </generalization> + <generalization id="41"> + <end type="SOURCE" refId="14"/> + <end type="TARGET" refId="10"/> + </generalization> + <generalization id="42"> + <end type="SOURCE" refId="15"/> + <end type="TARGET" refId="7"/> + </generalization> <generalization id="43"> - <end type="SOURCE" refId="2"/> + <end type="SOURCE" refId="11"/> <end type="TARGET" refId="7"/> </generalization> <generalization id="44"> @@ -345,24 +345,24 @@ <end type="TARGET" refId="21"/> </generalization> <generalization id="45"> - <end type="SOURCE" refId="19"/> - <end type="TARGET" refId="21"/> + <end type="SOURCE" refId="2"/> + <end type="TARGET" refId="7"/> </generalization> <generalization id="46"> - <end type="SOURCE" refId="10"/> - <end type="TARGET" refId="1"/> + <end type="SOURCE" refId="6"/> + <end type="TARGET" refId="14"/> </generalization> <generalization id="47"> - <end type="SOURCE" refId="14"/> + <end type="SOURCE" refId="20"/> <end type="TARGET" refId="23"/> </generalization> <generalization id="48"> - <end type="SOURCE" refId="13"/> - <end type="TARGET" refId="20"/> + <end type="SOURCE" refId="4"/> + <end type="TARGET" refId="16"/> </generalization> <generalization id="49"> - <end type="SOURCE" refId="6"/> - <end type="TARGET" refId="14"/> + <end type="SOURCE" refId="17"/> + <end type="TARGET" refId="5"/> </generalization> <classifier-display autosize="true" stereotype="false" package="false" initial-value="false" signature="false" sort-features="false" accessors="true" visibility="false">