Selaa lähdekoodia

Rename GeneratorModule to IGeneratorModule to avoid name clash (#1213)

Andreas Mülder 8 vuotta sitten
vanhempi
commit
1edb7da16e

+ 2 - 2
plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/CCodeGeneratorModule.java

@@ -18,7 +18,7 @@ import static org.yakindu.sct.generator.c.features.ICFeatureConstants.PARAMETER_
 import static org.yakindu.sct.model.sexec.transformation.IModelSequencer.ADD_TRACES;
 
 import org.yakindu.sct.generator.c.types.CTypeSystemAccess;
-import org.yakindu.sct.generator.core.GeneratorModule;
+import org.yakindu.sct.generator.core.IGeneratorModule;
 import org.yakindu.sct.generator.core.IExecutionFlowGenerator;
 import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess;
 import org.yakindu.sct.model.sexec.naming.INamingService;
@@ -32,7 +32,7 @@ import com.google.inject.name.Names;
  * @author andreas muelder - Initial contribution and API
  * 
  */
-public class CCodeGeneratorModule implements GeneratorModule {
+public class CCodeGeneratorModule implements IGeneratorModule {
 
 	@Override
 	public void configure(GeneratorEntry entry, Binder binder) {

+ 1 - 1
plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/GeneratorModule.java

@@ -20,7 +20,7 @@ import com.google.inject.Binder;
  * @author andreas muelder - Initial contribution and API
  * 
  */
-public interface GeneratorModule {
+public interface IGeneratorModule {
 
 	public abstract void configure(GeneratorEntry entry, Binder binder);
 

+ 4 - 4
plugins/org.yakindu.sct.generator.core/src/org/yakindu/sct/generator/core/extensions/GeneratorExtensions.java

@@ -19,7 +19,7 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;
 import org.osgi.framework.Bundle;
-import org.yakindu.sct.generator.core.GeneratorModule;
+import org.yakindu.sct.generator.core.IGeneratorModule;
 import org.yakindu.sct.generator.core.execution.IGeneratorEntryExecutor;
 import org.yakindu.sct.model.sgen.GeneratorEntry;
 
@@ -71,7 +71,7 @@ public class GeneratorExtensions {
 		@Override
 		public Module getBindings(GeneratorEntry entry) {
 			try {
-				GeneratorModule module = (GeneratorModule) configElement.createExecutableExtension(ATTRIBUTE_BINDINGS);
+				IGeneratorModule module = (IGeneratorModule) configElement.createExecutableExtension(ATTRIBUTE_BINDINGS);
 				return new GeneratorModuleAdapter(module, entry);
 			} catch (CoreException e) {
 				e.printStackTrace();
@@ -172,9 +172,9 @@ public class GeneratorExtensions {
 	public static class GeneratorModuleAdapter implements Module {
 
 		private GeneratorEntry entry;
-		private GeneratorModule module;
+		private IGeneratorModule module;
 
-		public GeneratorModuleAdapter(GeneratorModule module, GeneratorEntry entry) {
+		public GeneratorModuleAdapter(IGeneratorModule module, GeneratorEntry entry) {
 			this.module = module;
 			this.entry = entry;
 		}

+ 2 - 2
plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/CppCodeGeneratorModule.java

@@ -18,7 +18,7 @@ import org.yakindu.sct.generator.c.DefaultGenArtifactConfigurations;
 import org.yakindu.sct.generator.c.IGenArtifactConfigurations;
 import org.yakindu.sct.generator.c.SimpleGenArtifactConfigurations;
 import org.yakindu.sct.generator.c.types.CTypeSystemAccess;
-import org.yakindu.sct.generator.core.GeneratorModule;
+import org.yakindu.sct.generator.core.IGeneratorModule;
 import org.yakindu.sct.generator.core.IExecutionFlowGenerator;
 import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess;
 import org.yakindu.sct.model.sexec.naming.INamingService;
@@ -33,7 +33,7 @@ import com.google.inject.Binder;
  * @author andreas muelder - Initial contribution and API
  * 
  */
-public class CppCodeGeneratorModule implements GeneratorModule {
+public class CppCodeGeneratorModule implements IGeneratorModule {
 
 	@Override
 	public void configure(GeneratorEntry entry, Binder binder) {

+ 2 - 2
plugins/org.yakindu.sct.generator.csharp/src/org/yakindu/sct/generator/csharp/CSharpGeneratorModule.java

@@ -10,7 +10,7 @@
  */
 package org.yakindu.sct.generator.csharp;
 
-import org.yakindu.sct.generator.core.GeneratorModule;
+import org.yakindu.sct.generator.core.IGeneratorModule;
 import org.yakindu.sct.generator.core.IExecutionFlowGenerator;
 import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess;
 import org.yakindu.sct.generator.csharp.types.CSharpTypeSystemAccess;
@@ -24,7 +24,7 @@ import com.google.inject.Binder;
  * @author andreas muelder - Initial contribution and API
  * 
  */
-public class CSharpGeneratorModule implements GeneratorModule {
+public class CSharpGeneratorModule implements IGeneratorModule {
 
 	@Override
 	public void configure(GeneratorEntry entry, Binder binder) {

+ 2 - 2
plugins/org.yakindu.sct.generator.genmodel.ui/src/org/yakindu/sct/generator/genmodel/ui/wizard/GeneratorProjectTemplate.xtend

@@ -461,13 +461,13 @@ class GeneratorProjectTemplate {
 	def protected module(ProjectData data) '''
 		package «data.generatorClass.packageName»;
 		
-		import org.yakindu.sct.generator.core.GeneratorModule;
+		import org.yakindu.sct.generator.core.IGeneratorModule;
 		import org.yakindu.sct.generator.core.IExecutionFlowGenerator;
 		import org.yakindu.sct.model.sgen.GeneratorEntry;
 		
 		import com.google.inject.Binder;
 		
-		public class «data.moduleClass.simpleName» implements GeneratorModule {
+		public class «data.moduleClass.simpleName» implements IGeneratorModule {
 		
 		    public void configure(GeneratorEntry entry, Binder binder) {
 		        binder.bind(IExecutionFlowGenerator.class).to(«data.generatorClass.simpleName».class);

+ 2 - 2
plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/JavaGeneratorModule.java

@@ -10,7 +10,7 @@
  */
 package org.yakindu.sct.generator.java;
 
-import org.yakindu.sct.generator.core.GeneratorModule;
+import org.yakindu.sct.generator.core.IGeneratorModule;
 import org.yakindu.sct.generator.core.IExecutionFlowGenerator;
 import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess;
 import org.yakindu.sct.generator.java.types.JavaTypeSystemAccess;
@@ -26,7 +26,7 @@ import com.google.inject.Scopes;
  * @author andreas muelder - Initial contribution and API
  * 
  */
-public class JavaGeneratorModule implements GeneratorModule {
+public class JavaGeneratorModule implements IGeneratorModule {
 
 	@Override
 	public void configure(GeneratorEntry entry, Binder binder) {

+ 2 - 2
plugins/org.yakindu.sct.generator.runner/src/org/yakindu/sct/generator/runner/RunnerModule.java

@@ -10,7 +10,7 @@
  */
 package org.yakindu.sct.generator.runner;
 
-import org.yakindu.sct.generator.core.GeneratorModule;
+import org.yakindu.sct.generator.core.IGeneratorModule;
 import org.yakindu.sct.model.sgen.GeneratorEntry;
 
 import com.google.inject.Binder;
@@ -20,7 +20,7 @@ import com.google.inject.Binder;
  * @author andreas muelder - Initial contribution and API
  * 
  */
-public class RunnerModule implements GeneratorModule {
+public class RunnerModule implements IGeneratorModule {
 
 	@Override
 	public void configure(GeneratorEntry entry, Binder binder) {