Refactor ARFF dataset preparation

Author: oshando

swan-cmd/src/main/java/de/fraunhofer/iem/swan/cli/SwanCli.java

@@ -44,27 +44,13 @@ public Integer run(SwanOptions options) throws Exception {
 
             List<String> instances = new ArrayList<>();
 
-            String toolkit = "";
-
-            switch (ModelEvaluator.Toolkit.valueOf(options.getToolkit().toUpperCase())) {
-
-                case MEKA:
-                case ML2PLAN:
-                    toolkit = "meka";
-                    break;
-                case WEKA:
-                    toolkit = options.getToolkit();
-                    break;
-            }
-
             for (String feature : options.getFeatureSet()) {
 
-                String filepath = File.separator + "dataset" + File.separator + toolkit
+                String filepath = File.separator + "dataset" + File.separator + options.getToolkit().toLowerCase()
                         + File.separator;
 
-                if (toolkit.contentEquals("meka")) {
-
-                    instances.add(fileUtility.getResourceFile(filepath + toolkit + "-" + feature + ".arff",
+                if (options.getToolkit().toLowerCase().contentEquals("meka")) {
+                            instances.add(fileUtility.getResourceFile(filepath + options.getToolkit().toLowerCase() + "-" + feature + ".arff",
                             null).getAbsolutePath());
                 } else {
                     for (String srm : options.getAllClasses()) {

swan-cmd/src/main/java/de/fraunhofer/iem/swan/util/Util.java

@@ -143,8 +143,11 @@ public static String buildCP(String[] dirs) {
 
             File folder = new File(dir);
 
+            if (dir.isEmpty() || !folder.exists() || !Files.isDirectory(folder.toPath()))
+                continue;
+
             //If folder contains .class files, add path to classpath
-            if (FileUtils.listFiles(folder, new String[]{"class"}, true).size() > 0)
+            if (!FileUtils.listFiles(folder, new String[]{"class"}, true).isEmpty())
                 paths.add(dir);
             else {
                 for (File file : FileUtils.listFiles(folder, new String[]{"jar", "apk"}, true)) {