Commit to be removed: use default output generation configuration for xtend

Author: ipa-nhg

plugins/de.fraunhofer.ipa.ros.xtext.tests/src/de/fraunhofer/ipa/ros/tests/RosGeneratorTest.xtend

@@ -77,10 +77,10 @@ class RosGeneratorTest {
 
 		val fsa = new InMemoryFileSystemAccess
 		CIGenerator.doGenerate(model.eResource, fsa, new GeneratorContext)
-		Assert.assertTrue(fsa.textFiles.containsKey(CICustomOutputProvider::COM_OUTPUT + "test_node.componentinterface"))
+		Assert.assertTrue(fsa.textFiles.containsKey(CICustomOutputProvider::COMPONENTS_OUTPUT + "test_node.componentinterface"))
 		Assert.assertEquals(
 			new String(Files.readAllBytes(Paths.get(RESOURCES_BASE_DIR, 'components', 'test_node.componentinterface'))).trim,
-			fsa.textFiles.get(CICustomOutputProvider::COM_OUTPUT + "test_node.componentinterface").toString.trim)
+			fsa.textFiles.get(CICustomOutputProvider::COMPONENTS_OUTPUT + "test_node.componentinterface").toString.trim)
 	}
 
 }

plugins/de.fraunhofer.ipa.ros.xtext/src/de/fraunhofer/ipa/ros/generator/RosGenerator.xtend

@@ -10,24 +10,29 @@ import org.eclipse.xtext.generator.IFileSystemAccess2
 import org.eclipse.xtext.generator.IGeneratorContext
 import org.eclipse.xtext.generator.IOutputConfigurationProvider
 import org.eclipse.xtext.generator.OutputConfiguration
+ import org.eclipse.xtext.generator.IContextualOutputConfigurationProvider
 import ros.Node
 import ros.Package
 
-class CICustomOutputProvider implements IOutputConfigurationProvider {
-	public final static String COM_OUTPUT = "COM_OUTPUT"
-	
+class CICustomOutputProvider implements IOutputConfigurationProvider, IContextualOutputConfigurationProvider {	
 
+	public static String COMPONENTS_OUTPUT="COMPONENTS_OUTPUT";
+	
 	override Set<OutputConfiguration> getOutputConfigurations() {
 
-		var OutputConfiguration default_config = new OutputConfiguration(COM_OUTPUT)
-		default_config.setDescription("COM_OUTPUT");
+		var OutputConfiguration default_config = new OutputConfiguration("COMPONENTS_OUTPUT")
+		default_config.setDescription("COMPONENTS_OUTPUT");
 		default_config.setOutputDirectory("./components/");
 		default_config.setOverrideExistingResources(true);
 		default_config.setCreateOutputDirectory(true);
 		default_config.setCleanUpDerivedResources(false);
 		default_config.setSetDerivedProperty(false);
 		return newHashSet(default_config)
 	}
+	
+	override Set<OutputConfiguration> getOutputConfigurations(Resource context) {
+		return getOutputConfigurations()
+	}
 }
 
 /**
@@ -57,7 +62,8 @@ class RosGenerator extends AbstractGenerator {
 			}
 		}
 		for (node : resource.allContents.toIterable.filter(Node)){
-			fsa.generateFile(node.getName()+".componentinterface",CICustomOutputProvider::COM_OUTPUT,compile(node,package_name,artifact_name))
+			//fsa.generateFile(node.getName()+".componentinterface",CICustomOutputProvider::COMPONENTS_OUTPUT,compile(node,package_name,artifact_name))
+			fsa.generateFile(node.getName()+".componentinterface",compile(node,package_name,artifact_name))
 		}
 	}