mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-15 01:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into search_improvements

Browse Source
This commit is contained in:
Richard Cordovano 2017-02-11 14:26:35 -05:00
commit cd8ec4f36b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/datamodel/ArtifactStringContent.java
View File

@ -149,7 +149,7 @@ public class ArtifactStringContent implements StringContent {
buffer.append("</td>"); //NON-NLS buffer.append("</td>"); //NON-NLS
/* /*
* Attribute source modules column. * Attribute sources column.
*/ */
buffer.append("<td>"); //NON-NLS buffer.append("<td>"); //NON-NLS
buffer.append(StringUtils.join(attr.getSources(), ", ")); buffer.append(StringUtils.join(attr.getSources(), ", "));

2
Core/src/org/sleuthkit/autopsy/test/CustomArtifactsCreatorIngestModuleFactory.java
View File

@ -30,7 +30,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
* attributes with files for test purposes. Uncomment the service provider * attributes with files for test purposes. Uncomment the service provider
* annotation to activate this test fixture. * annotation to activate this test fixture.
*/ */
@ServiceProvider(service = IngestModuleFactory.class) //@ServiceProvider(service = IngestModuleFactory.class)
public final class CustomArtifactsCreatorIngestModuleFactory extends IngestModuleFactoryAdapter { public final class CustomArtifactsCreatorIngestModuleFactory extends IngestModuleFactoryAdapter {
@Override @Override