From dc30c3dd09be099b1b1ee2e71912586f21a1b5d0 Mon Sep 17 00:00:00 2001 From: Nick Davis Date: Fri, 29 Jan 2016 14:26:33 -0500 Subject: [PATCH] Ran searches. Tagged strings. Created empty Bundle_Ja. --- Core/src/org/sleuthkit/autopsy/python/Bundle_ja.properties | 0 Core/src/org/sleuthkit/autopsy/python/JythonModuleLoader.java | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 Core/src/org/sleuthkit/autopsy/python/Bundle_ja.properties diff --git a/Core/src/org/sleuthkit/autopsy/python/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/python/Bundle_ja.properties new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Core/src/org/sleuthkit/autopsy/python/JythonModuleLoader.java b/Core/src/org/sleuthkit/autopsy/python/JythonModuleLoader.java index 93bd39d5d9..c9175f3754 100755 --- a/Core/src/org/sleuthkit/autopsy/python/JythonModuleLoader.java +++ b/Core/src/org/sleuthkit/autopsy/python/JythonModuleLoader.java @@ -74,7 +74,7 @@ public final class JythonModuleLoader { // add python modules from 'autospy/build/cluster/InternalPythonModules' folder // which are copied from 'autopsy/*/release/InternalPythonModules' folders. - for (File f : InstalledFileLocator.getDefault().locateAll("InternalPythonModules", JythonModuleLoader.class.getPackage().getName(), false)) { + for (File f : InstalledFileLocator.getDefault().locateAll("InternalPythonModules", JythonModuleLoader.class.getPackage().getName(), false)) { //NON-NLS Collections.addAll(pythonModuleDirs, f.listFiles()); } // add python modules from 'testuserdir/python_modules' folder @@ -127,7 +127,7 @@ public final class JythonModuleLoader { interpreter.exec("reload(" + moduleName + ")"); //NON-NLS // Importing the appropriate class from the Py Script which contains multiple classes. - interpreter.exec("from " + moduleName + " import " + className); + interpreter.exec("from " + moduleName + " import " + className); //NON-NLS interpreter.exec("obj = " + className + "()"); //NON-NLS T obj = interpreter.get("obj", interfaceClass); //NON-NLS