Merge branch 'master' of github.com:sleuthkit/autopsy

This commit is contained in:
Brian Carrier 2013-07-11 15:11:38 -04:00
commit 85b16fcc8b
2 changed files with 31 additions and 0 deletions

View File

@ -141,6 +141,27 @@ public class PlatformUtil {
public static File getUserDirectory() {
return Places.getUserDirectory();
}
/**
* Get RCP project dirs
* @return
*/
public static List<String> getProjectsDirs() {
List<String> ret = new ArrayList<String>();
String projectDir = System.getProperty("netbeans.dirs");
if (projectDir == null) {
return ret;
}
String [] split = projectDir.split(";");
if (split == null || split.length == 0) {
return ret;
}
for (String path : split) {
ret.add(path);
}
return ret;
}
/**
* Get user config directory path

View File

@ -442,6 +442,16 @@ public final class IngestModuleLoader {
//user modules
urls.addAll(getJarPaths(PlatformUtil.getUserModulesPath()));
// add other project dirs, such as from external modules
for (String projectDir : PlatformUtil.getProjectsDirs()) {
File modules = new File(projectDir + File.separator + "modules");
if (modules.exists()) {
urls.addAll(getJarPaths(modules.getAbsolutePath()));
}
}
return urls;
}