mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-20 03:24:55 +00:00
- fix case when no image to get timezone (for top level virt dir)
- set icons for virt dirs for reserved virt dir names
This commit is contained in:
parent
df734510e9
commit
1af6c363fd
@ -33,6 +33,7 @@ import org.sleuthkit.datamodel.ContentVisitor;
|
|||||||
import org.sleuthkit.datamodel.DerivedFile;
|
import org.sleuthkit.datamodel.DerivedFile;
|
||||||
import org.sleuthkit.datamodel.Directory;
|
import org.sleuthkit.datamodel.Directory;
|
||||||
import org.sleuthkit.datamodel.File;
|
import org.sleuthkit.datamodel.File;
|
||||||
|
import org.sleuthkit.datamodel.Image;
|
||||||
import org.sleuthkit.datamodel.LayoutFile;
|
import org.sleuthkit.datamodel.LayoutFile;
|
||||||
import org.sleuthkit.datamodel.ReadContentInputStream;
|
import org.sleuthkit.datamodel.ReadContentInputStream;
|
||||||
import org.sleuthkit.datamodel.TskException;
|
import org.sleuthkit.datamodel.TskException;
|
||||||
@ -102,7 +103,14 @@ public final class ContentUtils {
|
|||||||
|
|
||||||
public static TimeZone getTimeZone(Content c) {
|
public static TimeZone getTimeZone(Content c) {
|
||||||
try {
|
try {
|
||||||
return TimeZone.getTimeZone(c.getImage().getTimeZone());
|
final Image image = c.getImage();
|
||||||
|
if (image != null) {
|
||||||
|
return TimeZone.getTimeZone(image.getTimeZone());
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
//case such as top level VirtualDirectory
|
||||||
|
return TimeZone.getDefault();
|
||||||
|
}
|
||||||
} catch (TskException ex) {
|
} catch (TskException ex) {
|
||||||
return TimeZone.getDefault();
|
return TimeZone.getDefault();
|
||||||
}
|
}
|
||||||
|
@ -43,8 +43,24 @@ public class VirtualDirectoryNode extends AbstractAbstractFileNode<VirtualDirect
|
|||||||
super(ld);
|
super(ld);
|
||||||
|
|
||||||
this.setDisplayName(nameForLayoutFile(ld));
|
this.setDisplayName(nameForLayoutFile(ld));
|
||||||
|
|
||||||
|
String name = ld.getName();
|
||||||
|
|
||||||
|
//set icon for name, special case for some built-ins
|
||||||
|
if (name.equals(VirtualDirectory.NAME_UNALLOC)) {
|
||||||
this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/folder-icon-deleted.png");
|
this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/folder-icon-deleted.png");
|
||||||
}
|
}
|
||||||
|
else if (name.equals(VirtualDirectory.NAME_LOCAL)) {
|
||||||
|
this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/folder-local-icon-16.png");
|
||||||
|
}
|
||||||
|
else if (name.equals(VirtualDirectory.NAME_CARVED)) {
|
||||||
|
this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/Folder-icon.png"); //TODO
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/Folder-icon.png");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected Sheet createSheet() {
|
protected Sheet createSheet() {
|
||||||
|
BIN
Core/src/org/sleuthkit/autopsy/images/folder-local-icon-16.png
Normal file
BIN
Core/src/org/sleuthkit/autopsy/images/folder-local-icon-16.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 730 B |
Loading…
x
Reference in New Issue
Block a user