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

more generics compiler warning fixes

Browse Source
This commit is contained in:
jmillman
2014-08-28 11:40:20 -04:00
parent ea0eca1ae5
commit 3fa5ade5eb
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/datamodel/DrawableFile.java
View File

@@ -60,7 +60,7 @@ import org.sleuthkit.datamodel.TskCoreException;
*/
public abstract class DrawableFile<T extends AbstractFile> extends AbstractFile {
public static DrawableFile create(AbstractFile abstractFileById, boolean b) {
public static <T extends AbstractFile> DrawableFile<T> create(T abstractFileById, boolean b) {
if (EurekaModule.isVideoFile(abstractFileById)) {
return new VideoFile(abstractFileById, b);
} else {
@@ -68,7 +68,7 @@ public abstract class DrawableFile<T extends AbstractFile> extends AbstractFile
}
}
public static DrawableFile create(Long id, boolean b) throws TskCoreException, IllegalStateException {
public static DrawableFile<?> create(Long id, boolean b) throws TskCoreException, IllegalStateException {
AbstractFile abstractFileById = Case.getCurrentCase().getSleuthkitCase().getAbstractFileById(id);
if (EurekaModule.isVideoFile(abstractFileById)) {
@@ -135,15 +135,15 @@ public abstract class DrawableFile<T extends AbstractFile> extends AbstractFile
return new ArrayList<>();
}
public ObservableList<Pair<DrawableAttribute, ? extends Object>> getAttributesList() {
final ObservableList<Pair<DrawableAttribute, ? extends Object>> attributeList = FXCollections.observableArrayList();
for (DrawableAttribute attr : DrawableAttribute.getValues()) {
public ObservableList<Pair<DrawableAttribute<?>, ? extends Object>> getAttributesList() {
final ObservableList<Pair<DrawableAttribute<?>, ? extends Object>> attributeList = FXCollections.observableArrayList();
for (DrawableAttribute<?> attr : DrawableAttribute.getValues()) {
attributeList.add(new Pair<>(attr, getValueOfAttribute(attr)));
}
return attributeList;
}
public Object getValueOfAttribute(DrawableAttribute attr) {
public Object getValueOfAttribute(DrawableAttribute<?> attr) {
switch (attr.attrName) {
case OBJ_ID:
return file.getId();
@@ -328,6 +328,7 @@ public abstract class DrawableFile<T extends AbstractFile> extends AbstractFile
return this.file;
}
@SuppressWarnings("unchecked")
private void updateHashSetHits() {
hashHitSetNames.setAll((Collection<? extends String>) getValuesOfBBAttribute(BlackboardArtifact.ARTIFACT_TYPE.TSK_HASHSET_HIT, BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME));
}

2
ImageAnalyzer/src/org/sleuthkit/autopsy/imageanalyzer/gui/MetaDataPane.java
View File

@@ -156,7 +156,7 @@ public class MetaDataPane extends AnchorPane implements Category.CategoryListene
}
@Override
public DrawableFile getFile() {
public DrawableFile<?> getFile() {
if (fileID != null) {
if (file == null || file.getId() != fileID) {
try {