[CQ 6485][config, runtime] .gitignore for config.tests,

ActorInstanceConfig hyperlinking added, runtime.ui rebuild

Change-Id: Ia4ddd0651b9dd7f81207fef7bbcac14b8090a840

29 files changed, 165 insertions, 121 deletions

diff --git a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ConfigTest.config b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ConfigTest.config
index 01a8834ed..bdae3dc61 100644
--- a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ConfigTest.config
+++ b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ConfigTest.config
@@ -83,6 +83,18 @@ ActorInstanceConfig SubSystemConfigTest / top / testee2 {
 	Attr blocker = false {
 		dynamic configuration read
 	}
+	Attr dc_dump{
+		dynamic configuration write
+		Attr dc_i {
+			Attr char_i = "dummy"
+			Attr double_i = 0.0e-100
+		}
+		Attr long_array_i = 1000
+		Attr int_i = 123
+	}
+	Attr int_dump = 3 {
+		dynamic configuration write
+	}
 }
 
 
diff --git a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ConfigTest.room b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ConfigTest.room
index 99c9da53c..1290d60d0 100644
--- a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ConfigTest.room
+++ b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ConfigTest.room
@@ -28,7 +28,10 @@ RoomModel org.eclipse.etrice.integration.ConfigTest {
 			Attribute dc_i : Dyn_DC1
 			// manual test
 			Attribute blockMe : int32
-			Attribute blocker : boolean

+			Attribute blocker : boolean
+			// not explicit test
+			Attribute dc_dump : Dyn_DC1
+			Attribute int_dump : int32

 		}

 		Behavior {
 			StateMachine {
@@ -38,6 +41,11 @@ RoomModel org.eclipse.etrice.integration.ConfigTest {
 						<test : Conj_DynConfigPort>
 					}
 					action {
+						// write without test
+						"Dyn_DC1 tmp = new Dyn_DC1(123, new long[]{1000}, new Dyn_DC2(0.0e-100, \"dummy out\".toCharArray()));"
+						"setAndWriteDc_dump(tmp);"
+						"setAndWriteInt_dump(888);"
+						// read test
 						"if(blocker)getBlockMeLock().forbidUpdate(); else getBlockMeLock().allowUpdate();"
 						"int testValue = 0;"
 						"if(int_i != 401 || getDc_i().getLong_array_i()[0] != 403)"
diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTest_Top.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTest_Top.java
index 2614ba4c3..f8b917859 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTest_Top.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTest_Top.java
@@ -43,7 +43,6 @@ public class CPTest_Top extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	

 	

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java
index 7d000c50d..4d8496f22 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPTester.java
@@ -47,7 +47,6 @@ public class CPTester extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	

 	

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java
index bba587413..8bedc819d 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ChoicePointTest/CPUser.java
@@ -56,7 +56,6 @@ public class CPUser extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	public void setCounter (int counter) {

 		 this.counter = counter;

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/AC1_ac.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/AC1_ac.java
index 64ebdc343..e26429406 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/AC1_ac.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/AC1_ac.java
@@ -47,7 +47,6 @@ public class AC1_ac extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	

 	

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/ConfigText_Top_ac.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/ConfigText_Top_ac.java
index a6380757a..abd515e57 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/ConfigText_Top_ac.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/ConfigText_Top_ac.java
@@ -43,7 +43,6 @@ public class ConfigText_Top_ac extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	

 	

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/DynTestee_ac.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/DynTestee_ac.java
index 4be9aaf88..0a35ec308 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/DynTestee_ac.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/DynTestee_ac.java
@@ -21,6 +21,7 @@ import org.eclipse.etrice.runtime.java.messaging.RTServices;
 public class DynTestee_ac extends ActorClassBase {

 

 	

+	private VariableService variableService;

 	

 	//--------------------- ports

 	protected TestCommProtocolConjPort Conj_DynConfigPort = null;

@@ -38,10 +39,12 @@ public class DynTestee_ac extends ActorClassBase {
 	Dyn_DC1 dc_i;

 	int blockMe;

 	boolean blocker;

-	private DynConfigLock lock_int_i;

+	Dyn_DC1 dc_dump;

+	int int_dump;

+	private DynConfigLock lock_blocker;

 	private DynConfigLock lock_dc_i;

+	private DynConfigLock lock_int_i;

 	private DynConfigLock lock_blockMe;

-	private DynConfigLock lock_blocker;

 	/*--------------------- operations ---------------------*/

 

 	//--------------------- construction

@@ -54,6 +57,8 @@ public class DynTestee_ac extends ActorClassBase {
 		dc_i = new Dyn_DC1();

 		blockMe = 0;

 		blocker = false;

+		dc_dump = new Dyn_DC1();

+		int_dump = 0;

 

 		// own ports

 		Conj_DynConfigPort = new TestCommProtocolConjPort(this, "Conj_DynConfigPort", IFITEM_Conj_DynConfigPort, 0, port_addr[IFITEM_Conj_DynConfigPort][0], peer_addr[IFITEM_Conj_DynConfigPort][0]); 

@@ -66,33 +71,45 @@ public class DynTestee_ac extends ActorClassBase {
 	public DynTestee_ac(IRTObject parent, String name, Address[][] port_addr, Address[][] peer_addr, VariableService variableService){

 		this(parent, name, port_addr, peer_addr);

 		

-		lock_int_i = new DynConfigLock();

+		this.variableService = variableService;

+		lock_blocker = new DynConfigLock();

 		lock_dc_i = new DynConfigLock();

+		lock_int_i = new DynConfigLock();

 		lock_blockMe = new DynConfigLock();

-		lock_blocker = new DynConfigLock();

 	}

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

+	public void setDc_dump (Dyn_DC1 dc_dump) {

+		 this.dc_dump = dc_dump;

+	}

+	public Dyn_DC1 getDc_dump () {

+		return this.dc_dump;

+	}

+	public void setInt_dump (int int_dump) {

+		 this.int_dump = int_dump;

+	}

+	public int getInt_dump () {

+		return this.int_dump;

+	}

 	

-	public int getInt_i(){

-		if(lock_int_i == null)

-			return int_i;

+	public boolean getBlocker(){

+		if(lock_blocker == null)

+			return blocker;

 		else

-			synchronized(lock_int_i){

-				return int_i;

+			synchronized(lock_blocker){

+				return blocker;

 			}

 	}

-	public void setInt_i(int int_i){

-		if(lock_int_i == null)

-			this.int_i = int_i;

+	public void setBlocker(boolean blocker){

+		if(lock_blocker == null)

+			this.blocker = blocker;

 		else

-			synchronized(lock_int_i){

-				this.int_i = int_i;

+			synchronized(lock_blocker){

+				this.blocker = blocker;

 			}

 	}

-	public DynConfigLock getInt_iLock(){

-		return lock_int_i;

+	public DynConfigLock getBlockerLock(){

+		return lock_blocker;

 	}	

 	public Dyn_DC1 getDc_i(){

 		if(lock_dc_i == null)

@@ -113,6 +130,25 @@ public class DynTestee_ac extends ActorClassBase {
 	public DynConfigLock getDc_iLock(){

 		return lock_dc_i;

 	}	

+	public int getInt_i(){

+		if(lock_int_i == null)

+			return int_i;

+		else

+			synchronized(lock_int_i){

+				return int_i;

+			}

+	}

+	public void setInt_i(int int_i){

+		if(lock_int_i == null)

+			this.int_i = int_i;

+		else

+			synchronized(lock_int_i){

+				this.int_i = int_i;

+			}

+	}

+	public DynConfigLock getInt_iLock(){

+		return lock_int_i;

+	}	

 	public int getBlockMe(){

 		if(lock_blockMe == null)

 			return blockMe;

@@ -132,25 +168,14 @@ public class DynTestee_ac extends ActorClassBase {
 	public DynConfigLock getBlockMeLock(){

 		return lock_blockMe;

 	}	

-	public boolean getBlocker(){

-		if(lock_blocker == null)

-			return blocker;

-		else

-			synchronized(lock_blocker){

-				return blocker;

-			}

+	public void setAndWriteDc_dump(Dyn_DC1 dc_dump){

+			setDc_dump(dc_dump);

+			variableService.write(this.getInstancePath()+"/dc_dump", dc_dump);

 	}

-	public void setBlocker(boolean blocker){

-		if(lock_blocker == null)

-			this.blocker = blocker;

-		else

-			synchronized(lock_blocker){

-				this.blocker = blocker;

-			}

+	public void setAndWriteInt_dump(int int_dump){

+			setInt_dump(int_dump);

+			variableService.write(this.getInstancePath()+"/int_dump", int_dump);

 	}

-	public DynConfigLock getBlockerLock(){

-		return lock_blocker;

-	}	

 	

 	//--------------------- port getters

 	public TestCommProtocolConjPort getConj_DynConfigPort (){

@@ -206,6 +231,9 @@ public class DynTestee_ac extends ActorClassBase {
 	

 	/* Action Codes */

 	protected void action_TRANS_tr0_FROM_First_TO_Done_BY_testConj_DynConfigPort(InterfaceItemBase ifitem) {

+		Dyn_DC1 tmp = new Dyn_DC1(123, new long[]{1000}, new Dyn_DC2(0.0e-100, "dummy out".toCharArray()));

+		setAndWriteDc_dump(tmp);

+		setAndWriteInt_dump(888);

 		if(blocker)getBlockMeLock().forbidUpdate(); else getBlockMeLock().allowUpdate();

 		int testValue = 0;

 		if(int_i != 401 || getDc_i().getLong_array_i()[0] != 403)

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTest.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTest.java
index e6f9e8086..65ccc192e 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTest.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTest.java
@@ -156,6 +156,11 @@ public class SubSystemConfigTest extends SubSystemClassBase{
 			inst.getDc_i().getDc_i().setDouble_i(0.304d);

 			inst.setBlockMe(0);

 			inst.setBlocker(false);

+			inst.getDc_dump().getDc_i().setChar_i("dummy".toCharArray());

+			inst.getDc_dump().getDc_i().setDouble_i(0.0d);

+			inst.getDc_dump().setLong_array_i(new long[]{1000L});

+			inst.getDc_dump().setInt_i(123);

+			inst.setInt_dump(3);

 		}

 

 		// create the subsystem system port	

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestVariableService.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestVariableService.java
index 7ddea2eed..a16a8255b 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestVariableService.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/SubSystemConfigTestVariableService.java
@@ -5,26 +5,25 @@ import java.util.Arrays;
 import java.util.HashMap;

 import java.util.Map;

 import org.eclipse.etrice.runtime.java.config.VariableService;

-import org.eclipse.etrice.runtime.java.config.ConfigSourceFile

-		;

+import org.eclipse.etrice.runtime.java.config.ConfigSourceFile;

+import org.eclipse.etrice.integration.ConfigTest.*;

+

 

 public class SubSystemConfigTestVariableService extends VariableService{

 	

 	private SubSystemConfigTest subSystem;

-	private Map<String, Object> diffMap;

 	

-	// Actor instances			

-	private DynTestee_ac testee2;

+	// Actor instances

+	private DynTestee_ac _top_testee2;

 	

 	public SubSystemConfigTestVariableService(SubSystemConfigTest subSystem) {

+		super(new ConfigSourceFile("tmp/subSystemConfigTest"));

 		this.subSystem = subSystem;

-		source = new ConfigSourceFile("tmp/subSystemConfigTest");

-		diffMap = new HashMap<String, Object>();

 	}

 	

 	@Override

-	protected void getInstances(){

-		testee2 = (DynTestee_ac)subSystem.getInstance("/SubSystemConfigTest/top/testee2");

+	protected void initInstances(){

+		_top_testee2 = (DynTestee_ac)subSystem.getInstance("/SubSystemConfigTest/top/testee2");

 	}

 	

 

@@ -39,16 +38,16 @@ public class SubSystemConfigTestVariableService extends VariableService{
 			object = values.get(id);

 			if(object != null){

 				_int_i = ensureInt(object);

-				if(!_int_i.equals((Integer)diffMap.get(id)))

+				if(!_int_i.equals((Integer)getDiffMap().get(id)))

 					changed = true;

 			} else

 				warning(id, "is missing");

 			if(changed)

-				synchronized(testee2.getInt_iLock()){

-					if(testee2.getInt_iLock().isUpdate()){

+				synchronized(_top_testee2.getInt_iLock()){

+					if(_top_testee2.getInt_iLock().isUpdate()){

 						if(_int_i != null){

-							testee2.setInt_i(_int_i);

-							diffMap.put("/SubSystemConfigTest/int_i", _int_i);

+							_top_testee2.setInt_i(_int_i);

+							getDiffMap().put("/SubSystemConfigTest/top/testee2/int_i", _int_i);

 						}

 					} 

 				}

@@ -57,12 +56,21 @@ public class SubSystemConfigTestVariableService extends VariableService{
 		}

 		try{

 			boolean changed = false;

+			id = "/SubSystemConfigTest/top/testee2/dc_i/long_array_i";

+			long[] _long_array_i = null;

+			object = values.get(id);

+			if(object != null){

+				_long_array_i = ensureLongArray(object, 1);

+				if(!Arrays.equals(_long_array_i, (long[])getDiffMap().get(id)))

+					changed = true;

+			} else

+				warning(id, "is missing");

 			id = "/SubSystemConfigTest/top/testee2/dc_i/dc_i/double_i";

 			Double _double_i = null;

 			object = values.get(id);

 			if(object != null){

 				_double_i = ensureDouble(object);

-				if(!_double_i.equals((Double)diffMap.get(id)))

+				if(!_double_i.equals((Double)getDiffMap().get(id)))

 					changed = true;

 			} else

 				warning(id, "is missing");

@@ -71,16 +79,7 @@ public class SubSystemConfigTestVariableService extends VariableService{
 			object = values.get(id);

 			if(object != null){

 				_char_i = ensureCharArray(object, 10);

-				if(!Arrays.equals(_char_i, (char[])diffMap.get(id)))

-					changed = true;

-			} else

-				warning(id, "is missing");

-			id = "/SubSystemConfigTest/top/testee2/dc_i/long_array_i";

-			long[] _long_array_i = null;

-			object = values.get(id);

-			if(object != null){

-				_long_array_i = ensureLongArray(object, 1);

-				if(!Arrays.equals(_long_array_i, (long[])diffMap.get(id)))

+				if(!Arrays.equals(_char_i, (char[])getDiffMap().get(id)))

 					changed = true;

 			} else

 				warning(id, "is missing");

@@ -89,28 +88,28 @@ public class SubSystemConfigTestVariableService extends VariableService{
 			object = values.get(id);

 			if(object != null){

 				_int_i = ensureInt(object);

-				if(!_int_i.equals((Integer)diffMap.get(id)))

+				if(!_int_i.equals((Integer)getDiffMap().get(id)))

 					changed = true;

 			} else

 				warning(id, "is missing");

 			if(changed)

-				synchronized(testee2.getDc_iLock()){

-					if(testee2.getDc_iLock().isUpdate()){

+				synchronized(_top_testee2.getDc_iLock()){

+					if(_top_testee2.getDc_iLock().isUpdate()){

+						if(_long_array_i != null){

+							_top_testee2.getDc_i().setLong_array_i(_long_array_i);

+							getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/long_array_i", _long_array_i);

+						}

 						if(_double_i != null){

-							testee2.getDc_i().getDc_i().setDouble_i(_double_i);

-							diffMap.put("/SubSystemConfigTest/dc_i/dc_i/double_i", _double_i);

+							_top_testee2.getDc_i().getDc_i().setDouble_i(_double_i);

+							getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/double_i", _double_i);

 						}

 						if(_char_i != null){

-							testee2.getDc_i().getDc_i().setChar_i(_char_i);

-							diffMap.put("/SubSystemConfigTest/dc_i/dc_i/char_i", _char_i);

-						}

-						if(_long_array_i != null){

-							testee2.getDc_i().setLong_array_i(_long_array_i);

-							diffMap.put("/SubSystemConfigTest/dc_i/long_array_i", _long_array_i);

+							_top_testee2.getDc_i().getDc_i().setChar_i(_char_i);

+							getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i", _char_i);

 						}

 						if(_int_i != null){

-							testee2.getDc_i().setInt_i(_int_i);

-							diffMap.put("/SubSystemConfigTest/dc_i/int_i", _int_i);

+							_top_testee2.getDc_i().setInt_i(_int_i);

+							getDiffMap().put("/SubSystemConfigTest/top/testee2/dc_i/int_i", _int_i);

 						}

 					} 

 				}

@@ -124,16 +123,16 @@ public class SubSystemConfigTestVariableService extends VariableService{
 			object = values.get(id);

 			if(object != null){

 				_blockMe = ensureInt(object);

-				if(!_blockMe.equals((Integer)diffMap.get(id)))

+				if(!_blockMe.equals((Integer)getDiffMap().get(id)))

 					changed = true;

 			} else

 				warning(id, "is missing");

 			if(changed)

-				synchronized(testee2.getBlockMeLock()){

-					if(testee2.getBlockMeLock().isUpdate()){

+				synchronized(_top_testee2.getBlockMeLock()){

+					if(_top_testee2.getBlockMeLock().isUpdate()){

 						if(_blockMe != null){

-							testee2.setBlockMe(_blockMe);

-							diffMap.put("/SubSystemConfigTest/blockMe", _blockMe);

+							_top_testee2.setBlockMe(_blockMe);

+							getDiffMap().put("/SubSystemConfigTest/top/testee2/blockMe", _blockMe);

 						}

 					} 

 				}

@@ -147,16 +146,16 @@ public class SubSystemConfigTestVariableService extends VariableService{
 			object = values.get(id);

 			if(object != null){

 				_blocker = ensureBoolean(object);

-				if(!_blocker.equals((Boolean)diffMap.get(id)))

+				if(!_blocker.equals((Boolean)getDiffMap().get(id)))

 					changed = true;

 			} else

 				warning(id, "is missing");

 			if(changed)

-				synchronized(testee2.getBlockerLock()){

-					if(testee2.getBlockerLock().isUpdate()){

+				synchronized(_top_testee2.getBlockerLock()){

+					if(_top_testee2.getBlockerLock().isUpdate()){

 						if(_blocker != null){

-							testee2.setBlocker(_blocker);

-							diffMap.put("/SubSystemConfigTest/blocker", _blocker);

+							_top_testee2.setBlocker(_blocker);

+							getDiffMap().put("/SubSystemConfigTest/top/testee2/blocker", _blocker);

 						}

 					} 

 				}

@@ -168,28 +167,38 @@ public class SubSystemConfigTestVariableService extends VariableService{
 	@Override

 	protected Map<String, Object> getAttributeValues(){

 		Map<String, Object> values = new HashMap<String, Object>();

-		values.put("/SubSystemConfigTest/top/testee2/int_i", testee2.getInt_i());

-		values.put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/double_i", testee2.getDc_i().getDc_i().getDouble_i());

-		values.put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i", toObjectArray(testee2.getDc_i().getDc_i().getChar_i()));

-		values.put("/SubSystemConfigTest/top/testee2/dc_i/long_array_i", toObjectArray(testee2.getDc_i().getLong_array_i()));

-		values.put("/SubSystemConfigTest/top/testee2/dc_i/int_i", testee2.getDc_i().getInt_i());

-		values.put("/SubSystemConfigTest/top/testee2/blockMe", testee2.getBlockMe());

-		values.put("/SubSystemConfigTest/top/testee2/blocker", testee2.getBlocker());

+		values.put("/SubSystemConfigTest/top/testee2/int_i", _top_testee2.getInt_i());

+		values.put("/SubSystemConfigTest/top/testee2/dc_i/long_array_i", toObjectArray(_top_testee2.getDc_i().getLong_array_i()));

+		values.put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/double_i", _top_testee2.getDc_i().getDc_i().getDouble_i());

+		values.put("/SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i", toObjectArray(_top_testee2.getDc_i().getDc_i().getChar_i()));

+		values.put("/SubSystemConfigTest/top/testee2/dc_i/int_i", _top_testee2.getDc_i().getInt_i());

+		values.put("/SubSystemConfigTest/top/testee2/blockMe", _top_testee2.getBlockMe());

+		values.put("/SubSystemConfigTest/top/testee2/blocker", _top_testee2.getBlocker());

 		

 		return values;

 	}

 	

 	@Override

-	public void write(String id, Object object){

-		if(object.getClass().isPrimitive() || object.getClass().isArray())

-			writeTasks.put(id, object);

-		else {

-			synchronized(writeTasks){

-			}

-		}

+	public void writeDataClass(String id, Object dcObject, Map<String, Object> writeMap) {

+		if(dcObject.getClass().equals(Dyn_DC1.class))

+			writeDataClass(id, (Dyn_DC1) dcObject, writeTasks);

 	}

 	

 	// DataClasses write operations

 	

+	private void writeDataClass(String id, Dyn_DC1 object, Map<String, Object> map){

+		map.put(id+"/int_i", object.getInt_i());

+		map.put(id+"/long_array_i", toObjectArray(object.getLong_array_i()));

+		writeDataClass(id+"/dc_i", object.getDc_i(), map);

+	}

+	private void writeDataClass(String id, Dyn_DC2 object, Map<String, Object> map){

+		map.put(id+"/double_i", object.getDouble_i());

+		map.put(id+"/char_i", toObjectArray(object.getChar_i()));

+	}

+	

+	@Override

+	protected int getPollingTimerUser(){

+		return 4000;

+	}

 	

 }

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Testee_ac.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Testee_ac.java
index b875cc4ee..3e564be05 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Testee_ac.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/ConfigTest/Testee_ac.java
@@ -105,7 +105,6 @@ public class Testee_ac extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	public void setBool_r (boolean bool_r) {

 		 this.bool_r = bool_r;

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerTest_Top.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerTest_Top.java
index 44e50043d..a876b6c7a 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerTest_Top.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerTest_Top.java
@@ -43,7 +43,6 @@ public class HandlerTest_Top extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	

 	

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java
index 5c56538c8..a417c6e3d 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/HandlerUser.java
@@ -56,7 +56,6 @@ public class HandlerUser extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	public void setCounter (int counter) {

 		 this.counter = counter;

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/Tester.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/Tester.java
index 026037b40..d03c74b27 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/Tester.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/HandlerTest/Tester.java
@@ -52,7 +52,6 @@ public class Tester extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	

 	

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPingActor.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPingActor.java
index 0af724b44..66d48c9fe 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPingActor.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPingActor.java
@@ -65,7 +65,6 @@ public class MrPingActor extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	public void setCount (int count) {

 		 this.count = count;

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java
index 6bde6bda5..12f9dbd3b 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor1.java
@@ -47,7 +47,6 @@ public class MrPongActor1 extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	

 	

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java
index 26433d9b3..fd31198b8 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/MrPongActor2.java
@@ -47,7 +47,6 @@ public class MrPongActor2 extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	

 	

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/PingPongTop.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/PingPongTop.java
index efb287a3c..bdba3f2a7 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/PingPongTop.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTest/PingPongTop.java
@@ -43,7 +43,6 @@ public class PingPongTop extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	

 	

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPingActor.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPingActor.java
index 98f7c7023..c48510a64 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPingActor.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPingActor.java
@@ -59,7 +59,6 @@ public class MrPingActor extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	public void setCount (int count) {

 		 this.count = count;

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java
index faca4037a..752de309f 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/MrPongActor1.java
@@ -47,7 +47,6 @@ public class MrPongActor1 extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	

 	

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/PingPongTop.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/PingPongTop.java
index a5fa27084..ff4dfc039 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/PingPongTop.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/PingPongThreadTestReplPort/PingPongTop.java
@@ -43,7 +43,6 @@ public class PingPongTop extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	

 	

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java
index 995c4d530..9ec7832b4 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPing.java
@@ -73,7 +73,6 @@ public class MrPing extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	public void setI32Array (int[] i32Array) {

 		 this.i32Array = i32Array;

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java
index 9464d294a..cf07f2daa 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/MrPong.java
@@ -59,7 +59,6 @@ public class MrPong extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	

 	

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SendingDataTop.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SendingDataTop.java
index 2a6a52d08..f8ce40a23 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SendingDataTop.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/SendingDataByValueTest/SendingDataTop.java
@@ -43,7 +43,6 @@ public class SendingDataTop extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	

 	

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/App_SubSystemHFSMTest.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/App_SubSystemHFSMTest.java
index 3ac464142..b909c5de9 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/App_SubSystemHFSMTest.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/App_SubSystemHFSMTest.java
@@ -43,7 +43,6 @@ public class App_SubSystemHFSMTest extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	

 	

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java
index 97e1d82b2..fcd96686c 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM.java
@@ -47,7 +47,6 @@ public class a_HFSM extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	

 	

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tester.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tester.java
index 1bb633770..f32c4302f 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tester.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tester.java
@@ -50,7 +50,6 @@ public class a_HFSM_Tester extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	

 	

diff --git a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tests.java b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tests.java
index e1c99a350..7f746ac22 100644
--- a/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tests.java
+++ b/tests/org.eclipse.etrice.integration.tests/src-gen/org/eclipse/etrice/integration/tests/a_HFSM_Tests.java
@@ -43,7 +43,6 @@ public class a_HFSM_Tests extends ActorClassBase {
 	}

 

 	

-	//--------------------- attributes getter and setter

 	//--------------------- attribute setters and getters

 	

 	

diff --git a/tests/org.eclipse.etrice.integration.tests/tmp/subSystemConfigTest b/tests/org.eclipse.etrice.integration.tests/tmp/subSystemConfigTest
index 5eba05889..060e2151e 100644
--- a/tests/org.eclipse.etrice.integration.tests/tmp/subSystemConfigTest
+++ b/tests/org.eclipse.etrice.integration.tests/tmp/subSystemConfigTest
@@ -1,8 +1,13 @@
 /SubSystemConfigTest/top/testee2/blockMe=0

 /SubSystemConfigTest/top/testee2/blocker=false

+/SubSystemConfigTest/top/testee2/dc_dump/dc_i/char_i="dummy out"

+/SubSystemConfigTest/top/testee2/dc_dump/dc_i/double_i=0.0

+/SubSystemConfigTest/top/testee2/dc_dump/int_i=123

+/SubSystemConfigTest/top/testee2/dc_dump/long_array_i={ 1000 }

 /SubSystemConfigTest/top/testee2/dc_i/dc_i/char_i="instance4"

 /SubSystemConfigTest/top/testee2/dc_i/dc_i/double_i=0.404

 /SubSystemConfigTest/top/testee2/dc_i/int_i=402

 /SubSystemConfigTest/top/testee2/dc_i/long_array_i={ 403 }

+/SubSystemConfigTest/top/testee2/int_dump=888

 /SubSystemConfigTest/top/testee2/int_i=401

-polling_time=5000

+polling_timer[ms]=4000