fix eternal loop

tools/esm-dataflow/src/main/java/org/oceandsl/tools/esm/Settings.java

@@ -31,7 +31,7 @@ public class Settings { // NOPMD data class
 
     @Parameter(names = { "-i",
             "--input" }, required = true, variableArity = true, converter = PathConverter.class, description = "Input architecture model directories")
-    private List<Path> inputModelPaths;
+    private Path inputModelPaths;
 
     @Parameter(names = { "-o",
             "--output" }, required = true, converter = PathConverter.class, description = "Output architecture model directory")
@@ -40,7 +40,7 @@ public class Settings { // NOPMD data class
     @Parameter(names = { "-e", "--experiment" }, required = true, description = "Experiment name")
     private String experimentName;
 
-    public List<Path> getInputModelPaths() {
+    public Path getInputModelPaths() {
         return this.inputModelPaths;
     }
 

tools/esm-dataflow/src/main/java/org/oceandsl/tools/esm/stages/EsmDataFlowAnalysisStage.java

@@ -25,23 +25,29 @@ import org.xml.sax.InputSource;
 
 import kieker.analysis.generic.graph.mtree.utils.Pair;
 import teetime.framework.AbstractConsumerStage;
+import teetime.framework.OutputPort;
 import teetime.stage.basic.AbstractTransformation;
 
-public class EsmDataFlowAnalysisStage extends AbstractTransformation<List<File>, Output> {
+public class EsmDataFlowAnalysisStage extends AbstractConsumerStage<List<File>> {
 
 	private List<String> dataflow = new ArrayList<String>();
 	private List<String> contentFile = new ArrayList<String>();
 	
+	protected final OutputPort<Output> outputPort = this.createOutputPort();
 	
+	
+	public OutputPort<Output> getOutputPort(){
+		return this.outputPort;
+	}
 	@Override
 	protected void execute(List<File> files) throws Exception {
 
-	
+		//System.out.println("Files:"+ files.size());
 		Output out = new Output();
 		
 		for(File file : files) {
 			//Extract xml
-			System.out.println("File:"+ file.getAbsolutePath());
+		//	System.out.println("File:"+ file.getAbsolutePath());
 			String xml = new String(Files.readAllBytes(Paths.get(file.getAbsolutePath())));
 			// Get main structures
 			List<List<Node>> subRoutineBodies = XPathParser.getSubroutineContents(xml);
@@ -58,13 +64,15 @@ public class EsmDataFlowAnalysisStage extends AbstractTransformation<List<File>,
 			dataflow.addAll(dfInMain);
 			
 			
-			out.setDataflow(dataflow);
-			out.setFileContent(contentFile);
+			
 			
 			
 			
 			
 		}
+		out.setDataflow(dataflow);
+		out.setFileContent(contentFile);
+		System.out.println("Done");
 		this.outputPort.send(out);
 		
 	}
@@ -79,7 +87,7 @@ public class EsmDataFlowAnalysisStage extends AbstractTransformation<List<File>,
 			String contentLine = "{"+fileId+"};{"+name+"};SUBROUTINE";
 			this.contentFile.add(contentLine);
 			
-			String dataFlowLine = "{"+fileId+"};"+name+"};";
+			String dataFlowLine = "{"+fileId+"};{"+name+"};";
 			dataflowInSub = analyzeExecutionPart(body,commonBlocks, blackList, dataFlowLine);
 		}
 		return dataflowInSub;
@@ -95,7 +103,7 @@ public class EsmDataFlowAnalysisStage extends AbstractTransformation<List<File>,
 			String contentLine = "{"+fileId+"};{"+name+"};FUNCTION";
 			this.contentFile.add(contentLine);
 
-			String dataFlowLine = "{"+fileId+"};"+name+"};";
+			String dataFlowLine = "{"+fileId+"};{"+name+"};";
 			dataflowInFunc = analyzeExecutionPart(body, commonBlocks, blackList, dataFlowLine);
 		}
 		return dataflowInFunc;

tools/esm-dataflow/src/main/java/org/oceandsl/tools/esm/stages/OutputStage.java

@@ -31,12 +31,13 @@ public class OutputStage extends AbstractConsumerStage<Output>{
 	            for (String line : element.getDataflow()) {
 	                writerdf.write(line + System.lineSeparator());
 	            }
-	            writerdf.close();
+	          //  writerdf.close();
 	            for (String line : element.getFileContent()) {
 	                writerfc.write(line + System.lineSeparator());
 	            }
-	          //  writerdf.close();
+	            writerdf.close();
 	            writerfc.close();
+	            
 	            System.out.println("Successfully wrote lines to files.");
 	        } catch (IOException e) {
 	            System.out.println("An error occurred while writing to the file.");

tools/esm-dataflow/src/main/java/org/oceandsl/tools/esm/stages/ReadStage.java

@@ -12,21 +12,22 @@ import teetime.framework.AbstractProducerStage;
 
 public class ReadStage extends AbstractProducerStage<List<File>> {
 	
-	private final List<Path> rootPath;
+	private final Path rootPath;
 
 	
-	public ReadStage(List<Path> list) {
+	public ReadStage(Path list) {
 		this.rootPath = list;
 	}
 	@Override
 	protected void execute() throws Exception {
-		for(Path path: rootPath) {
-		File folder = new File(path.toAbsolutePath().toString());
+		
+		File folder = new File(this.rootPath.toAbsolutePath().toString());
 		List<File> files =Arrays.asList(folder.listFiles());
-		System.out.println("Files sent: "+ files.size());
+	//	System.out.println("Files sent: "+ files.size());
 		this.outputPort.send(files);
+		this.workCompleted();
+		
 		
-		}
 	}
 	
 	

tools/esm-dataflow/src/main/java/org/oceandsl/tools/esm/util/XPathParser.java

@@ -228,11 +228,11 @@ public class XPathParser {
 			
 			for(int i = 0; i<args.getLength();i++) {
 				Element arg = (Element)args.item(i);
-				System.out.println(arg.getElementsByTagName("n").getLength());
+			//	System.out.println(arg.getElementsByTagName("n").getLength());
 				NodeList ns =arg.getElementsByTagName("n");
 				for(int j = 0;j<ns.getLength();j++) {
 					Element n = (Element)ns.item(j);
-					System.out.println(n.getTextContent());
+				//	System.out.println(n.getTextContent());
 					result.add(n.getTextContent());
 				}
 			}
@@ -247,7 +247,7 @@ public class XPathParser {
 		NodeList nameElems = e.getElementsByTagName("n");
 		
 		for(int i=0;i<nameElems.getLength();i++) {
-		    result.add(nameElems.item(i).getNodeValue());	
+		    result.add(nameElems.item(i).getTextContent());	
 		}
 		
 		
@@ -322,57 +322,60 @@ public class XPathParser {
 
 
 	public static String getsubroutineId(List<Node> body) {
-		List<String> result = new ArrayList<String>();
+		//List<String> result = new ArrayList<String>();
 		Element e = (Element)body.get(0);
+	//	System.out.println("name" +e.getNodeName().equals("subroutine-stmt"));
 		NodeList nameElems = e.getElementsByTagName("n");
+	//	System.out.println("size: "+ nameElems.getLength());
+		//for(int i=0;i<nameElems.getLength();i++) {
 			
-		for(int i=0;i<nameElems.getLength();i++) {
-		    result.add(nameElems.item(i).getNodeValue());	
-		}
-		
+		  //  result.add(nameElems.item(0).getTextContent());	
+		//}
 		
-		return result.get(0);
+		return nameElems.item(0).getTextContent();
+		//return result.get(0);
 	}
 
 	public static String getFunctionId(List<Node> body) {
-		List<String> result = new ArrayList<String>();
+		//List<String> result = new ArrayList<String>();
 		Element e = (Element)body.get(0);
 		NodeList nameElems = e.getElementsByTagName("n");
 		
-		for(int i=0;i<nameElems.getLength();i++) {
-		    result.add(nameElems.item(i).getNodeValue());	
-		}
-		
+		//for(int i=0;i<nameElems.getLength();i++) {
+		   // result.add(nameElems.item(i).getNodeValue());	
+		//}
 		
-		return result.get(0);
+		return nameElems.item(0).getTextContent();
+		//return result.get(0);
 	}
 
 
 	public static String getCallStmtId(Node callStmt) {
-		List<String> result = new ArrayList<String>();
+		//List<String> result = new ArrayList<String>();
 		Element e = (Element)callStmt;
 		NodeList nameElems = e.getElementsByTagName("n");
 		
-		for(int i=0;i<nameElems.getLength();i++) {
-		    result.add(nameElems.item(i).getNodeValue());	
-		}
+	//	for(int i=0;i<nameElems.getLength();i++) {
+		//**/    result.add(nameElems.item(i).getNodeValue());	
+	//	}
 		
 		
-		return result.get(0);
+		return nameElems.item(0).getTextContent();
 	}
 
 
 	public static String getCommonBlockId(Node commonBlock) {
-		List<String> result = new ArrayList<String>();
+		//List<String> result = new ArrayList<String>();
 		Element e = (Element)commonBlock;
 		NodeList nameElems = e.getElementsByTagName("n");
 		
-		for(int i=0;i<nameElems.getLength();i++) {
-		    result.add(nameElems.item(i).getNodeValue());	
-		}
+	//	for(int i=0;i<nameElems.getLength();i++) {
+	//	    result.add(nameElems.item(i).getNodeValue());	
+	//	}
 		
 		
-		return result.get(0);
+		//return result.get(0);
+		return nameElems.item(0).getTextContent();
 	}