Updates requested in the PR.

Author: marek-trtik

driver/mkbench.py

@@ -164,11 +164,11 @@ def collect_java_binaries(cmdline):
     copied_command_line = {key.replace("_", "-"): val for key, val in vars(cmdline).items()}
 
     # Loop over all our detected entry points and create a folder for each.
-    class_paths = [p for p in (modelled_java_libraries.classpath_jar_files +
-                               modelled_library_directories +
-                               java_binaries.classpath_jar_files +
-                               java_libraries.classpath_jar_files +
-                               library_directories)]
+    class_paths = (modelled_java_libraries.classpath_jar_files +
+                   modelled_library_directories +
+                   java_binaries.classpath_jar_files +
+                   java_libraries.classpath_jar_files +
+                   library_directories)
     for ep_data in ep_config["entryPoints"]:
 
         method_data = ep_data["method"]

driver/run.py

@@ -157,7 +157,8 @@ def create_parser():
                              "option the GOTO binary won't be produced and taint analysis is applied directly to "
                              "the loaded Java program (translated to GOTO in the memory).")
     parser.add_argument("--use-models-library", action="store_true",
-                        help="Add the Diffblue Models Library's JAR file to the classpath of the security-scanner.")
+                        help="Add the Diffblue Models Library's JAR file to the classpath of the security-scanner. "
+                             "It will be put in front of the JARs of the analysed web application.")
     parser.add_argument("--use-java-runtime-library", action="store_true",
                         help="Add the Java standard library to the classpath. First, there will be attempt to add "
                              "OpenJDK version of the library. If it is not found (e.g. not installed), then the "