migrated to to eclipse directory structure caused on compilation problems with eclipse

tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AlternativeConstantLongVariableSetItemProvider.java → tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AlternativeConstantLongVariableSetItemProvider.java

@@ -552,6 +552,11 @@ public class AlternativeConstantLongVariableSetItemProvider extends AlternativeC
 				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
 				 DNIFactory.eINSTANCE.createLinkPerformanceType()));
 
+		newChildDescriptors.add
+			(createChildParameter
+				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
+				 EcoreFactory.eINSTANCE.createEObject()));
+
 		newChildDescriptors.add
 			(createChildParameter
 				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
@@ -587,11 +592,6 @@ public class AlternativeConstantLongVariableSetItemProvider extends AlternativeC
 				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
 				 EcoreFactory.eINSTANCE.createEFactory()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
-				 EcoreFactory.eINSTANCE.createEObject()));
-
 		newChildDescriptors.add
 			(createChildParameter
 				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,

tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AlternativeVariableSetItemProvider.java → tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AlternativeVariableSetItemProvider.java

@@ -552,6 +552,11 @@ public class AlternativeVariableSetItemProvider extends AlternativeVariableItemP
 				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
 				 DNIFactory.eINSTANCE.createLinkPerformanceType()));
 
+		newChildDescriptors.add
+			(createChildParameter
+				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
+				 EcoreFactory.eINSTANCE.createEObject()));
+
 		newChildDescriptors.add
 			(createChildParameter
 				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
@@ -587,11 +592,6 @@ public class AlternativeVariableSetItemProvider extends AlternativeVariableItemP
 				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
 				 EcoreFactory.eINSTANCE.createEFactory()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
-				 EcoreFactory.eINSTANCE.createEObject()));
-
 		newChildDescriptors.add
 			(createChildParameter
 				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,

tools.descartes.dni.core/model/DNIMM3.xcore

@@ -2,8 +2,8 @@
 @Ecore(invocationDelegates="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot",
 	settingDelegates="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot",
 	validationDelegates="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot")
-@GenModel(modelDirectory="/tools.descartes.dni.core/src/main/java",
-	editDirectory="/tools.descartes.dni.core/src/main/java", editorDirectory="/tools.descartes.dni.core/src/main/java",
+@GenModel(modelDirectory="/tools.descartes.dni.core/src",
+	editDirectory="/tools.descartes.dni.core/src", editorDirectory="/tools.descartes.dni.core/src",
 	fileExtensions="dni", prefix="DNI")
 package tools.descartes.dni.dnimm3
 

tools.descartes.dni.core/pom.xml

@@ -33,6 +33,8 @@
 	</repositories>
 
 	<build>
+		<sourceDirectory>src</sourceDirectory>
+		<testSourceDirectory>src-test</testSourceDirectory>
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>

tools.descartes.dni.core/src/test/java/tools/descartes/dni/dnimm3/tools/ParserTest.java → tools.descartes.dni.core/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java

@@ -17,7 +17,7 @@ public class ParserTest {
 
 	@Test
 	public void shouldConvertFileToModel() {
-		File file = new File("src/test/resources/scenario0A.dni");
+		File file = new File("resources-test/scenario0A.dni");
 		NetworkInfrastructureImpl networkInfrastructure = Parser.convertToModel(file);
 		Assert.assertEquals(6, networkInfrastructure.getStructure().getNodes().size());
 	}
@@ -42,7 +42,7 @@ public class ParserTest {
 
 	@Test
 	public void shouldConvertByteArrayToModel() throws IOException {
-		Path path = Paths.get("src/test/resources/scenario0A.dni");
+		Path path = Paths.get("resources-test/scenario0A.dni");
 		byte[] data = Files.readAllBytes(path);
 		NetworkInfrastructureImpl networkInfrastructure = Parser.convertToModel(data);
 		Assert.assertEquals(6, networkInfrastructure.getStructure().getNodes().size());