re-generated all Xtext languages, introduced TransitionBase

as common super class of Transition and RefinedTransition

Change-Id: Id4dc739696814d3ffc704626a37d6e9599f3432c

3 files changed, 35 insertions, 13 deletions

diff --git a/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF
index 4c87869c1..3d869a3b7 100644
--- a/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.etrice.core.etmap.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,8 @@ Require-Bundle: org.eclipse.etrice.core.etmap;bundle-version="1.1.0",
  org.eclipse.etrice.core.etmap.ui;bundle-version="1.1.0",
  org.eclipse.core.runtime,
  org.eclipse.xtext.junit4;bundle-version="2.6.0",
- org.eclipse.ui.workbench;resolution:=optional
+ org.eclipse.ui.workbench;resolution:=optional,
+ org.eclipse.xtext.xbase.lib
 Import-Package: org.apache.log4j,
  org.junit;version="4.5.0",
  org.junit.runner;version="4.5.0",
diff --git a/tests/org.eclipse.etrice.core.etmap.tests/src-gen/org/eclipse/etrice/core/etmap/ETMapInjectorProvider.java b/tests/org.eclipse.etrice.core.etmap.tests/src-gen/org/eclipse/etrice/core/etmap/ETMapInjectorProvider.java
index 516bdc63f..fbb5ab050 100644
--- a/tests/org.eclipse.etrice.core.etmap.tests/src-gen/org/eclipse/etrice/core/etmap/ETMapInjectorProvider.java
+++ b/tests/org.eclipse.etrice.core.etmap.tests/src-gen/org/eclipse/etrice/core/etmap/ETMapInjectorProvider.java
@@ -1,18 +1,18 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etmap;
 
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 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 ETMapInjectorProvider implements IInjectorProvider, IRegistryConfigurator {
-	
-    protected GlobalStateMemento stateBeforeInjectorCreation;
+
+	protected GlobalStateMemento stateBeforeInjectorCreation;
 	protected GlobalStateMemento stateAfterInjectorCreation;
 	protected Injector injector;
 
@@ -20,6 +20,7 @@ public class ETMapInjectorProvider implements IInjectorProvider, IRegistryConfig
 		GlobalRegistries.initializeDefaults();
 	}
 
+	@Override
 	public Injector getInjector()
 	{
 		if (injector == null) {
@@ -29,15 +30,34 @@ public class ETMapInjectorProvider implements IInjectorProvider, IRegistryConfig
 		}
 		return injector;
 	}
-	
+
 	protected Injector internalCreateInjector() {
-	    return new ETMapStandaloneSetup().createInjectorAndDoEMFRegistration();
+		return new ETMapStandaloneSetup() {
+			@Override
+			public Injector createInjector() {
+				return Guice.createInjector(createRuntimeModule());
+			}
+		}.createInjectorAndDoEMFRegistration();
+	}
+
+	protected ETMapRuntimeModule createRuntimeModule() {
+		// make it work also with Maven/Tycho and OSGI
+		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=493672
+		return new ETMapRuntimeModule() {
+			@Override
+			public ClassLoader bindClassLoaderToInstance() {
+				return ETMapInjectorProvider.class
+						.getClassLoader();
+			}
+		};
 	}
 
+	@Override
 	public void restoreRegistry() {
 		stateBeforeInjectorCreation.restoreGlobalState();
 	}
 
+	@Override
 	public void setupRegistry() {
 		getInjector();
 		stateAfterInjectorCreation.restoreGlobalState();
diff --git a/tests/org.eclipse.etrice.core.etmap.tests/src-gen/org/eclipse/etrice/core/etmap/ETMapUiInjectorProvider.java b/tests/org.eclipse.etrice.core.etmap.tests/src-gen/org/eclipse/etrice/core/etmap/ETMapUiInjectorProvider.java
index 3eaa945c1..721354160 100644
--- a/tests/org.eclipse.etrice.core.etmap.tests/src-gen/org/eclipse/etrice/core/etmap/ETMapUiInjectorProvider.java
+++ b/tests/org.eclipse.etrice.core.etmap.tests/src-gen/org/eclipse/etrice/core/etmap/ETMapUiInjectorProvider.java
@@ -1,6 +1,6 @@
 /*
-* generated by Xtext
-*/
+ * generated by Xtext
+ */
 package org.eclipse.etrice.core.etmap;
 
 import org.eclipse.xtext.junit4.IInjectorProvider;
@@ -8,9 +8,10 @@ import org.eclipse.xtext.junit4.IInjectorProvider;
 import com.google.inject.Injector;
 
 public class ETMapUiInjectorProvider implements IInjectorProvider {
-	
+
+	@Override
 	public Injector getInjector() {
 		return org.eclipse.etrice.core.etmap.ui.internal.ETMapActivator.getInstance().getInjector("org.eclipse.etrice.core.etmap.ETMap");
 	}
-	
+
 }