#899 removed outlet parameters from IExecutionFlowGenerator interface,

moved them to api package
itemisCREATE · Aug 12, 2016 · f732547 · f732547
1 parent 20a32cd
commit f732547
Show file tree

Hide file tree

Showing 14 changed files with 98 additions and 76 deletions.
diff --git a/plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/CGenerator.xtend b/plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/CGenerator.xtend
@@ -13,11 +13,12 @@ package org.yakindu.sct.generator.c
 import com.google.inject.Inject
 import com.google.inject.name.Named
 import org.eclipse.xtext.generator.IFileSystemAccess
-import org.yakindu.sct.generator.core.impl.IExecutionFlowGenerator
-import org.yakindu.sct.model.sexec.ExecutionFlow
-import org.yakindu.sct.model.sgen.GeneratorEntry
 import org.yakindu.sct.generator.c.GenArtifactConfigurations.GenArtifactConfiguration
+import org.yakindu.sct.generator.core.IExecutionFlowGenerator
 import org.yakindu.sct.generator.core.library.ICoreLibraryHelper
+import org.yakindu.sct.model.sexec.ExecutionFlow
+import org.yakindu.sct.model.sgen.GeneratorEntry
+import static org.yakindu.sct.generator.core.filesystem.ISCTFileSystemAccess.*;
 
 /**
  * This is the C code generators main class. 
@@ -68,22 +69,22 @@ class CGenerator implements IExecutionFlowGenerator {
 
 	def protected getHeaderOutput(GeneratorEntry entry) {
 		if (entry.apiTargetFolderValue != null) {
-			IExecutionFlowGenerator.API_TARGET_FOLDER_OUTPUT
+			API_TARGET_FOLDER_OUTPUT
 		} else {
-			IExecutionFlowGenerator.TARGET_FOLDER_OUTPUT
+			TARGET_FOLDER_OUTPUT
 		}
 	}
 
 	def protected getLibraryOutput(GeneratorEntry entry) {
 		if (entry.libraryTargetFolderValue != null) {
-			IExecutionFlowGenerator.LIBRARY_TARGET_FOLDER_OUTPUT
+			LIBRARY_TARGET_FOLDER_OUTPUT
 		} else {
 			entry.headerOutput
 		}
 	}
 
 	def protected getSourceOutput(GeneratorEntry entry) {
-		IExecutionFlowGenerator.TARGET_FOLDER_OUTPUT
+		TARGET_FOLDER_OUTPUT
 	}
 
 }
diff --git a/...or/core/impl/IExecutionFlowGenerator.java → ...nerator/core/IExecutionFlowGenerator.java b/...or/core/impl/IExecutionFlowGenerator.java → ...nerator/core/IExecutionFlowGenerator.java
@@ -8,18 +8,21 @@
  * committers of YAKINDU - initial API and implementation
  *
 */
-package org.yakindu.sct.generator.core.impl;
+package org.yakindu.sct.generator.core;
 
 import org.eclipse.xtext.generator.IFileSystemAccess;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
 import org.yakindu.sct.model.sgen.GeneratorEntry;
 
