Merge remote-tracking branch 'origin/master'

12 files changed, 120 insertions, 92 deletions

diff --git a/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF
index 273048fdd..887893d1d 100644
--- a/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.config.tests/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: eTrice Config DSL Tests

 Bundle-Vendor: eTrice (Incubation)

-Bundle-Version: 0.2.0.qualifier

+Bundle-Version: 0.3.0.qualifier

 Bundle-SymbolicName: org.eclipse.etrice.core.config.tests; singleton:=true

 Bundle-ActivationPolicy: lazy

-Require-Bundle: org.eclipse.etrice.core.config,

- org.eclipse.etrice.core.config.ui,

+Require-Bundle: org.eclipse.etrice.core.config;bundle-version="0.3.0",

+ org.eclipse.etrice.core.config.ui;bundle-version="0.3.0",

  org.eclipse.core.runtime,

  org.eclipse.xtext,

  org.eclipse.xtext.junit4,

diff --git a/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF
index 6a5515e51..c9aa7b130 100644
--- a/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.genmodel.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: Tests

 Bundle-SymbolicName: org.eclipse.etrice.core.genmodel.tests

-Bundle-Version: 0.2.0.qualifier

+Bundle-Version: 0.3.0.qualifier

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.2.0",

- org.eclipse.etrice.core.genmodel;bundle-version="0.2.0",

+Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.3.0",

+ org.eclipse.etrice.core.genmodel;bundle-version="0.3.0",

  org.junit4;bundle-version="4.8.1",

  org.eclipse.xtext;bundle-version="2.1.1",

  org.eclipse.core.runtime;bundle-version="3.7.0"

diff --git a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF
index d2079c90d..816b57f35 100644
--- a/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.room.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: eTrice Room Core Tests

 Bundle-SymbolicName: org.eclipse.etrice.core.room.tests

-Bundle-Version: 0.2.0.qualifier

+Bundle-Version: 0.3.0.qualifier

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Bundle-Vendor: eTrice (Incubation)

 Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.1.0",

diff --git a/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF
index 3dfcc9572..1001398f4 100644
--- a/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.etunit.converter.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: etUnit Converter Tests

 Bundle-SymbolicName: org.eclipse.etrice.etunit.converter.tests

-Bundle-Version: 0.2.0.qualifier

+Bundle-Version: 0.3.0.qualifier

 Bundle-Activator: org.eclipse.etrice.etunit.converter.tests.Activator

-Bundle-Vendor: eTrice (incubation)

-Require-Bundle: org.eclipse.etrice.etunit.converter;bundle-version="0.2.0",

+Bundle-Vendor: eTrice (Incubation)

+Require-Bundle: org.eclipse.etrice.etunit.converter;bundle-version="0.3.0",

  org.eclipse.core.runtime,

  org.junit;bundle-version="4.8.2"

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF
index ecda0c5a2..313faa56a 100644
--- a/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.generator.fsmtest.tests/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
 Manifest-Version: 1.0

 Bundle-ManifestVersion: 2

 Bundle-Name: org.eclipse.etrice.generator.fsmtest.tests

-Bundle-Vendor: My Company

-Bundle-Version: 1.0.0.qualifier

+Bundle-Vendor: eTrice (Incubation)

+Bundle-Version: 0.3.0.qualifier

 Bundle-SymbolicName: org.eclipse.etrice.generator.fsmtest.tests; singleton:=true

 Bundle-ActivationPolicy: lazy

-Require-Bundle: org.eclipse.etrice.generator.fsmtest,

- org.eclipse.etrice.generator.fsmtest.ui,

+Require-Bundle: org.eclipse.etrice.generator.fsmtest;bundle-version="0.3.0",

+ org.eclipse.etrice.generator.fsmtest.ui;bundle-version="0.3.0",

  org.eclipse.core.runtime,

  org.eclipse.xtext.junit4,

  org.eclipse.ui.workbench;resolution:=optional

diff --git a/tests/org.eclipse.etrice.generator.fsmtest.tests/about.html b/tests/org.eclipse.etrice.generator.fsmtest.tests/about.html
new file mode 100644
index 000000000..f47dbddbb
--- /dev/null
+++ b/tests/org.eclipse.etrice.generator.fsmtest.tests/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>June 5, 2006</p>	

+<h3>License</h3>

+

+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

+apply to your use of any object code in the Content.  Check the Redistributor's license that was 

+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

+indicated below, the terms and conditions of the EPL still apply to any source code in the Content

+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

+

+</body>

