#366 : adapt current master to

BasePackage.Literals.DOMAIN_ELEMENT_DOMAIN_ID

plugins/org.yakindu.sct.domain.generic/src/org/yakindu/sct/domain/generic/extension/GenericDomainInjectorProvider.java

@@ -89,12 +89,6 @@ public class GenericDomainInjectorProvider implements IDomainInjectorProvider {
 		return new GenericGeneratorModule();
 	}
 
-	public Module getGeneratorModule(String generatorId) {
-		// currently there is only one module with shared bindings for all code
-		// generators
-		return new GenericGeneratorModule();
-	}
-
 	protected Module getResourceModule() {
 		Module uiModule = Modules.override(getLanguageRuntimeModule()).with(getLanguageUIModule());
 		Module result = Modules.override(uiModule).with(getSharedStateModule());

plugins/org.yakindu.sct.domain.generic/src/org/yakindu/sct/domain/generic/modules/GenericTypeSystemModule.java

@@ -1,53 +1,53 @@
-/**
- * Copyright (c) 2011 committers of YAKINDU and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     committers of YAKINDU - initial API and implementation
- */
-package org.yakindu.sct.domain.generic.modules;
-
-import org.eclipse.xtext.service.AbstractGenericModule;
-import org.yakindu.base.types.inferrer.ITypeSystemInferrer;
-import org.yakindu.base.types.typesystem.GenericTypeSystem;
-import org.yakindu.base.types.typesystem.ITypeSystem;
-import org.yakindu.sct.model.sgraph.SGraphPackage;
-import org.yakindu.sct.model.stext.inferrer.STextTypeInferrer;
-
-import com.google.inject.Binder;
-import com.google.inject.name.Names;
-
-/**
- * 
- * Default Module used for type contribution and type inference. Override
- * bindings to specify custom behavior.
- * 
- * @author andreas muelder - Initial contribution and API
- * 
- */
-public class GenericTypeSystemModule extends AbstractGenericModule {
-
-	public static final String DOMAIN_ID = "domainId";
-
-	@Override
-	public void configure(Binder binder) {
-		super.configure(binder);
-		binder.bind(String.class).annotatedWith(Names.named(DOMAIN_ID)).toInstance(getDomainID());
-	}
-
-	protected String getDomainID() {
-		return SGraphPackage.Literals.STATECHART__DOMAIN_ID.getDefaultValueLiteral();
-	}
-
-	public Class<? extends ITypeSystem> bindITypeSystem() {
-		return GenericTypeSystem.class;
-	}
-
-	public Class<? extends ITypeSystemInferrer> bindITypeSystemInferrer() {
-		return STextTypeInferrer.class;
-	}
-
-}
+/**
+ * Copyright (c) 2011 committers of YAKINDU and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     committers of YAKINDU - initial API and implementation
+ */
+package org.yakindu.sct.domain.generic.modules;
+
+import org.eclipse.xtext.service.AbstractGenericModule;
+import org.yakindu.base.base.BasePackage;
+import org.yakindu.base.types.inferrer.ITypeSystemInferrer;
+import org.yakindu.base.types.typesystem.GenericTypeSystem;
+import org.yakindu.base.types.typesystem.ITypeSystem;
+import org.yakindu.sct.model.stext.inferrer.STextTypeInferrer;
+
+import com.google.inject.Binder;
+import com.google.inject.name.Names;
+
+/**
+ * 
+ * Default Module used for type contribution and type inference. Override
+ * bindings to specify custom behavior.
+ * 
+ * @author andreas muelder - Initial contribution and API
+ * 
+ */
+public class GenericTypeSystemModule extends AbstractGenericModule {
+
+	public static final String DOMAIN_ID = "domainId";
+
+	@Override
+	public void configure(Binder binder) {
+		super.configure(binder);
+		binder.bind(String.class).annotatedWith(Names.named(DOMAIN_ID)).toInstance(getDomainID());
+	}
+
+	protected String getDomainID() {
+		return BasePackage.Literals.DOMAIN_ELEMENT__DOMAIN_ID.getDefaultValueLiteral();
+	}
+
+	public Class<? extends ITypeSystem> bindITypeSystem() {
+		return GenericTypeSystem.class;
+	}
+
+	public Class<? extends ITypeSystemInferrer> bindITypeSystemInferrer() {
+		return STextTypeInferrer.class;
+	}
+
+}