codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-06 02:24:30 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Richard Cordovano
2013-11-04 10:04:28 -05:00
parent 5b97890dd7 5186c10fcb
commit d43343ebd7
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
View File

@@ -343,10 +343,11 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
//int scrollWidth = ttv.getWidth();
int margin = 4;
int startColumn = 1;
if (props.size() > 0) {
ov.getOutline().setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
}
// If there is only one column (which was removed from props above)
// Just let the table resize itself.
ov.getOutline().setAutoResizeMode((props.size() > 0) ? JTable.AUTO_RESIZE_OFF : JTable.AUTO_RESIZE_ALL_COLUMNS);
// get first 100 rows values for the table

5
Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java
View File

@@ -65,6 +65,9 @@ public class GeneralIngestConfigurator implements IngestConfigurator {
String[] enabledModuleNames = ModuleSettings.getConfigSetting(moduleContext, ENABLED_INGEST_MODULES_KEY).split(", ");
List<IngestModuleAbstract> enabledModules = new ArrayList<>();
for (String moduleName : enabledModuleNames) {
if (moduleName.equals("Thunderbird Parser")) {
moduleName = "MBox Parser";
}
IngestModuleAbstract moduleFound = null;
for (IngestModuleAbstract module : allModules) {
if (moduleName.equals(module.getName())) {
@@ -76,7 +79,7 @@ public class GeneralIngestConfigurator implements IngestConfigurator {
enabledModules.add(moduleFound);
}
else {
messages.add("Unable to load " + moduleName + " module");
messages.add("Unable to enable ingest module: " + moduleName);
}
}
ingestDialogPanel.setEnabledIngestModules(enabledModules);

13
RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SEUQAMappings.xml
View File

@@ -33,6 +33,19 @@ splitToken:
<SearchEngine engine="Yahoo" domainSubstring=".yahoo." >
<splitToken plainToken="?p=" regexToken="\\?p=" />
</SearchEngine>
<SearchEngine engine="Twitter" domainSubstring="twitter." >
<splitToken plainToken="?q=" regexToken="\\?q=" />
<splitToken plainToken="&amp;q=" regexToken="&amp;q="/>
</SearchEngine>
<SearchEngine engine="LinkedIn" domainSubstring=".linkedin." >
<splitToken plainToken="&amp;keywords=" regexToken="&amp;keywords="/>
</SearchEngine>
<SearchEngine engine="Facebook" domainSubstring=".facebook." >
<splitToken plainToken="?value=" regexToken="\\?value="/>
</SearchEngine>
<SearchEngine engine="Bing" domainSubstring=".bing" >
<splitToken plainToken="?q=" regexToken="\\?q=" />