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

Merge branch 'release-4.5.0' of https://github.com/sleuthkit/autopsy into 3086-CeContentViewerScrolling

Browse Source
This commit is contained in:
William Schaefer 2017-09-26 12:33:18 -04:00
commit b4c645d770
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java
View File

@ -55,6 +55,7 @@ import org.sleuthkit.autopsy.corecomponents.ResultViewerPersistence.SortCriterio
import static org.sleuthkit.autopsy.corecomponents.ResultViewerPersistence.loadSortCriteria; import static org.sleuthkit.autopsy.corecomponents.ResultViewerPersistence.loadSortCriteria;
import org.sleuthkit.autopsy.coreutils.ImageUtils; import org.sleuthkit.autopsy.coreutils.ImageUtils;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.datamodel.AbstractFile;
import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.Content;
/** /**
@ -204,7 +205,7 @@ class ThumbnailViewChildren extends Children.Keys<Integer> {
private static boolean isSupported(Node node) { private static boolean isSupported(Node node) {
if (node != null) { if (node != null) {
Content content = node.getLookup().lookup(Content.class); Content content = node.getLookup().lookup(AbstractFile.class);
if (content != null) { if (content != null) {
return ImageUtils.thumbnailSupported(content); return ImageUtils.thumbnailSupported(content);
} }
@ -264,7 +265,7 @@ class ThumbnailViewChildren extends Children.Keys<Integer> {
private ThumbnailViewNode(Node wrappedNode, int thumbSize) { private ThumbnailViewNode(Node wrappedNode, int thumbSize) {
super(wrappedNode, FilterNode.Children.LEAF); super(wrappedNode, FilterNode.Children.LEAF);
this.thumbSize = thumbSize; this.thumbSize = thumbSize;
this.content = this.getLookup().lookup(Content.class); this.content = this.getLookup().lookup(AbstractFile.class);
} }
@Override @Override