Merge branch 'master' of https://gitrepos.estec.esa.int/taste/ellidiss-release

# Conflicts:
#	TASTE-linux/bin/TASTE
#	TASTE-linux64/bin/TASTE

TASTE-linux/Workspace/common/taste_properties.aadl

@@ -217,9 +217,9 @@ RCMperiod: Time applies to (event port, event data port, access, subprogram acce
 
 RCMpartition: reference (system) applies to (system);
 
-dataview : list of aadlstring applies to (package);
+dataview : list of aadlstring applies to (package,system);
 
-dataviewpath : list of aadlstring applies to (package);
+dataviewpath : list of aadlstring applies to (package,system);
 
 Encoding_type : type enumeration (native, uper, acn);
 
@@ -249,4 +249,10 @@ FunctionName : aadlstring applies to (system);
 
 Active_Interfaces : enumeration (Enabled,Disabled,Any) => Enabled applies to (system);
 
+-- new properties for TASTE-IV editor COO7 and later:
+
+is_Component_Type : aadlboolean applies to (System);
+is_instance_of    : aadlstring applies to (System);
+is_instance_of2   : classifier(System) applies to (System);
+
 end Taste;

TASTE-linux/changelog.txt

 COO7:
 * add propagation mecanism
 * ticket COO7-001 : Add navigation to the type line in the ASN.1 editor
+* ticket 0000813 : [Regression] Conversion to 1.3 doesn't contain properties
+
+version 2.1.19 :
+* ticket 0000799 : IV import number does not appear anymore in the models browser
+* ticket 0000798 : when a function is copied the source text, if present, is no more relevant
+* ticket 0000797 : direction problem can happen at loading time when a feature coordinates is set to a component corner
+* ticket 0000796 : the partition bindlist shall be automatically resize when the partition is resize
+* ticket 0000795 : toolbar paste button remains grayed after a copy/cut
+* ticket 0000792 : Cannot edit neither ACN nor empty/new ASN files
 
 version 2.1.18 :
 * ticket 0000759 : taste-create-project does not create InterfaceView.aadl

TASTE-linux/config/TASTE_IV_Properties.aadl

@@ -12,6 +12,6 @@ property set TASTE_IV_Properties is
     MSCFiles : aadlstring applies to (Subprogram);
 --    is_Component_Type : aadlboolean applies to (System);
 --    is_instance_of    : aadlstring applies to (System);
-    FPGA_Modes : aadlstring applies to (System);
+    FPGA_Configurations : aadlstring applies to (System);
 --    MSCFiles : list of aadlstring applies to (Subprogram);
 end TASTE_IV_Properties;

TASTE-linux64/Workspace/common/taste_properties.aadl

@@ -217,9 +217,9 @@ RCMperiod: Time applies to (event port, event data port, access, subprogram acce
 
 RCMpartition: reference (system) applies to (system);
 
-dataview : list of aadlstring applies to (package);
+dataview : list of aadlstring applies to (package,system);
 
-dataviewpath : list of aadlstring applies to (package);
+dataviewpath : list of aadlstring applies to (package,system);
 
 Encoding_type : type enumeration (native, uper, acn);
 
@@ -249,4 +249,10 @@ FunctionName : aadlstring applies to (system);
 
 Active_Interfaces : enumeration (Enabled,Disabled,Any) => Enabled applies to (system);
 
+-- new properties for TASTE-IV editor COO7 and later:
+
+is_Component_Type : aadlboolean applies to (System);
+is_instance_of    : aadlstring applies to (System);
+is_instance_of2   : classifier(System) applies to (System);
+
 end Taste;

TASTE-linux64/changelog.txt

 COO7:
 * add propagation mecanism
 * ticket COO7-001 : Add navigation to the type line in the ASN.1 editor
+* ticket 0000813 : [Regression] Conversion to 1.3 doesn't contain properties
+
+version 2.1.19 :
+* ticket 0000799 : IV import number does not appear anymore in the models browser
+* ticket 0000798 : when a function is copied the source text, if present, is no more relevant
+* ticket 0000797 : direction problem can happen at loading time when a feature coordinates is set to a component corner
+* ticket 0000796 : the partition bindlist shall be automatically resize when the partition is resize
+* ticket 0000795 : toolbar paste button remains grayed after a copy/cut
+* ticket 0000792 : Cannot edit neither ACN nor empty/new ASN files
 
 version 2.1.18 :
 * ticket 0000759 : taste-create-project does not create InterfaceView.aadl