Merge remote branch 'refs/remotes/origin/master'

Conflicts:
	plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend
	plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
	plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java
	plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java
	plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/extensions/RoomExtensions.java

2 files changed, 106 insertions, 106 deletions

diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThreadReplPort.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThreadReplPort.java
index 59b1d5deb..1b71ac187 100644
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThreadReplPort.java
+++ b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestPingPongThreadReplPort.java
@@ -1,53 +1,53 @@
-/*******************************************************************************
- * Copyright (c) 2010 protos software gmbh (http://www.protos.de).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * CONTRIBUTORS:
- * 		Thomas Schuetz and Henrik Rentz-Reichert (initial contribution)
- * 
- *******************************************************************************/
-
-package org.eclipse.etrice.integration.tests;
-
-
-import static org.junit.Assert.assertEquals;
-
-import org.eclipse.etrice.integration.PingPongThreadTestReplPort.SubSystem_PingPongReplPort;
-import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class IntegrationTestPingPongThreadReplPort extends IntegrationTestBase {
-//	private SubSystem_PingPongReplPort main_component = null;
-
-	@Before
-	public void setUp() throws Exception {
-//		main_component  = new SubSystem_PingPongReplPort(null,"MainComponent");
-//		
-//		// hand over the semaphore to the subsystem
-//		main_component.setTestSemaphore(this.testSem);
-	}
-	
-	@Test (timeout=10000)
-	public void testPingPongThreadTestReplPort (){
-//		main_component.init(); // lifecycle init
-//		main_component.start(); // lifecycle start
-//		
-//		waitForTestcase();
-//		
-//		assertEquals(0,main_component.getTestErrorCode());
-	}
-
-	@After
-	public void tearDown() throws Exception {
-//		// end the lifecycle
-//		main_component.stop(); // lifecycle stop
-//		main_component.destroy(); // lifecycle destroy
-	}
-
-	
-}
+/*******************************************************************************

+ * Copyright (c) 2010 protos software gmbh (http://www.protos.de).

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * CONTRIBUTORS:

+ * 		Thomas Schuetz and Henrik Rentz-Reichert (initial contribution)

+ * 

+ *******************************************************************************/

+

+package org.eclipse.etrice.integration.tests;

+

+

+import static org.junit.Assert.assertEquals;

+

+import org.eclipse.etrice.integration.PingPongThreadTestReplPort.SubSystem_PingPongReplPort;

+import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+

+public class IntegrationTestPingPongThreadReplPort extends IntegrationTestBase {

+//	private SubSystem_PingPongReplPort main_component = null;

+

+	@Before

+	public void setUp() throws Exception {

+//		main_component  = new SubSystem_PingPongReplPort(null,"MainComponent");

+//		

+//		// hand over the semaphore to the subsystem

+//		main_component.setTestSemaphore(this.testSem);

+	}

+	

+	@Test (timeout=10000)

+	public void testPingPongThreadTestReplPort (){

+//		main_component.init(); // lifecycle init

+//		main_component.start(); // lifecycle start

+//		

+//		waitForTestcase();

+//		

+//		assertEquals(0,main_component.getTestErrorCode());

+	}

+

+	@After

+	public void tearDown() throws Exception {

+//		// end the lifecycle

+//		main_component.stop(); // lifecycle stop

+//		main_component.destroy(); // lifecycle destroy

+	}

+

+	

+}

diff --git a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestSendingDataByValue.java b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestSendingDataByValue.java
index 5432b7e83..c9cfd5d3b 100644
--- a/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestSendingDataByValue.java
+++ b/tests/org.eclipse.etrice.integration.tests/src/org/eclipse/etrice/integration/tests/IntegrationTestSendingDataByValue.java
@@ -1,53 +1,53 @@
-/*******************************************************************************
- * Copyright (c) 2010 Tieto Deutschland Gmbh (http://www.tieto.com).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * CONTRIBUTORS:
- * 		Thomas Jung
- * 
- *******************************************************************************/
-
-package org.eclipse.etrice.integration.tests;
-
-
-import static org.junit.Assert.assertEquals;
-
-import org.eclipse.etrice.integration.SendingDataByValueTest.SubSys_SendingData;
-import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class IntegrationTestSendingDataByValue extends IntegrationTestBase {
-	private SubSys_SendingData main_component = null;
-
-	@Before
-	public void setUp() throws Exception {
-		main_component  = new SubSys_SendingData(null,"MainComponent");
-		
-		// hand over the semaphore to the subsystem
-		main_component.setTestSemaphore(this.testSem);
-	}
-	
-	@Test (timeout=5000)
-	public void testSendingDataByValue(){
-		main_component.init(); // lifecycle init
-		main_component.start(); // lifecycle start
-		
-		waitForTestcase();
-		
-		assertEquals(0,main_component.getTestErrorCode());
-	}
-
-	@After
-	public void tearDown() throws Exception {
-		// end the lifecycle
-		main_component.stop(); // lifecycle stop
-		main_component.destroy(); // lifecycle destroy
-	}
-
-	
-}
+/*******************************************************************************

+ * Copyright (c) 2010 Tieto Deutschland Gmbh (http://www.tieto.com).

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * CONTRIBUTORS:

+ * 		Thomas Jung

+ * 

+ *******************************************************************************/

+

+package org.eclipse.etrice.integration.tests;

+

+

+import static org.junit.Assert.assertEquals;

+

+import org.eclipse.etrice.integration.SendingDataByValueTest.SubSys_SendingData;

+import org.eclipse.etrice.integration.tests.base.IntegrationTestBase;

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Test;

+

+public class IntegrationTestSendingDataByValue extends IntegrationTestBase {

+	private SubSys_SendingData main_component = null;

+

+	@Before

+	public void setUp() throws Exception {

+		main_component  = new SubSys_SendingData(null,"MainComponent");

+		

+		// hand over the semaphore to the subsystem

+		main_component.setTestSemaphore(this.testSem);

+	}

+	

+	@Test (timeout=5000)

+	public void testSendingDataByValue(){

+		main_component.init(); // lifecycle init

+		main_component.start(); // lifecycle start

+		

+		waitForTestcase();

+		

+		assertEquals(0,main_component.getTestErrorCode());

+	}

+

+	@After

+	public void tearDown() throws Exception {

+		// end the lifecycle

+		main_component.stop(); // lifecycle stop

+		main_component.destroy(); // lifecycle destroy

+	}

+

+	

+}