diff --git a/Core/ivy.xml b/Core/ivy.xml index dc1896882f..d57cc0cf5c 100644 --- a/Core/ivy.xml +++ b/Core/ivy.xml @@ -35,5 +35,9 @@ + + + diff --git a/Core/src/org/sleuthkit/autopsy/textextractors/TextExtractorFactory.java b/Core/src/org/sleuthkit/autopsy/textextractors/TextExtractorFactory.java index ba172ce02d..112fc7a44b 100755 --- a/Core/src/org/sleuthkit/autopsy/textextractors/TextExtractorFactory.java +++ b/Core/src/org/sleuthkit/autopsy/textextractors/TextExtractorFactory.java @@ -53,6 +53,7 @@ public class TextExtractorFactory { * keep the extractors at default settings. Refer to the extractionconfigs * package for available file configurations. * + * @param * @param file Content source that will be read from * @param context Contains extraction configurations for certain file types * @@ -64,7 +65,7 @@ public class TextExtractorFactory { * have no corresponding * extractor */ - public static TextExtractor getContentSpecificExtractor(Content file, + public static TextExtractor getContentSpecificExtractor(T file, ExtractionContext context) throws NoContentSpecificExtractorException { if (file instanceof AbstractFile) { String mimeType = ((AbstractFile) file).getMIMEType(); @@ -73,7 +74,7 @@ public class TextExtractorFactory { ContentTextExtractor newInstance = (ContentTextExtractor) candidate.newInstance(); newInstance.setExtractionSettings(context); if (newInstance.isSupported(file, mimeType)) { - return newInstance; + return (TextExtractor) newInstance; } } catch (SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException ex) { @@ -83,11 +84,11 @@ public class TextExtractorFactory { } } } else if (file instanceof BlackboardArtifact) { - TextExtractor artifactExtractor = new ArtifactTextExtractor(); + TextExtractor artifactExtractor = new ArtifactTextExtractor(); artifactExtractor.setExtractionSettings(context); - return artifactExtractor; + return (TextExtractor) artifactExtractor; } else if (file instanceof Report) { - TextExtractor tikaExtractor = new TikaTextExtractor(); + TextExtractor tikaExtractor = (TextExtractor) new TikaTextExtractor(); tikaExtractor.setExtractionSettings(context); return tikaExtractor; }