diff options
author | Thomas Schuetz | 2012-10-29 16:14:02 +0000 |
---|---|---|
committer | Thomas Schuetz | 2012-10-29 16:14:02 +0000 |
commit | a3fc9f7ab62dffb1a1df18145745018924323029 (patch) | |
tree | d504bf56f52a8e58365cc8d94591fd38f490248a /tests/org.eclipse.etrice.core.config.tests | |
parent | 3695212f9ea0b7f7d90932e2c57b2705c8852643 (diff) | |
download | org.eclipse.etrice-a3fc9f7ab62dffb1a1df18145745018924323029.tar.gz org.eclipse.etrice-a3fc9f7ab62dffb1a1df18145745018924323029.tar.xz org.eclipse.etrice-a3fc9f7ab62dffb1a1df18145745018924323029.zip |
[generator.c] changed initialization of external types / checked in
other line endings to get rid of diffs
Diffstat (limited to 'tests/org.eclipse.etrice.core.config.tests')
4 files changed, 92 insertions, 92 deletions
diff --git a/tests/org.eclipse.etrice.core.config.tests/.project b/tests/org.eclipse.etrice.core.config.tests/.project index 63e34047b..222434a1c 100644 --- a/tests/org.eclipse.etrice.core.config.tests/.project +++ b/tests/org.eclipse.etrice.core.config.tests/.project @@ -1,28 +1,28 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.etrice.core.config.tests</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.pde.PluginNature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.etrice.core.config.tests</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
diff --git a/tests/org.eclipse.etrice.core.config.tests/build.properties b/tests/org.eclipse.etrice.core.config.tests/build.properties index 82a84700f..6ff55e9c6 100644 --- a/tests/org.eclipse.etrice.core.config.tests/build.properties +++ b/tests/org.eclipse.etrice.core.config.tests/build.properties @@ -1,3 +1,3 @@ -source.. = src-gen/ -bin.includes = META-INF/,\ - . +source.. = src-gen/
+bin.includes = META-INF/,\
+ .
diff --git a/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigInjectorProvider.java b/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigInjectorProvider.java index 81ed8313a..87a596f46 100644 --- a/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigInjectorProvider.java +++ b/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigInjectorProvider.java @@ -1,45 +1,45 @@ -/* -* generated by Xtext -*/ -package org.eclipse.etrice.core; - -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 ConfigInjectorProvider 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 ConfigStandaloneSetup().createInjectorAndDoEMFRegistration(); - } - - public void restoreRegistry() { - stateBeforeInjectorCreation.restoreGlobalState(); - } - - public void setupRegistry() { - getInjector(); - stateAfterInjectorCreation.restoreGlobalState(); - } -} +/*
+* generated by Xtext
+*/
+package org.eclipse.etrice.core;
+
+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 ConfigInjectorProvider 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 ConfigStandaloneSetup().createInjectorAndDoEMFRegistration();
+ }
+
+ public void restoreRegistry() {
+ stateBeforeInjectorCreation.restoreGlobalState();
+ }
+
+ public void setupRegistry() {
+ getInjector();
+ stateAfterInjectorCreation.restoreGlobalState();
+ }
+}
diff --git a/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigUiInjectorProvider.java b/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigUiInjectorProvider.java index 34b7a4cd5..a978aa3a2 100644 --- a/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigUiInjectorProvider.java +++ b/tests/org.eclipse.etrice.core.config.tests/src-gen/org/eclipse/etrice/core/ConfigUiInjectorProvider.java @@ -1,16 +1,16 @@ -/* -* generated by Xtext -*/ -package org.eclipse.etrice.core; - -import org.eclipse.xtext.junit4.IInjectorProvider; - -import com.google.inject.Injector; - -public class ConfigUiInjectorProvider implements IInjectorProvider { - - public Injector getInjector() { - return org.eclipse.etrice.core.ui.internal.ConfigActivator.getInstance().getInjector("org.eclipse.etrice.core.Config"); - } - -} +/*
+* generated by Xtext
+*/
+package org.eclipse.etrice.core;
+
+import org.eclipse.xtext.junit4.IInjectorProvider;
+
+import com.google.inject.Injector;
+
+public class ConfigUiInjectorProvider implements IInjectorProvider {
+
+ public Injector getInjector() {
+ return org.eclipse.etrice.core.ui.internal.ConfigActivator.getInstance().getInjector("org.eclipse.etrice.core.Config");
+ }
+
+}
|