Merge pull request #269 from rubenporras/master

Allow parallel setup of languages in the standalone setup

Author: rubenporras

com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/builder/StandaloneBuilderIntegrationFragment.xpt

@@ -42,7 +42,7 @@ public class 
   );
 
   public Injector doSetup(Module overrideModule, Module... additionalModules) {
-    return new �name.toSimpleName()�StandaloneBuildSetupGenerated(overrideModule, additionalModules).createInjectorAndDoEMFRegistration();
+    return new �name.toSimpleName()�StandaloneBuildSetupGenerated(SETUP_LOCK, overrideModule, additionalModules).createInjectorAndDoEMFRegistration();
   }
 
   @Override
@@ -78,8 +78,16 @@ public class 
 
   private final Module overrideModule;
   private final Module[] additionalModules;
+  private final Object lock;
+
+  public �name.toSimpleName()�StandaloneBuildSetupGenerated(final Object lock, final Module overrideModule, Module... additionalModules) {
+    this.lock = lock;
+    this.overrideModule = overrideModule;
+    this.additionalModules = additionalModules;
+  }
 
   public �name.toSimpleName()�StandaloneBuildSetupGenerated(final Module overrideModule, Module... additionalModules) {
+    this.lock = null;
     this.overrideModule = overrideModule;
     this.additionalModules = additionalModules;
   }
@@ -88,7 +96,13 @@ public class 
   public Injector createInjectorAndDoEMFRegistration() {
     registerEPackages();
     Injector injector = createInjector();
-    register(injector);
+    if (lock != null) {
+      synchronized (lock) {
+        register(injector);
+      }
+    } else {
+      register(injector);
+    }
     return injector;
   }
 

com.avaloq.tools.ddk.xtext.generator/src/com/avaloq/tools/ddk/xtext/generator/builder/StandaloneBuilderIntegrationFragment2.xtend

@@ -80,7 +80,7 @@ class StandaloneBuilderIntegrationFragment2 extends AbstractXtextGeneratorFragme
         );
 
         public Injector doSetup(Module overrideModule, Module... additionalModules) {
-          return new «grammar.simpleName»StandaloneBuildSetupGenerated(overrideModule, additionalModules).createInjectorAndDoEMFRegistration();
+          return new «grammar.simpleName»StandaloneBuildSetupGenerated(SETUP_LOCK, overrideModule, additionalModules).createInjectorAndDoEMFRegistration();
         }
 
         @Override
@@ -114,8 +114,16 @@ class StandaloneBuilderIntegrationFragment2 extends AbstractXtextGeneratorFragme
 
         private final Module overrideModule;
         private final Module[] additionalModules;
+        private final Object lock;
+
+        public «standaloneBuildSetupGeneratedClass.simpleName»(final Object lock, final Module overrideModule, Module... additionalModules) {
+          this.lock = lock;
+          this.overrideModule = overrideModule;
+          this.additionalModules = additionalModules;
+        }
 
         public «standaloneBuildSetupGeneratedClass.simpleName»(final Module overrideModule, Module... additionalModules) {
+          this.lock = null;
           this.overrideModule = overrideModule;
           this.additionalModules = additionalModules;
         }
@@ -124,7 +132,13 @@ class StandaloneBuilderIntegrationFragment2 extends AbstractXtextGeneratorFragme
         public Injector createInjectorAndDoEMFRegistration() {
           registerEPackages();
           Injector injector = createInjector();
-          register(injector);
+          if (lock != null) {
+            synchronized (lock)  {
+              register(injector);
+            }
+          } else {
+            register(injector);
+          }
           return injector;
         }
 

com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/build/AbstractDynamicSetupService.java

@@ -12,34 +12,13 @@
 
 import java.util.List;
 
-import com.google.inject.Injector;
-import com.google.inject.Module;
-
 
 /**
  * Support for comparing dynamic setup services.
  */
 public abstract class AbstractDynamicSetupService implements IDynamicSetupService {
 
-  /**
-   * This method only exists for backward compatibility for langauges which have not yet been regenerated.
-   *
-   * @param overrideModule
-   *          override module for the runtime module
-   * @return created injector
-   */
-  @Deprecated
-  protected Injector doSetup(final Module overrideModule) {
-    // this method can be removed once all subclasses have been regenerated using DDK 4.0.0
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public Injector doSetup(final Module overrideModule, final Module... additionalModules) {
-    // this implementation can be removed once all subclasses have been regenerated using DDK 4.0.0
-    // until then it is required for backwards compatibility
-    return doSetup(overrideModule);
-  }
+  public static final Object SETUP_LOCK = new Object();
 
   /**
    * {@inheritDoc} Child languages are always > than their parent languages.