+/**
+ * Basic interface for all CodeGenerators that are built on top of the
+ * {@link ExecutionFlow}
+ * 
+ * @author andreas muelder - Initial contribution and API
+ * 
+ */
 public interface IExecutionFlowGenerator {
 
-	String TARGET_FOLDER_OUTPUT = IFileSystemAccess.DEFAULT_OUTPUT;
-	String LIBRARY_TARGET_FOLDER_OUTPUT = "LIBRARY_TARGET_FOLDER";
-	String API_TARGET_FOLDER_OUTPUT = "API_TARGET_FOLDER";
-
 	/**
 	 * 
 	 * @param flow

diff --git a/...generator/core/impl/ISGraphGenerator.java → .../sct/generator/core/ISGraphGenerator.java b/...generator/core/impl/ISGraphGenerator.java → .../sct/generator/core/ISGraphGenerator.java
@@ -8,11 +8,21 @@
  * committers of YAKINDU - initial API and implementation
  *
 */
-package org.yakindu.sct.generator.core.impl;
+package org.yakindu.sct.generator.core;
 
+import org.eclipse.xtext.generator.IFileSystemAccess;
 import org.yakindu.sct.model.sgen.GeneratorEntry;
 import org.yakindu.sct.model.sgraph.Statechart;
 
+/**
+ * Basic interface for all CodeGenerators that are build for {@link Statechart}s
+ * 
+ * @author andreas muelder - Initial contribution and API
+ * 
+ */
+
 public interface ISGraphGenerator {
-	abstract void generate(Statechart statechart, GeneratorEntry entry);
+
+	void generate(Statechart statechart, GeneratorEntry entry, IFileSystemAccess fsa);
+
 }
diff --git a/...ct.generator.core/src/org/yakindu/sct/generator/core/filesystem/ISCTFileSystemAccess.java b/...ct.generator.core/src/org/yakindu/sct/generator/core/filesystem/ISCTFileSystemAccess.java
@@ -30,7 +30,12 @@
  *
  */
 public interface ISCTFileSystemAccess {
-
+
+	String TARGET_FOLDER_OUTPUT = IFileSystemAccess.DEFAULT_OUTPUT;
+	String LIBRARY_TARGET_FOLDER_OUTPUT = "LIBRARY_TARGET_FOLDER";
+	String API_TARGET_FOLDER_OUTPUT = "API_TARGET_FOLDER";
+
+
 	/**
 	 * Provides an absolute URI for further processing.
 	 * 

diff --git a/...t.generator.core/src/org/yakindu/sct/generator/core/impl/AbstractSExecModelGenerator.java b/...t.generator.core/src/org/yakindu/sct/generator/core/impl/AbstractSExecModelGenerator.java
@@ -30,6 +30,7 @@
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
+import org.yakindu.sct.generator.core.IExecutionFlowGenerator;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
 import org.yakindu.sct.model.sexec.transformation.FlowOptimizer;
 import org.yakindu.sct.model.sexec.transformation.IModelSequencer;

diff --git a/....generator.core/src/org/yakindu/sct/generator/core/impl/AbstractSGraphModelGenerator.java b/....generator.core/src/org/yakindu/sct/generator/core/impl/AbstractSGraphModelGenerator.java
@@ -11,12 +11,15 @@
  */
 package org.yakindu.sct.generator.core.impl;
 
+import static org.yakindu.sct.generator.core.filesystem.ISCTFileSystemAccess.API_TARGET_FOLDER_OUTPUT;
+import static org.yakindu.sct.generator.core.filesystem.ISCTFileSystemAccess.LIBRARY_TARGET_FOLDER_OUTPUT;
 import static org.yakindu.sct.generator.core.library.ICoreLibraryConstants.OUTLET_FEATURE_TARGET_PROJECT;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.xtext.generator.IFileSystemAccess;
 import org.eclipse.xtext.generator.OutputConfiguration;
 import org.yakindu.sct.generator.core.ISCTGenerator;
+import org.yakindu.sct.generator.core.ISGraphGenerator;
 import org.yakindu.sct.generator.core.filesystem.ISCTFileSystemAccess;
 import org.yakindu.sct.generator.core.library.ICoreLibraryHelper;
 import org.yakindu.sct.model.sexec.ExecutionFlow;
@@ -33,7 +36,7 @@
  * abstract base class for all code generators that want to generate code based
  * on the {@link ExecutionFlow}
  * 
- * @author Andreas Mülder - Initial contribution and API
+ * @author Andreas Mülder - Initial contribution and API
  * @author Johannes Dicks - decouple EFS
  * 
  */
@@ -49,7 +52,7 @@ public abstract class AbstractSGraphModelGenerator implements ISCTGenerator {
 	protected void runGenerator(Statechart statechart, GeneratorEntry entry) {
 		if (this instanceof ISGraphGenerator) {
 			ISGraphGenerator graphGenerator = (ISGraphGenerator) this;
-			graphGenerator.generate(statechart, entry);
+			graphGenerator.generate(statechart, entry, sctFsa.getIFileSystemAccess());
 		}
 	}
 
@@ -193,12 +196,12 @@ protected void initFileSystemAccess(GeneratorEntry entry) {
 	protected void initLibraryTargetFolder(GeneratorEntry entry) {
 		FeatureParameterValue libraryTargetFolderValue = coreFeatureHelper.getLibraryTargetFolderValue(entry);
 		if (libraryTargetFolderValue != null) {
-			sctFsa.setOutputPath(IExecutionFlowGenerator.LIBRARY_TARGET_FOLDER_OUTPUT,
+			sctFsa.setOutputPath(LIBRARY_TARGET_FOLDER_OUTPUT,
 					libraryTargetFolderValue.getStringValue());
 		}
 
 		OutputConfiguration librarytargetFolderOutputConfiguration = sctFsa.getOutputConfigurations()
-				.get(IExecutionFlowGenerator.LIBRARY_TARGET_FOLDER_OUTPUT);
+				.get(LIBRARY_TARGET_FOLDER_OUTPUT);
 		if (librarytargetFolderOutputConfiguration != null) {
 			librarytargetFolderOutputConfiguration.setCreateOutputDirectory(true);
 			// do not overwrite existing resources and ensure the folder is not
@@ -211,11 +214,11 @@ protected void initLibraryTargetFolder(GeneratorEntry entry) {
 	protected void initApiTargetFolder(GeneratorEntry entry) {
 		FeatureParameterValue apiTargetFolderValue = coreFeatureHelper.getApiTargetFolderValue(entry);
 		if (apiTargetFolderValue != null) {
-			sctFsa.setOutputPath(IExecutionFlowGenerator.API_TARGET_FOLDER_OUTPUT,
+			sctFsa.setOutputPath(API_TARGET_FOLDER_OUTPUT,
 					apiTargetFolderValue.getStringValue());
 		}
 		OutputConfiguration apiTargetFolderOutputConfiguration = sctFsa.getOutputConfigurations()
-				.get(IExecutionFlowGenerator.API_TARGET_FOLDER_OUTPUT);
+				.get(API_TARGET_FOLDER_OUTPUT);
 		if (apiTargetFolderOutputConfiguration != null) {
 			apiTargetFolderOutputConfiguration.setCreateOutputDirectory(true);
 		}

diff --git a/plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/CppGenerator.xtend b/plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/CppGenerator.xtend
@@ -15,10 +15,11 @@ import com.google.inject.name.Named
 import org.eclipse.xtext.generator.IFileSystemAccess
 import org.yakindu.sct.generator.c.GenArtifactConfigurations.GenArtifactConfiguration
 import org.yakindu.sct.generator.c.IGenArtifactConfigurations
-import org.yakindu.sct.generator.core.impl.IExecutionFlowGenerator
+import org.yakindu.sct.generator.core.IExecutionFlowGenerator
+import org.yakindu.sct.generator.core.library.ICoreLibraryHelper
 import org.yakindu.sct.model.sexec.ExecutionFlow
 import org.yakindu.sct.model.sgen.GeneratorEntry
-import org.yakindu.sct.generator.core.library.ICoreLibraryHelper
+import static org.yakindu.sct.generator.core.filesystem.ISCTFileSystemAccess.*;
 
 /**
  * This is the CPP code generators main class. 
@@ -74,22 +75,22 @@ class CppGenerator implements IExecutionFlowGenerator {
 
 	def protected getHeaderOutput(GeneratorEntry entry) {
 		if (entry.apiTargetFolderValue != null) {
-			IExecutionFlowGenerator.API_TARGET_FOLDER_OUTPUT
+			API_TARGET_FOLDER_OUTPUT
 		} else {
-			IExecutionFlowGenerator.TARGET_FOLDER_OUTPUT
+			TARGET_FOLDER_OUTPUT
 		}
 	}
 
 	def protected getLibraryOutput(GeneratorEntry entry) {
 		if (entry.libraryTargetFolderValue != null) {
-			IExecutionFlowGenerator.LIBRARY_TARGET_FOLDER_OUTPUT
+			LIBRARY_TARGET_FOLDER_OUTPUT
 		} else {
 			entry.headerOutput
 		}
 	}
 
 	def protected getSourceOutput(GeneratorEntry entry) {
-		IExecutionFlowGenerator.TARGET_FOLDER_OUTPUT
+		TARGET_FOLDER_OUTPUT
 	}
 
 }
diff --git a/...g.yakindu.sct.generator.csharp/src/org/yakindu/sct/generator/csharp/CSharpGenerator.xtend b/...g.yakindu.sct.generator.csharp/src/org/yakindu/sct/generator/csharp/CSharpGenerator.xtend
@@ -11,7 +11,7 @@ package org.yakindu.sct.generator.csharp
 
 import com.google.inject.Inject
 import org.eclipse.xtext.generator.IFileSystemAccess
-import org.yakindu.sct.generator.core.impl.IExecutionFlowGenerator
+import org.yakindu.sct.generator.core.IExecutionFlowGenerator
 import org.yakindu.sct.model.sexec.ExecutionFlow
 import org.yakindu.sct.model.sgen.GeneratorEntry
 

diff --git a/...ins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/IStatemachine.xtend b/...ins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/IStatemachine.xtend
@@ -11,11 +11,10 @@ package org.yakindu.sct.generator.java
 
 import com.google.inject.Inject
 import org.eclipse.xtext.generator.IFileSystemAccess
-import org.yakindu.sct.generator.core.impl.IExecutionFlowGenerator
+import org.yakindu.sct.generator.core.library.ICoreLibraryHelper
 import org.yakindu.sct.model.sexec.ExecutionFlow
 import org.yakindu.sct.model.sgen.GeneratorEntry
-
-import org.yakindu.sct.generator.core.library.ICoreLibraryHelper
+import static org.yakindu.sct.generator.core.filesystem.ISCTFileSystemAccess.*
 
 class IStatemachine {
 
@@ -31,11 +30,11 @@ class IStatemachine {
 		if (outletFeatureHelper.getLibraryTargetFolderValue(entry) != null) {
 			// generate into library target folder in case one is specified, as the contents are static
 			fsa.generateFile(entry.basePackagePath + '/' + iStatemachine.java,
-				IExecutionFlowGenerator.LIBRARY_TARGET_FOLDER_OUTPUT, content(entry))
+				LIBRARY_TARGET_FOLDER_OUTPUT, content(entry))
 		} else if (outletFeatureHelper.getApiTargetFolderValue(entry) != null) {
 			// generate into API target folder in case one is specified, as it is an interface
 			fsa.generateFile(entry.basePackagePath + '/' + iStatemachine.java,
-				IExecutionFlowGenerator.API_TARGET_FOLDER_OUTPUT, content(entry))
+				API_TARGET_FOLDER_OUTPUT, content(entry))
 		} else {
 			// use default target folder path in case no library or API target folder is specified (the file will be overwritten there)
 			fsa.generateFile(entry.basePackagePath + '/' + iStatemachine.java, content(entry))

diff --git a/plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/ITimer.xtend b/plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/ITimer.xtend
@@ -11,11 +11,11 @@ package org.yakindu.sct.generator.java
 
 import com.google.inject.Inject
 import org.eclipse.xtext.generator.IFileSystemAccess
-import org.yakindu.sct.generator.core.impl.IExecutionFlowGenerator
-
-import org.yakindu.sct.model.sgen.GeneratorEntry
-import org.yakindu.sct.model.sexec.ExecutionFlow
 import org.yakindu.sct.generator.core.library.ICoreLibraryHelper
+import org.yakindu.sct.model.sexec.ExecutionFlow
+import org.yakindu.sct.model.sgen.GeneratorEntry
+
+import static org.yakindu.sct.generator.core.filesystem.ISCTFileSystemAccess.*
 
 class ITimer {
 
@@ -31,11 +31,11 @@ class ITimer {
 		if (outletFeatureHelper.getLibraryTargetFolderValue(entry) != null) {
 			// generate into library target folder in case one is specified, as the contents are static
 			fsa.generateFile(entry.basePackagePath + '/' + iTimer.java,
-				IExecutionFlowGenerator.LIBRARY_TARGET_FOLDER_OUTPUT, content(entry))
+				LIBRARY_TARGET_FOLDER_OUTPUT, content(entry))
 		} else if (outletFeatureHelper.getApiTargetFolderValue(entry) != null) {
 			// generate into API target folder in case one is specified, as it is an interface
 			fsa.generateFile(entry.basePackagePath + '/' + iTimer.java,
-				IExecutionFlowGenerator.API_TARGET_FOLDER_OUTPUT, content(entry))
+				API_TARGET_FOLDER_OUTPUT, content(entry))
 		} else {
 			// use default target folder path in case no library target folder is specified (the file will be overwritten there)
 			fsa.generateFile(entry.basePackagePath + '/' + iTimer.java, content(entry))

diff --git a/...ns/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/ITimerCallback.xtend b/...ns/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/ITimerCallback.xtend
@@ -11,7 +11,7 @@ package org.yakindu.sct.generator.java
 
 import com.google.inject.Inject
 import org.eclipse.xtext.generator.IFileSystemAccess
-import org.yakindu.sct.generator.core.impl.IExecutionFlowGenerator
+import static org.yakindu.sct.generator.core.filesystem.ISCTFileSystemAccess.*;
 import org.yakindu.sct.model.sgen.GeneratorEntry
 import org.yakindu.sct.model.sexec.ExecutionFlow
 import org.yakindu.sct.generator.core.library.ICoreLibraryHelper
@@ -23,18 +23,18 @@ class ITimerCallback {
 
 	@Inject
 	extension GenmodelEntries
-	
+
 	@Inject ICoreLibraryHelper outletFeatureHelper
 
 	def generateITimerCallback(ExecutionFlow flow, GeneratorEntry entry, IFileSystemAccess fsa) {
 		if (outletFeatureHelper.getLibraryTargetFolderValue(entry) != null) {
 			// generate into library target folder in case one is specified, as the contents are static
-			fsa.generateFile(entry.basePackagePath + '/' + iTimerCallback.java,
-				IExecutionFlowGenerator.LIBRARY_TARGET_FOLDER_OUTPUT, content(entry))
+			fsa.generateFile(entry.basePackagePath + '/' + iTimerCallback.java, LIBRARY_TARGET_FOLDER_OUTPUT,
+				content(entry))
 		} else if (outletFeatureHelper.getApiTargetFolderValue(entry) != null) {
 			// generate into API target folder in case one is specified, as it is an interface
-			fsa.generateFile(entry.basePackagePath + '/' + iTimerCallback.java,
-				IExecutionFlowGenerator.API_TARGET_FOLDER_OUTPUT, content(entry))
+			fsa.generateFile(entry.basePackagePath + '/' + iTimerCallback.java, API_TARGET_FOLDER_OUTPUT,
+				content(entry))
 		} else {
 			// use default target folder path in case no library or API target folder is specified (the file will be overwritten there)
 			fsa.generateFile(entry.basePackagePath + '/' + iTimerCallback.java, content(entry))
@@ -61,4 +61,4 @@ class ITimerCallback {
 			}
 		'''
 	}
-}
+}
diff --git a/...ins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/JavaGenerator.xtend b/...ins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/JavaGenerator.xtend
@@ -11,12 +11,12 @@ package org.yakindu.sct.generator.java
 
 import com.google.inject.Inject
 import org.eclipse.xtext.generator.IFileSystemAccess
-import org.yakindu.sct.generator.core.impl.IExecutionFlowGenerator
-import org.yakindu.sct.model.sexec.ExecutionFlow
-import org.yakindu.sct.model.sgen.GeneratorEntry
-import org.yakindu.sct.generator.java.features.EventBasedRunnableFeature
+import org.yakindu.sct.generator.core.IExecutionFlowGenerator
 import org.yakindu.sct.generator.java.features.CycleBasedWrapperFeature
+import org.yakindu.sct.generator.java.features.EventBasedRunnableFeature
+import org.yakindu.sct.model.sexec.ExecutionFlow
 import org.yakindu.sct.model.sexec.naming.INamingService
+import org.yakindu.sct.model.sgen.GeneratorEntry
 
 /**
  * This is the Java code generators main class.