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

Made progress on fixing the warnings

Browse Source
This commit is contained in:
U-BASIS\dsmyda 2018-12-06 08:37:28 -05:00
parent 38ab533dc1
commit eaaf3428a7
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/ivy.xml
View File

@ -35,5 +35,9 @@
<dependency conf="core->default" org="commons-validator" name="commons-validator" rev="1.6"/> <dependency conf="core->default" org="commons-validator" name="commons-validator" rev="1.6"/>
<dependency conf="core->default" org="net.htmlparser.jericho" name="jericho-html" rev="3.3"/> <dependency conf="core->default" org="net.htmlparser.jericho" name="jericho-html" rev="3.3"/>
<!-- Tika 1.14 seems to declare a (transitive?) dependency on cleartk-util 3.2.2, but the most recent
version available is 2.0.0 Overriding the version worked-->
<override org="org.cleartk" module="cleartk-util" rev="2.0.0"/>
</dependencies> </dependencies>
</ivy-module> </ivy-module>

11
Core/src/org/sleuthkit/autopsy/textextractors/TextExtractorFactory.java
View File

@ -53,6 +53,7 @@ public class TextExtractorFactory {
* keep the extractors at default settings. Refer to the extractionconfigs * keep the extractors at default settings. Refer to the extractionconfigs
* package for available file configurations. * package for available file configurations.
* *
* @param <T>
* @param file Content source that will be read from * @param file Content source that will be read from
* @param context Contains extraction configurations for certain file types * @param context Contains extraction configurations for certain file types
* *
@ -64,7 +65,7 @@ public class TextExtractorFactory {
* have no corresponding * have no corresponding
* extractor * extractor
*/ */
public static TextExtractor<Content> getContentSpecificExtractor(Content file, public static <T extends Content> TextExtractor<T> getContentSpecificExtractor(T file,
ExtractionContext context) throws NoContentSpecificExtractorException { ExtractionContext context) throws NoContentSpecificExtractorException {
if (file instanceof AbstractFile) { if (file instanceof AbstractFile) {
String mimeType = ((AbstractFile) file).getMIMEType(); String mimeType = ((AbstractFile) file).getMIMEType();
@ -73,7 +74,7 @@ public class TextExtractorFactory {
ContentTextExtractor newInstance = (ContentTextExtractor) candidate.newInstance(); ContentTextExtractor newInstance = (ContentTextExtractor) candidate.newInstance();
newInstance.setExtractionSettings(context); newInstance.setExtractionSettings(context);
if (newInstance.isSupported(file, mimeType)) { if (newInstance.isSupported(file, mimeType)) {
return newInstance; return (TextExtractor<T>) newInstance;
} }
} catch (SecurityException | InstantiationException | IllegalAccessException } catch (SecurityException | InstantiationException | IllegalAccessException
| IllegalArgumentException ex) { | IllegalArgumentException ex) {
@ -83,11 +84,11 @@ public class TextExtractorFactory {
} }
} }
} else if (file instanceof BlackboardArtifact) { } else if (file instanceof BlackboardArtifact) {
TextExtractor artifactExtractor = new ArtifactTextExtractor(); TextExtractor<BlackboardArtifact> artifactExtractor = new ArtifactTextExtractor();
artifactExtractor.setExtractionSettings(context); artifactExtractor.setExtractionSettings(context);
return artifactExtractor; return (TextExtractor<T>) artifactExtractor;
} else if (file instanceof Report) { } else if (file instanceof Report) {
TextExtractor tikaExtractor = new TikaTextExtractor(); TextExtractor<T> tikaExtractor = (TextExtractor<T>) new TikaTextExtractor();
tikaExtractor.setExtractionSettings(context); tikaExtractor.setExtractionSettings(context);
return tikaExtractor; return tikaExtractor;
} }