+</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.etrice.generator.fsmtest.tests/src-gen/org/eclipse/etrice/generator/FSMtestInjectorProvider.java b/tests/org.eclipse.etrice.generator.fsmtest.tests/src-gen/org/eclipse/etrice/generator/FSMtestInjectorProvider.java
index 246fa2601..421bd31db 100644
--- a/tests/org.eclipse.etrice.generator.fsmtest.tests/src-gen/org/eclipse/etrice/generator/FSMtestInjectorProvider.java
+++ b/tests/org.eclipse.etrice.generator.fsmtest.tests/src-gen/org/eclipse/etrice/generator/FSMtestInjectorProvider.java
@@ -1,45 +1,45 @@
-/*

-* generated by Xtext

-*/

-package org.eclipse.etrice.generator;

-

-import org.eclipse.xtext.junit4.GlobalRegistries;

-import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento;

-import org.eclipse.xtext.junit4.IInjectorProvider;

-import org.eclipse.xtext.junit4.IRegistryConfigurator;

-

-import com.google.inject.Injector;

-

-public class FSMtestInjectorProvider implements IInjectorProvider, IRegistryConfigurator {

-	

-    protected GlobalStateMemento stateBeforeInjectorCreation;

-	protected GlobalStateMemento stateAfterInjectorCreation;

-	protected Injector injector;

-

-	static {

-		GlobalRegistries.initializeDefaults();

-	}

-

-	public Injector getInjector()

-	{

-		if (injector == null) {

-			stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();

-			this.injector = internalCreateInjector();

-			stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();

-		}

-		return injector;

-	}

-	

-	protected Injector internalCreateInjector() {

-	    return new FSMtestStandaloneSetup().createInjectorAndDoEMFRegistration();

-	}

-

-	public void restoreRegistry() {

-		stateBeforeInjectorCreation.restoreGlobalState();

-	}

-

-	public void setupRegistry() {

-		getInjector();

-		stateAfterInjectorCreation.restoreGlobalState();

-	}

-}

+/*
+* generated by Xtext
+*/
+package org.eclipse.etrice.generator;
+
+import org.eclipse.xtext.junit4.GlobalRegistries;
+import org.eclipse.xtext.junit4.GlobalRegistries.GlobalStateMemento;
+import org.eclipse.xtext.junit4.IInjectorProvider;
+import org.eclipse.xtext.junit4.IRegistryConfigurator;
+
+import com.google.inject.Injector;
+
+public class FSMtestInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
+	
+    protected GlobalStateMemento stateBeforeInjectorCreation;
+	protected GlobalStateMemento stateAfterInjectorCreation;
+	protected Injector injector;
+
+	static {
+		GlobalRegistries.initializeDefaults();
+	}
+
+	public Injector getInjector()
+	{
+		if (injector == null) {
+			stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
+			this.injector = internalCreateInjector();
+			stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
+		}
+		return injector;
+	}
+	
+	protected Injector internalCreateInjector() {
+	    return new FSMtestStandaloneSetup().createInjectorAndDoEMFRegistration();
+	}
+
+	public void restoreRegistry() {
+		stateBeforeInjectorCreation.restoreGlobalState();
+	}
+
+	public void setupRegistry() {
+		getInjector();
+		stateAfterInjectorCreation.restoreGlobalState();
+	}
+}
diff --git a/tests/org.eclipse.etrice.generator.fsmtest.tests/src-gen/org/eclipse/etrice/generator/FSMtestUiInjectorProvider.java b/tests/org.eclipse.etrice.generator.fsmtest.tests/src-gen/org/eclipse/etrice/generator/FSMtestUiInjectorProvider.java
index 6798d9806..802290b22 100644
--- a/tests/org.eclipse.etrice.generator.fsmtest.tests/src-gen/org/eclipse/etrice/generator/FSMtestUiInjectorProvider.java
+++ b/tests/org.eclipse.etrice.generator.fsmtest.tests/src-gen/org/eclipse/etrice/generator/FSMtestUiInjectorProvider.java
@@ -1,16 +1,16 @@
-/*

-* generated by Xtext

-*/

-package org.eclipse.etrice.generator;

-

-import org.eclipse.xtext.junit4.IInjectorProvider;

-

-import com.google.inject.Injector;

-

-public class FSMtestUiInjectorProvider implements IInjectorProvider {

-	

-	public Injector getInjector() {

-		return org.eclipse.etrice.generator.ui.internal.FSMtestActivator.getInstance().getInjector("org.eclipse.etrice.generator.FSMtest");

-	}

-	

-}

