Release 1.2.0:

No Optional Command-Line Arguments anymore, but "internal" can be
specified to use the internal data provided in the jar.

Author: ingo-budde

swan_core/pom.xml

@@ -6,7 +6,7 @@
 	<groupId>de.upb.cs.swt</groupId>
 	<artifactId>swan_core</artifactId>
 	<packaging>jar</packaging>
-	<version>1.1.0</version>
+	<version>1.2.0</version>
 
 	<name>SWAN Weakness Detector</name>
 	<description>SWAN is a machine-learning approach for detection of methods of interest for security in Java libraries.</description>

swan_core/src/main/java/de/fraunhofer/iem/swan/Main.java

@@ -21,41 +21,30 @@ public class Main {
 	public static void main(String[] args) {
 
 		try {
-			boolean correctNumberOfArguments = args.length >= 2 && args.length <= 4;
-			if (!correctNumberOfArguments) {
+			if (args.length != 4) {
 				System.err.println("");
 				System.err.println(
-						"Usage: java de.fraunhofer.iem.swan.Main <source-dir> [<train-sourcecode>] [<train-json>] <output-dir>\n");
+						"Usage: java de.fraunhofer.iem.swan.Main <source-dir> <train-sourcecode> <train-json> <output-dir>\n");
 				System.err.println("<source-dir>:\tDirectory with all JAR files or source code of the Test Data.");
 				System.err.println("\t\tThis is the actual user library being evaluated.\n");
 				System.err.println(
-						"<train-sourcecode>: Directory with all JAR Files or source code of the Train Data to learn from.");
+						"<train-sourcecode>: Directory with all JAR Files or source code of the Train Data to learn from");
 				System.err.println(
-						"\t\tThis is an optional parameter. If it is not specified, the builtin traindata is used.\n");
+						"\t\tNote: This can be set to \"internal\" without quotes, to use the internal train sourcecode that is bundled in this jar.\n");
 				System.err
 						.println("<train-json>: Path to the train data file (JSON), which includes method signatures.");
 				System.err.println(
-						"\t\tThis is an optional parameter. If it is not specified, the builtin json file is used.\n");
+						"\t\tNote: This can be set to \"internal\" (without quotes), to use the internal train data file that is bundled in this jar.\n");
 				System.err.println("<output-dir>:\tDirectory where the output should be written.\n");
 				return;
 			}
 
 			// Get configuration options from command line arguments.
 			String sourceDir = args[0];
-			String trainSourceCode = null;
-			String trainJson = null;
-			String outputDir = args[args.length - 1];
-
-			// Train Sourcecode (extract from JAR, if not specified)
-			if (args.length >= 3) {
-				trainSourceCode = args[1];
-			}
-
-			// Train JSON (extract from JAR, if not specified)
-			if (args.length == 4) {
-				trainJson = args[2];
-			}
-
+			String trainSourceCode = args[1].equals("internal") ? null : args[1];
+			String trainJson = args[2].equals("internal") ? null : args[2];
+			String outputDir = args[3];
+			
 			Main main = new Main();
 			main.run(sourceDir, trainSourceCode, trainJson, outputDir);
 			// System.out.println("Done.");