[generator.config] bug fix: run standalone setup only if not in Eclipse

2 files changed, 9 insertions, 2 deletions

diff --git a/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend b/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend
index c23faec13..3530e3e02 100644
--- a/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend
+++ b/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend
@@ -36,6 +36,7 @@ import org.eclipse.etrice.generator.base.IDataConfiguration
 import org.eclipse.etrice.generator.base.IResourceURIAcceptor

 import org.eclipse.etrice.generator.config.util.DataConfigurationHelper

 import org.eclipse.xtext.scoping.impl.ImportUriResolver

+import org.eclipse.emf.common.EMFPlugin

 

 class DataConfiguration implements IDataConfiguration {

 	

@@ -46,7 +47,9 @@ class DataConfiguration implements IDataConfiguration {
 	protected ImportUriResolver uriResolver;

 

 	override doSetup() {

-		ConfigStandaloneSetup::doSetup()

+		if (!EMFPlugin::IS_ECLIPSE_RUNNING)

+			ConfigStandaloneSetup::doSetup()

+			

 	}

 	

 	override setResources(ResourceSet resource, ILogger logger) {

diff --git a/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java b/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java
index 07e9fa9c0..f81989c15 100644
--- a/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java
+++ b/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java
@@ -14,6 +14,7 @@ import com.google.common.base.Objects;
 import com.google.inject.Inject;

 import java.util.ArrayList;

 import java.util.List;

+import org.eclipse.emf.common.EMFPlugin;

 import org.eclipse.emf.common.util.EList;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.resource.ResourceSet;

@@ -55,7 +56,10 @@ public class DataConfiguration implements IDataConfiguration {
   protected ImportUriResolver uriResolver;

   

   public void doSetup() {

-    ConfigStandaloneSetup.doSetup();

+    boolean _not = (!EMFPlugin.IS_ECLIPSE_RUNNING);

+    if (_not) {

+      ConfigStandaloneSetup.doSetup();

+    }

   }

   

   public boolean setResources(final ResourceSet resource, final ILogger logger) {