+/*
+* generated by Xtext
+*/
+package org.eclipse.etrice.generator;
+
+import org.eclipse.xtext.junit4.IInjectorProvider;
+
+import com.google.inject.Injector;
+
+public class FSMtestUiInjectorProvider implements IInjectorProvider {
+	
+	public Injector getInjector() {
+		return org.eclipse.etrice.generator.ui.internal.FSMtestActivator.getInstance().getInjector("org.eclipse.etrice.generator.FSMtest");
+	}
+	
+}
diff --git a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF
index b577a1d6c..41d7fa158 100644
--- a/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.generator.tests/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: eTrice Generator Model Tests

 Bundle-SymbolicName: org.eclipse.etrice.generator.tests

-Bundle-Version: 0.2.0.qualifier

+Bundle-Version: 0.3.0.qualifier

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

 Bundle-Vendor: eTrice (Incubation)

-Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.1.0",

+Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.3.0",

  org.eclipse.etrice.generator;bundle-version="0.1.0",

  org.junit4;bundle-version="[4.8.1,4.9.0)",

  org.eclipse.osgi;bundle-version="3.6.0",

diff --git a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF
index 38e61f730..f27654185 100644
--- a/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.ui.behavior.tests/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: eTrice Behavior Diagram Tests

 Bundle-SymbolicName: org.eclipse.etrice.ui.behavior.tests

-Bundle-Version: 0.2.0.qualifier

+Bundle-Version: 0.3.0.qualifier

 Bundle-Activator: org.eclipse.etrice.ui.behavior.BehaviorTestActivator

 Bundle-Vendor: eTrice (Incubation)

-Require-Bundle: org.eclipse.ui,

+Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.3.0",

+ org.eclipse.etrice.ui.behavior;bundle-version="0.3.0",

+ org.eclipse.etrice.ui.common;bundle-version="0.3.0",

+ org.eclipse.etrice.ui.tests.base;bundle-version="0.3.0",

+ org.eclipse.ui,

  org.eclipse.core.runtime,

  org.junit4;bundle-version="[4.8.1,4.9.0)",

- org.eclipse.etrice.core.room;bundle-version="0.1.0",

- org.eclipse.etrice.ui.behavior;bundle-version="0.1.0",

- org.eclipse.etrice.ui.common;bundle-version="0.1.0",

- org.eclipse.etrice.ui.tests.base;bundle-version="0.1.0",

  org.eclipse.xtext;bundle-version="2.1.1",

  org.eclipse.graphiti;bundle-version="0.8.0"

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
index e2985f3e6..3ff768a35 100644
--- a/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.ui.structure.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: eTrice Structure Diagram Tests

 Bundle-SymbolicName: org.eclipse.etrice.ui.structure.tests

-Bundle-Version: 0.2.0.qualifier

-Require-Bundle: org.eclipse.ui,

+Bundle-Version: 0.3.0.qualifier

+Require-Bundle: org.eclipse.etrice.core.room;bundle-version="0.3.0",

+ org.eclipse.etrice.ui.structure;bundle-version="0.3.0",

+ org.eclipse.etrice.ui.common;bundle-version="0.3.0",

+ org.eclipse.etrice.ui.tests.base;bundle-version="0.3.0",

+ org.eclipse.ui,

  org.eclipse.core.runtime,

  org.junit4;bundle-version="[4.8.1,4.9.0)",

- org.eclipse.etrice.core.room;bundle-version="0.1.0",

- org.eclipse.etrice.ui.structure;bundle-version="0.1.0",

- org.eclipse.etrice.ui.common;bundle-version="0.1.0",

- org.eclipse.etrice.ui.tests.base;bundle-version="0.1.0",

  org.eclipse.xtext;bundle-version="2.1.1",

  org.eclipse.graphiti;bundle-version="0.8.0"

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF
index 284b24934..07b52b1fa 100644
--- a/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.ui.tests.base/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2

 Bundle-Name: eTrice Diagram Test Base Classes

 Bundle-SymbolicName: org.eclipse.etrice.ui.tests.base

-Bundle-Version: 0.2.0.qualifier

+Bundle-Version: 0.3.0.qualifier

 Require-Bundle: org.junit4;bundle-version="[4.8.1,4.9.0)",

  org.eclipse.core.runtime,

- org.eclipse.etrice.core.room;bundle-version="0.1.0",

- org.eclipse.etrice.ui.structure;bundle-version="0.1.0",

+ org.eclipse.etrice.core.room;bundle-version="0.3.0",

+ org.eclipse.etrice.ui.structure;bundle-version="0.3.0",

  org.eclipse.xtext;bundle-version="2.1.1",

  org.eclipse.graphiti;bundle-version="0.8.0"

 Bundle-Vendor: eTrice (Incubation)