[modellibs and others] CTypes.room and JavaTypes.room -> Types.room

10 files changed, 64 insertions, 63 deletions

diff --git a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ChoicePointTest.room b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ChoicePointTest.room
index b50828dd3..aefd3388c 100644
--- a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ChoicePointTest.room
+++ b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.ChoicePointTest.room
@@ -1,6 +1,6 @@
 RoomModel org.eclipse.etrice.integration.ChoicePointTest {

 	

-	import room.basic.types.java.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/JavaTypes.room"

+	import room.basic.types.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/Types.room"

 	

 	LogicalSystem System_HandlerTest {

 		SubSystemRef SubSystem_CPTest: SubSystem_CPTest

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 bdae3dc61..90b900edc 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
@@ -1,4 +1,5 @@
 import org.eclipse.etrice.integration.ConfigTest.* from "org.eclipse.etrice.integration.ConfigTest.room"
+
 SubSystemConfig SubSystemConfigTest {
 	dynamic configuration {
 		file path "tmp/subSystemConfigTest"
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 1290d60d0..eae26c548 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
@@ -1,6 +1,6 @@
 RoomModel org.eclipse.etrice.integration.ConfigTest {
 
-	import room.basic.types.java.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/JavaTypes.room"
+	import room.basic.types.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/Types.room"
 
 	SubSystemClass SubSystemConfigTest {
 		ActorRef top: ConfigText_Top_ac
diff --git a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.HandlerTest.room b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.HandlerTest.room
index 1a50037e9..0415e2589 100644
--- a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.HandlerTest.room
+++ b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.HandlerTest.room
@@ -1,7 +1,7 @@
 RoomModel org.eclipse.etrice.integration.HandlerTest {

 

 	import room.basic.service.timing.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/TimingService.room"

-	import room.basic.types.java.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/JavaTypes.room"

+	import room.basic.types.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/Types.room"

 	

 	LogicalSystem System_HandlerTest {

 		SubSystemRef SubSystem_HandlerTest: SubSystem_HandlerTest

diff --git a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTest.room b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTest.room
index 427b61a20..d6385ecce 100644
--- a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTest.room
+++ b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTest.room
@@ -1,7 +1,7 @@
 RoomModel org.eclipse.etrice.integration.PingPongThreadTest {

 

 	import room.basic.service.timing.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/TimingService.room"

-	import room.basic.types.java.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/JavaTypes.room"

+	import room.basic.types.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/Types.room"

 

 	LogicalSystem System_PingPong {

 		SubSystemRef subsystem: SubSystem_PingPong

diff --git a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTestReplPort.room b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTestReplPort.room
index 27fff861d..ed7b787c0 100644
--- a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTestReplPort.room
+++ b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.PingPongThreadTestReplPort.room
@@ -1,7 +1,7 @@
 RoomModel org.eclipse.etrice.integration.PingPongThreadTestReplPort {

 

 	import room.basic.service.timing.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/TimingService.room"

-	import room.basic.types.java.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/JavaTypes.room"

+	import room.basic.types.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/Types.room"

 

 	LogicalSystem System_PingPongReplPort {

 		SubSystemRef subsystem: SubSystem_PingPongReplPort

diff --git a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.SendingDataByValueTest.room b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.SendingDataByValueTest.room
index ee9567f81..4cb136360 100644
--- a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.SendingDataByValueTest.room
+++ b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.SendingDataByValueTest.room
@@ -1,6 +1,6 @@
 RoomModel org.eclipse.etrice.integration.SendingDataByValueTest {

 

-	import room.basic.types.java.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/JavaTypes.room"

+	import room.basic.types.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/Types.room"

 

 	LogicalSystem LogSys_SendingData {

 		SubSystemRef application: SubSys_SendingData

diff --git a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.tests.room b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.tests.room
index dd5b6546d..d33402d4a 100644
--- a/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.tests.room
+++ b/tests/org.eclipse.etrice.integration.tests/model/org.eclipse.etrice.integration.tests.room
@@ -1,7 +1,7 @@
 RoomModel org.eclipse.etrice.integration.tests {

 

 	import room.basic.service.timing.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/TimingService.room"

-	import room.basic.types.java.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/JavaTypes.room"

+	import room.basic.types.* from "../../../runtime/org.eclipse.etrice.modellib.java/models/Types.room"

 

 	LogicalSystem SystemHFSMTest {

 		SubSystemRef subsystem : SubSystemHFSMTest

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 852a29879..918ec4750 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
@@ -42,10 +42,10 @@ public class DynTestee_ac extends ActorClassBase {
 	boolean blocker;

 	Dyn_DC1 dc_dump;

 	int int_dump;

-	private DynConfigLock lock_int_i;

-	private DynConfigLock lock_blockMe;

 	private DynConfigLock lock_dc_i;

+	private DynConfigLock lock_int_i;

 	private DynConfigLock lock_blocker;

+	private DynConfigLock lock_blockMe;

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

 

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

@@ -73,10 +73,10 @@ public class DynTestee_ac extends ActorClassBase {
 		this(parent, name, port_addr, peer_addr);

 		

 		this.variableService = variableService;

-		lock_int_i = new DynConfigLock();

-		lock_blockMe = new DynConfigLock();

 		lock_dc_i = new DynConfigLock();

+		lock_int_i = new DynConfigLock();

 		lock_blocker = new DynConfigLock();

+		lock_blockMe = new DynConfigLock();

 	}

 	

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

@@ -93,44 +93,6 @@ public class DynTestee_ac extends ActorClassBase {
 		return this.int_dump;

 	}

 	

-	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;

-		else

-			synchronized(lock_blockMe){

-				return blockMe;

-			}

-	}

-	public void setBlockMe(int blockMe){

-		if(lock_blockMe == null)

-			this.blockMe = blockMe;

-		else

-			synchronized(lock_blockMe){

-				this.blockMe = blockMe;

-			}

-	}

-	public DynConfigLock getBlockMeLock(){

-		return lock_blockMe;

-	}	

 	public Dyn_DC1 getDc_i(){

 		if(lock_dc_i == null)

 			return dc_i;

@@ -150,6 +112,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 boolean getBlocker(){

 		if(lock_blocker == null)

 			return blocker;

@@ -169,6 +150,25 @@ public class DynTestee_ac extends ActorClassBase {
 	public DynConfigLock getBlockerLock(){

 		return lock_blocker;

 	}	

+	public int getBlockMe(){

+		if(lock_blockMe == null)

+			return blockMe;

+		else

+			synchronized(lock_blockMe){

+				return blockMe;

+			}

+	}

+	public void setBlockMe(int blockMe){

+		if(lock_blockMe == null)

+			this.blockMe = blockMe;

+		else

+			synchronized(lock_blockMe){

+				this.blockMe = blockMe;

+			}

+	}

+	public DynConfigLock getBlockMeLock(){

+		return lock_blockMe;

+	}	

 	public void setAndWriteInt_dump(int int_dump){

 			setInt_dump(int_dump);

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

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 d4ab0bc86..aeb7b6193 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
@@ -56,6 +56,15 @@ public class SubSystemConfigTestVariableService extends VariableService{
 		}

 		try{

 			boolean changed = false;

+			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)getDiffMap().get(id)))

+					changed = true;

+			} else

+				warning(id, "is missing");

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

 			Integer _int_i = null;

 			object = values.get(id);

@@ -83,18 +92,13 @@ public class SubSystemConfigTestVariableService extends VariableService{
 					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)getDiffMap().get(id)))

-					changed = true;

-			} else

-				warning(id, "is missing");

 			if(changed)

 				synchronized(_top_testee2.getDc_iLock()){

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

+						if(_double_i != null){

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

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

+						}

 						if(_int_i != null){

 							_top_testee2.getDc_i().setInt_i(_int_i);

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

@@ -107,10 +111,6 @@ public class SubSystemConfigTestVariableService extends VariableService{
 							_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){

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

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

-						}

 					} 

 				}

 		}catch(IllegalArgumentException e){

@@ -168,10 +168,10 @@ public class SubSystemConfigTestVariableService extends VariableService{
 	protected Map<String, Object> getAttributeValues(){

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

 		values.put("/SubSystemConfigTest/top/testee2/int_i", _top_testee2.getInt_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/int_i", _top_testee2.getDc_i().getInt_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/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/blockMe", _top_testee2.getBlockMe());

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