[modellib.c] language.room added

8 files changed, 15 insertions, 17 deletions

diff --git a/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java b/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java
deleted file mode 100644
index 85ec4254a..000000000
--- a/plugins/org.eclipse.etrice.generator.fsmtest/xtend-gen/org/eclipse/etrice/generator/generator/FSMtestGenerator.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.eclipse.etrice.generator.generator;

-

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.xtext.generator.IFileSystemAccess;

-import org.eclipse.xtext.generator.IGenerator;

-

-@SuppressWarnings("all")

-public class FSMtestGenerator implements IGenerator {

-  public void doGenerate(final Resource resource, final IFileSystemAccess fsa) {

-  }

-}

diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
index 10fa06c4a..6c339e46e 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
index 157ea24ec..6047c15a8 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
index a0fe1360a..7797f0bbb 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
index 5476dce2d..27f2d14ff 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
diff --git a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
index 48195163a..7489f72aa 100644
--- a/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
+++ b/plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
diff --git a/runtime/org.eclipse.etrice.modellib.c/model/Language.room b/runtime/org.eclipse.etrice.modellib.c/model/Language.room
new file mode 100644
index 000000000..04e441aad
--- /dev/null
+++ b/runtime/org.eclipse.etrice.modellib.c/model/Language.room
@@ -0,0 +1,3 @@
+RoomModel room.basic.language {
+	PrimitiveType languageIndicator: ptInteger -> int8 default "2"
+}
\ No newline at end of file
diff --git a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/etunit/EtUnit.java b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/etunit/EtUnit.java
index 3fdde425c..a868760db 100644
--- a/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/etunit/EtUnit.java
+++ b/runtime/org.eclipse.etrice.runtime.java/src/org/eclipse/etrice/runtime/java/etunit/EtUnit.java
@@ -57,6 +57,7 @@ public class EtUnit {
 			

 			out = new BufferedWriter(fstream);

 			out.write("etUnit report\n");

+			out.flush();

 		}

 		catch (IOException e) {

 			System.err.println("unable to open "+path);

@@ -86,6 +87,7 @@ public class EtUnit {
 		if (out!=null) {

 			try {

 				out.write("ts start: "+testSuiteName+"\n");

+				out.flush();

 			} catch (IOException e) {

 				e.printStackTrace();

 			}

@@ -101,6 +103,7 @@ public class EtUnit {
 		if (out!=null) {

 			try {

 				out.write("tc start "+caseId+": "+testCaseName+"\n");

+				out.flush();

 			} catch (IOException e) {

 				e.printStackTrace();

 			}

@@ -116,6 +119,7 @@ public class EtUnit {
 		if (out!=null) {

 			try {

 				out.write("tc end "+id+": "+time+"\n");

+				out.flush();

 			} catch (IOException e) {

 				e.printStackTrace();

 			}

@@ -293,7 +297,7 @@ public class EtUnit {
 			/* nothing to do because no failure */

 		}

 		else {

-			if (!failed.contains(id)) {

+		//	if (!failed.contains(id)) {

 				/* first failure will be remembered */

 				failed.add(id);

 				

@@ -304,17 +308,19 @@ public class EtUnit {
 	            int line = stackTraceElement.getLineNumber();

 	

 				try {

-					if (act!=null && exp!=null)

+					if (act!=null && exp!=null){

 						out.write("tc fail "+id+": #"+exp+"#"+act+"#"+fullClassName+":"+line+"#"+resulttext+"\n");

-					else

+						out.flush();}

+					else{

 						out.write("tc fail "+id+": ###"+fullClassName+":"+line+"#"+resulttext+"\n");

+						out.flush();}

 				} catch (IOException e) {

 					e.printStackTrace();

 				}

-			}

-			else{

+			//}

+			//else{

 				/* more than one error will be ignored */

-			}

+			//}

 		}

 	}