clean up

src/main/java/de/tudresden/inf/st/pnml/gen/builders/PackageStructureBuilder.java

@@ -16,7 +16,7 @@ public class PackageStructureBuilder {
 
     private static final String FILE_PATH = "../pnml-relast-pkg-gen/src/main/resources/static/";
 
-    public static boolean build(String packagePath, DinerosPackage dinerosPackage, List<NetInfo> petriNetFilePaths, String engineVersion
+    public static void build(String packagePath, DinerosPackage dinerosPackage, List<NetInfo> petriNetFilePaths, String engineVersion
                                , String rosHost, String rosMasterUri, String mqttHost) {
 
         List<PetriNet> nets = new ArrayList<>();
@@ -50,10 +50,8 @@ public class PackageStructureBuilder {
             System.err.println(e.getLocalizedMessage() + " caused by: " + e.getCause());
             e.printStackTrace();
 
-            return false;
         }
 
-        return true;
     }
 
     /////////////////////////////////////
@@ -122,7 +120,7 @@ public class PackageStructureBuilder {
                 for (int i = 0; i < nets.size(); i++) {
                     NodeFile nodeFile = new NodeFile();
                     nodeFile.setName("Node" + i);
-                    nodeFile.setFileID("Node-" + String.valueOf(i));
+                    nodeFile.setFileID("Node-" + i);
                     pd.addFile(nodeFile);
                 }
             }
@@ -328,25 +326,6 @@ public class PackageStructureBuilder {
         }
     }
 
-    private static void includePnmlFiles(DinerosPackage dinerosPackage, List<NetInfo>netPaths, String packagePath) throws IOException {
-
-        Set<String> visitedPackageFileIDs = new HashSet<>();
-
-        for (int i = 0; i < netPaths.size(); i++) {
-            for (PackageFile pf : dinerosPackage.allPackageFiles()) {
-                if (pf.isPnmlFile() && !visitedPackageFileIDs.contains(pf.getFileID())) {
-                    visitedPackageFileIDs.add(pf.getFileID());
-                    pf.setName("PetriNet-" + i + ".pnml");
-                    Path copied = Paths.get(packagePath + "/src/main/resources/nets/" + pf.getName());
-                    Path originalPath = Paths.get(netPaths.get(i).net);
-                    System.out.println("Before Copy PNML:" + originalPath + " --> " + copied);
-                    Files.copy(originalPath, copied, StandardCopyOption.REPLACE_EXISTING);
-                    System.out.println("Copy PNML:" + originalPath + " --> " + copied);
-                }
-            }
-        }
-    }
-
     private static void includeTemplateFiles(DinerosPackage dinerosPackage, List<PetriNet> nets, String engineVersion,
                                              List<String> petriNetFiles, String rosHost, String rosMasterUri, String mqttHost) {
 
@@ -368,7 +347,7 @@ public class PackageStructureBuilder {
             for (PackageFile pf : dinerosPackage.allPackageFiles()) {
 
                 String[] splitNodeFileId = pf.getFileID().split("-");
-                if (pf.isNodeFile() && i == Integer.valueOf(splitNodeFileId[1])) {
+                if (pf.isNodeFile() && i == Integer.parseInt(splitNodeFileId[1])) {
                     pf.setName("Node" + splitNodeFileId[1]);
                     pf.asNodeFile().generate();
                     break;

src/main/java/de/tudresden/inf/st/pnml/gen/generators/GradleGenUtil.java

 package de.tudresden.inf.st.pnml.gen.generators;
 
-import com.github.mustachejava.DefaultMustacheFactory;
-import com.github.mustachejava.Mustache;
-import com.github.mustachejava.MustacheFactory;
 import de.tudresden.inf.st.pnml.gen.data.GradleBuildContext;
 import de.tudresden.inf.st.pnml.gen.data.SettingsGradleContext;
 
-import java.io.IOException;
-import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;