Merge pull request #1758 from mhmdfy/change-enum-to-string

change itemtype to string
This commit is contained in:
Richard Cordovano 2015-12-08 15:02:00 -05:00
commit bcb45844c6
29 changed files with 111 additions and 196 deletions

View File

@ -57,7 +57,6 @@ import org.openide.util.NbPreferences;
import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer; import org.sleuthkit.autopsy.corecomponentinterfaces.DataResultViewer;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.datamodel.DisplayableItemNode.ItemType;
/** /**
* DataResult sortable table viewer * DataResult sortable table viewer
@ -467,7 +466,7 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
// Get unique name for node and it's property. // Get unique name for node and it's property.
private String getUniqueName(Node root, Property<?> prop) { private String getUniqueName(Node root, Property<?> prop) {
ItemType type = ItemType.GENERIC; String type = "Generic";
if(root instanceof TableFilterNode) { if(root instanceof TableFilterNode) {
TableFilterNode filterNode = (TableFilterNode) root; TableFilterNode filterNode = (TableFilterNode) root;
type = filterNode.getItemType(); type = filterNode.getItemType();

View File

@ -18,13 +18,9 @@
*/ */
package org.sleuthkit.autopsy.corecomponents; package org.sleuthkit.autopsy.corecomponents;
import java.util.logging.Level;
import org.openide.nodes.FilterNode; import org.openide.nodes.FilterNode;
import org.openide.nodes.Node; import org.openide.nodes.Node;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.datamodel.KnownFileFilterNode;
import org.sleuthkit.autopsy.datamodel.DisplayableItemNode.ItemType;
/** /**
* This class is used to filter the nodes that we want to show on the * This class is used to filter the nodes that we want to show on the
@ -36,7 +32,7 @@ import org.sleuthkit.autopsy.datamodel.DisplayableItemNode.ItemType;
public class TableFilterNode extends FilterNode { public class TableFilterNode extends FilterNode {
private boolean createChild; private boolean createChild;
private ItemType itemType; private String itemType;
/** /**
* the constructor * the constructor
@ -44,10 +40,10 @@ public class TableFilterNode extends FilterNode {
public TableFilterNode(Node arg, boolean crChild) { public TableFilterNode(Node arg, boolean crChild) {
super(arg, TableFilterChildren.createInstance(arg, crChild)); super(arg, TableFilterChildren.createInstance(arg, crChild));
this.createChild = crChild; this.createChild = crChild;
this.itemType = ItemType.GENERIC; this.itemType = "Generic";
} }
public TableFilterNode(Node arg, boolean crChild, ItemType itemType) { public TableFilterNode(Node arg, boolean crChild, String itemType) {
super(arg, TableFilterChildren.createInstance(arg, crChild)); super(arg, TableFilterChildren.createInstance(arg, crChild));
this.createChild = crChild; this.createChild = crChild;
this.itemType = itemType; this.itemType = itemType;
@ -68,7 +64,7 @@ public class TableFilterNode extends FilterNode {
} }
} }
public ItemType getItemType() { public String getItemType() {
return itemType; return itemType;
} }
} }

View File

@ -488,7 +488,7 @@ public class BlackboardArtifactNode extends DisplayableItemNode {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.BLACKBOARD_ARTIFACT; return "BlackboardArtifact";
} }
} }

View File

@ -109,7 +109,7 @@ public class BlackboardArtifactTagNode extends DisplayableItemNode {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.BLACKBOARD_ARTIFACT_TAG; return "BlackboardArtifactTag";
} }
} }

View File

@ -123,7 +123,7 @@ class ContentTagNode extends DisplayableItemNode {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.CONTENT_TAG; return "ContentTag";
} }
} }

View File

@ -57,8 +57,8 @@ public class DataSourcesNode extends DisplayableItemNode {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.DATA_SOURCES; return "DataSources";
} }
/* /*

View File

@ -148,8 +148,8 @@ public class DeletedContent implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.DELETED_CONTENT; return "DeletedContent";
} }
} }
@ -281,8 +281,8 @@ public class DeletedContent implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.DELETED_CONTENT_CHILDREN; return "DeletedContentChildren";
} }
// update the display name when new events are fired // update the display name when new events are fired

View File

@ -102,7 +102,7 @@ public class DirectoryNode extends AbstractFsContentNode<AbstractFile> {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.DIRECTORY; return "Directory";
} }
} }

View File

@ -41,85 +41,5 @@ public abstract class DisplayableItemNode extends AbstractNode {
public abstract <T> T accept(DisplayableItemNodeVisitor<T> v); public abstract <T> T accept(DisplayableItemNodeVisitor<T> v);
public abstract ItemType getItemType(); public abstract String getItemType();
public enum ItemType {
GENERIC("Generic"),
BLACKBOARD_ARTIFACT("BlackboardArtifact"),
BLACKBOARD_ARTIFACT_TAG("BlackboardArtifactTag"),
CONTENT_TAG("ContentTag"),
DATA_SOURCES("DataSources"),
DELETED_CONTENT("DeletedContent"),
DELETED_CONTENT_CHILDREN("DeletedContentChildren"),
DIRECTORY("Directory"),
EMAIL_EXTRACTED_ROOT("EmailExtractedRoot"),
EMAIL_EXTRACTED_ACCOUNT("EmailExtractedAccount"),
EMAIL_EXTRACTED_FOLDER("EmailExtractedFolder"),
EXTRACTED_CONTENT_ROOT("ExtractedContentRoot"),
EXTRACTED_CONTENT_TYPE("ExtractedContentType"),
EXTRACTED_BOOKMARKS("ExtractedBookmarks"),
EXTRACTED_COOKIES("ExtractedCookies"),
EXTRACTED_HISTORY("ExtractedHistory"),
EXTRACTED_DOWNLOADS("ExtractedDownloads"),
EXTRACTED_PROGRAMS("ExtractedPrograms"),
EXTRACTED_RECENT("ExtractedRecent"),
EXTRACTED_ATTACHED_DEVICES("ExtractedAttachedDevices"),
EXTRACTED_SEARCH("ExtractedSearch"),
EXTRACTED_METADATA_EXIF("ExtractedMetadataExif"),
EXTRACTED_EMAIL_MSG("ExtractedEmailMsg"),
EXTRACTED_CONTACTS("ExtractedContacts"),
EXTRACTED_MESSAGES("ExtractedMessages"),
EXTRACTED_CALL_LOG("ExtractedCallLog"),
EXTRACTED_CALENDAR("ExtractedCalendar"),
EXTRACTED_SPEED_DIAL("ExtractedSpeedDial"),
EXTRACTED_BLUETOOTH("ExtractedBluetooth"),
EXTRACTED_GPS_BOOKMARKS("ExtractedGPSBookmarks"),
EXTRACTED_GPS_LAST_LOCATION("ExtractedGPSLastLocation"),
EXTRACTED_GPS_SEARCH("ExtractedGPSSearch"),
EXTRACTED_SERVICE_ACCOUNT("ExtractedServiceAccount"),
EXTRACTED_ENCRYPTION("ExtractedEncryption"),
EXTRACTED_EXT_MISMATCH("ExtractedExtMismatch"),
EXTRACTED_OS("ExtractedOS"),
EXTRACTED_FACE_DETECTED("ExtractedFaceDetected"),
FILE("File"),
FILE_SIZE_ROOT("FileSizeRoot"),
FILE_SIZE("FileSize"),
FILE_TYPE("FileType"),
FILE_TYPES("FileTypes"),
FILE_TYPES_DOC("FileTypesDoc"),
FILE_TYPES_EXE("FileTypesExe"),
HASHSET_ROOT("HashsetRoot"),
HASHSET_NAME("HashsetName"),
IMAGE("Image"),
INTERESTING_HITS_ROOT("InterestingHitsRoot"),
INTERESTING_HITS_SET_NAME("InterestingHitsSetName"),
KEYWORD_ROOT("KeywordRoot"),
KEYWORD_LIST("KeywordList"),
KEYWORD_TERM("KeywordTerm"),
LAYOUT_FILE("LayoutFile"),
LOCAL_FILE("LocalFile"),
RECENT_FILES("RecentFiles"),
RECENT_FILES_FILTER("RecentFilesFilter"),
REPORTS("Reports"),
REPORTS_LIST("ReportsList"),
RESULTS("Results"),
TAGS_ROOT("TagsRoots"),
TAGS_NAME("TagsName"),
TAGS_CONTENT_TYPE("TagsContentType"),
TAGS_BLACKBOARD_ARTIFACT("TagsBlackboardArtifact"),
VIEWS("Views"),
VIRTUAL_DIRECTORY("VirtualDirectory"),
VOLUME("Volume"),
EVENT("Event"),
EVENT_ROOT("EventRoot");
private final String name;
private ItemType(String name) {
this.name = name;
}
@Override
public String toString() {
return this.name;
}
}
} }

View File

@ -192,8 +192,8 @@ public class EmailExtracted implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.EMAIL_EXTRACTED_ROOT; return "EmailExtractedRoot";
} }
} }
@ -347,8 +347,8 @@ public class EmailExtracted implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.EMAIL_EXTRACTED_ACCOUNT; return "EmailExtractedAccount";
} }
} }
@ -438,8 +438,8 @@ public class EmailExtracted implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.EMAIL_EXTRACTED_FOLDER; return "EmailExtractedFolder";
} }
} }

View File

@ -120,8 +120,8 @@ public class ExtractedContent implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.EXTRACTED_CONTENT_ROOT; return "ExtractedContentRoot";
} }
} }
@ -374,59 +374,59 @@ public class ExtractedContent implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
switch (type) { switch (type) {
case TSK_WEB_BOOKMARK: case TSK_WEB_BOOKMARK:
return ItemType.EXTRACTED_BOOKMARKS; return "ExtractedBookmarks";
case TSK_WEB_COOKIE: case TSK_WEB_COOKIE:
return ItemType.EXTRACTED_COOKIES; return "ExtractedCookies";
case TSK_WEB_HISTORY: case TSK_WEB_HISTORY:
return ItemType.EXTRACTED_HISTORY; return "ExtractedHistory";
case TSK_WEB_DOWNLOAD: case TSK_WEB_DOWNLOAD:
return ItemType.EXTRACTED_DOWNLOADS; return "ExtractedDownloads";
case TSK_INSTALLED_PROG: case TSK_INSTALLED_PROG:
return ItemType.EXTRACTED_PROGRAMS; return "ExtractedPrograms";
case TSK_RECENT_OBJECT: case TSK_RECENT_OBJECT:
return ItemType.EXTRACTED_RECENT; return "ExtractedRecent";
case TSK_DEVICE_ATTACHED: case TSK_DEVICE_ATTACHED:
return ItemType.EXTRACTED_ATTACHED_DEVICES; return "ExtractedAttachedDevices";
case TSK_WEB_SEARCH_QUERY: case TSK_WEB_SEARCH_QUERY:
return ItemType.EXTRACTED_SEARCH; return "ExtractedSearch";
case TSK_METADATA_EXIF: case TSK_METADATA_EXIF:
return ItemType.EXTRACTED_METADATA_EXIF; return "ExtractedMetadataExif";
case TSK_EMAIL_MSG: case TSK_EMAIL_MSG:
return ItemType.EXTRACTED_EMAIL_MSG; return "ExtractedEmailMsg";
case TSK_CONTACT: case TSK_CONTACT:
return ItemType.EXTRACTED_CONTACTS; return "ExtractedContants";
case TSK_MESSAGE: case TSK_MESSAGE:
return ItemType.EXTRACTED_MESSAGES; return "ExtractedMessages";
case TSK_CALLLOG: case TSK_CALLLOG:
return ItemType.EXTRACTED_CALL_LOG; return "ExtractedCallLog";
case TSK_CALENDAR_ENTRY: case TSK_CALENDAR_ENTRY:
return ItemType.EXTRACTED_CALENDAR; return "ExtractedCalendar";
case TSK_SPEED_DIAL_ENTRY: case TSK_SPEED_DIAL_ENTRY:
return ItemType.EXTRACTED_SPEED_DIAL; return "ExtractedSpeedDial";
case TSK_BLUETOOTH_PAIRING: case TSK_BLUETOOTH_PAIRING:
return ItemType.EXTRACTED_BLUETOOTH; return "ExtractedBluetooth";
case TSK_GPS_BOOKMARK: case TSK_GPS_BOOKMARK:
return ItemType.EXTRACTED_GPS_BOOKMARKS; return "ExtractedGPSBookmarks";
case TSK_GPS_LAST_KNOWN_LOCATION: case TSK_GPS_LAST_KNOWN_LOCATION:
return ItemType.EXTRACTED_GPS_LAST_LOCATION; return "ExtractedGPSLastLocation";
case TSK_GPS_SEARCH: case TSK_GPS_SEARCH:
return ItemType.EXTRACTED_GPS_SEARCH; return "ExtractedGPSSearch";
case TSK_SERVICE_ACCOUNT: case TSK_SERVICE_ACCOUNT:
return ItemType.EXTRACTED_SERVICE_ACCOUNT; return "ExtractedServiceAccount";
case TSK_ENCRYPTION_DETECTED: case TSK_ENCRYPTION_DETECTED:
return ItemType.EXTRACTED_ENCRYPTION; return "ExtractedEncryption";
case TSK_EXT_MISMATCH_DETECTED: case TSK_EXT_MISMATCH_DETECTED:
return ItemType.EXTRACTED_EXT_MISMATCH; return "ExtractedExtMismatch";
case TSK_OS_INFO: case TSK_OS_INFO:
return ItemType.EXTRACTED_OS; return "ExtractedOS";
case TSK_FACE_DETECTED: case TSK_FACE_DETECTED:
return ItemType.EXTRACTED_FACE_DETECTED; return "ExtractedFaceDetected";
} }
return ItemType.EXTRACTED_CONTENT_TYPE; return "ExtractedContentType";
} }
} }

View File

@ -185,7 +185,7 @@ public class FileNode extends AbstractFsContentNode<AbstractFile> {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.FILE; return "File";
} }
} }

View File

@ -145,8 +145,8 @@ public class FileSize implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.FILE_SIZE_ROOT; return "FileSizeRoot";
} }
} }
@ -287,8 +287,8 @@ public class FileSize implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.FILE_SIZE; return "FileSize";
} }
// update the display name when new events are fired // update the display name when new events are fired

View File

@ -83,8 +83,8 @@ public class FileTypeNode extends DisplayableItemNode {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.FILE_TYPE; return "FileType";
} }
// update the display name when new events are fired // update the display name when new events are fired

View File

@ -105,14 +105,14 @@ public class FileTypesNode extends DisplayableItemNode {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
if(filter == null) if(filter == null)
return ItemType.FILE_TYPES; return "FileTypes";
if (filter.equals(FileTypeExtensionFilters.RootFilter.TSK_DOCUMENT_FILTER)) if (filter.equals(FileTypeExtensionFilters.RootFilter.TSK_DOCUMENT_FILTER))
return ItemType.FILE_TYPES_DOC; return "FileTypesDoc";
if (filter.equals(FileTypeExtensionFilters.RootFilter.TSK_EXECUTABLE_FILTER)) if (filter.equals(FileTypeExtensionFilters.RootFilter.TSK_EXECUTABLE_FILTER))
return ItemType.FILE_TYPES_EXE; return "FileTypesExe";
return ItemType.FILE_TYPES; return "FileTypes";
} }
/** /**

View File

@ -170,8 +170,8 @@ public class HashsetHits implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.HASHSET_ROOT; return "HashsetRoot";
} }
} }
@ -328,8 +328,8 @@ public class HashsetHits implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.HASHSET_NAME; return "HashsetName";
} }
} }

View File

@ -111,7 +111,7 @@ public class ImageNode extends AbstractContentNode<Image> {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.IMAGE; return "Image";
} }
} }

View File

@ -163,8 +163,8 @@ public class InterestingHits implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.INTERESTING_HITS_ROOT; return "InterestingHitsRoot";
} }
} }
@ -314,8 +314,8 @@ public class InterestingHits implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.INTERESTING_HITS_SET_NAME; return "InterestingHitsSetName";
} }
} }

View File

@ -241,8 +241,8 @@ public class KeywordHits implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.KEYWORD_ROOT; return "KeywordRoot";
} }
} }
@ -396,8 +396,8 @@ public class KeywordHits implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.KEYWORD_LIST; return "KeywordList";
} }
} }
@ -494,8 +494,8 @@ public class KeywordHits implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.KEYWORD_TERM; return "KeywordTerm";
} }
} }

View File

@ -39,8 +39,8 @@ import org.sleuthkit.datamodel.TskData;
public class LayoutFileNode extends AbstractAbstractFileNode<LayoutFile> { public class LayoutFileNode extends AbstractAbstractFileNode<LayoutFile> {
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.LAYOUT_FILE; return "LayoutFile";
} }
public static enum LayoutContentPropertyType { public static enum LayoutContentPropertyType {

View File

@ -117,7 +117,7 @@ public class LocalFileNode extends AbstractAbstractFileNode<AbstractFile> {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.LOCAL_FILE; return "LocalFile";
} }
} }

View File

@ -84,7 +84,7 @@ public class RecentFilesFilterNode extends DisplayableItemNode {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.RECENT_FILES_FILTER; return "RecentFilesFilter";
} }
} }

View File

@ -67,7 +67,7 @@ public class RecentFilesNode extends DisplayableItemNode {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.RECENT_FILES; return "RecentFiles";
} }
} }

View File

@ -90,8 +90,8 @@ public final class Reports implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.REPORTS_LIST; return "ReportsList";
} }
} }
@ -215,8 +215,8 @@ public final class Reports implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.REPORTS; return "Reports";
} }
private static class DeleteReportAction extends AbstractAction { private static class DeleteReportAction extends AbstractAction {

View File

@ -70,7 +70,7 @@ public class ResultsNode extends DisplayableItemNode {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.RESULTS; return "Results";
} }
} }

View File

@ -110,8 +110,8 @@ public class Tags implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.TAGS_ROOT; return "TagsRoots";
} }
} }
@ -272,8 +272,8 @@ public class Tags implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.TAGS_NAME; return "TagsName";
} }
} }
@ -372,8 +372,8 @@ public class Tags implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.TAGS_CONTENT_TYPE; return "TagsContentType";
} }
} }
@ -470,8 +470,8 @@ public class Tags implements AutopsyVisitableItem {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.TAGS_BLACKBOARD_ARTIFACT; return "TagsBlackboardArtifact";
} }
} }

View File

@ -74,7 +74,7 @@ public class ViewsNode extends DisplayableItemNode {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.VIEWS; return "Views";
} }
} }

View File

@ -150,7 +150,7 @@ public class VirtualDirectoryNode extends AbstractAbstractFileNode<VirtualDirect
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.VIRTUAL_DIRECTORY; return "VirtualDirectory";
} }
} }

View File

@ -191,7 +191,7 @@ public class VolumeNode extends AbstractContentNode<Volume> {
} }
@Override @Override
public ItemType getItemType() { public String getItemType() {
return ItemType.VOLUME; return "Volume";
} }
} }