Просмотр исходного кода

trivial : csharp generator gets compilable

Johannes Dicks 9 лет назад
Родитель
Сommit
bb4fa2dd27

+ 11 - 8
plugins/org.yakindu.sct.generator.csharp/src/org/yakindu/sct/generator/csharp/CSharpCodeGenerator.java

@@ -9,8 +9,6 @@
  */
 package org.yakindu.sct.generator.csharp;
 
-import static org.yakindu.sct.generator.core.util.GeneratorUtils.isDumpSexec;
-
 import org.yakindu.sct.generator.csharp.CSharpNamingService;
 import org.yakindu.sct.generator.csharp.CSharpGenerator;
 import org.yakindu.sct.generator.core.impl.GenericJavaBasedGenerator;
@@ -22,25 +20,29 @@ import org.yakindu.sct.model.sgen.GeneratorEntry;
 import org.yakindu.sct.model.sgraph.Statechart;
 
 import com.google.inject.Binder;
+import com.google.inject.Inject;
 import com.google.inject.Module;
 import com.google.inject.util.Modules;
 
 public class CSharpCodeGenerator extends GenericJavaBasedGenerator {
 
+	@Inject
+	CSharpGenerator delegate;
+	
+	
 	@Override
 	public void runGenerator(Statechart statechart, GeneratorEntry entry) {
-		CSharpGenerator delegate = getInjector(entry).getInstance(
-				CSharpGenerator.class);
 		ExecutionFlow flow = createExecutionFlow(statechart, entry);
-		if (isDumpSexec(entry)) {
+		if (debugFeatureHelper.isDumpSexec(entry)) {
 			dumpSexec(entry, flow);
 		}
-		delegate.generate(flow, entry, getFileSystemAccess(entry));
+		delegate.generate(flow, entry, sctFsa.getIFileSystemAccess());
 	}
 
+	
 	@Override
-	protected Module getChildInjectorModule(final GeneratorEntry entry) {
-		Module module = super.getChildInjectorModule(entry);
+	public Module getOverridesModule(final GeneratorEntry entry) {
+		Module module = super.getOverridesModule(entry);
 		return Modules.override(module).with(new Module() {
 			public void configure(Binder binder) {
 				binder.bind(ICodegenTypeSystemAccess.class)
@@ -50,4 +52,5 @@ public class CSharpCodeGenerator extends GenericJavaBasedGenerator {
 			}
 		});
 	}
+	
 }

+ 4 - 1
plugins/org.yakindu.sct.generator.csharp/src/org/yakindu/sct/generator/csharp/features/CSharpFeatureValueProvider.java

@@ -21,6 +21,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.ecore.EObject;
 import org.yakindu.sct.generator.core.features.AbstractDefaultFeatureValueProvider;
 import org.yakindu.sct.model.sgen.FeatureParameterValue;
+import org.yakindu.sct.model.sgen.FeatureType;
 import org.yakindu.sct.model.sgen.FeatureTypeLibrary;
 
 /**
@@ -35,8 +36,9 @@ public class CSharpFeatureValueProvider extends
 	private static final String PACKAGE_NAME_REGEX = "([a-zA-Z_][a-zA-Z0-9_]*\\.)+[a-zA-Z_][a-zA-Z0-9_]*";
 	private static final String SUFFIX_REGEX = "[a-zA-Z0-9_]*";
 
+	
 	@Override
-	protected void setDefaultValue(FeatureParameterValue parameterValue,
+	protected void setDefaultValue(FeatureType featureType, FeatureParameterValue parameterValue,
 			EObject contextElement) {
 		if (parameterValue.getParameter().getName().equals(NAMESPACE_NAME)) {
 			parameterValue.setValue("Yakindu.SCT");
@@ -48,6 +50,7 @@ public class CSharpFeatureValueProvider extends
 		} else if (parameterValue.getParameter().getName().equals(NAME_SUFFIX)) {
 			parameterValue.setValue("");
 		}
+		
 	}
 
 	public boolean isProviderFor(FeatureTypeLibrary library) {