From ff946979a1bf7de7714deef0c1f87659ed2f3754 Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Fri, 30 Apr 2021 12:49:16 -0400 Subject: [PATCH] cleanup --- .../autopsy/datamodel/AnalysisResults.java | 4 +- .../autopsy/datamodel/AutopsyItemVisitor.java | 14 --- .../datamodel/AutopsyTreeChildFactory.java | 7 +- .../autopsy/datamodel/DataArtifacts.java | 4 +- .../datamodel/DisplayableItemNodeVisitor.java | 10 -- .../autopsy/datamodel/EmailExtracted.java | 36 ++++--- .../autopsy/datamodel/ExtractedContent.java | 74 ++------------ .../autopsy/datamodel/HashsetHits.java | 7 +- .../autopsy/datamodel/InterestingHits.java | 14 ++- .../autopsy/datamodel/KeywordHits.java | 4 +- .../sleuthkit/autopsy/datamodel/Results.java | 52 ---------- .../autopsy/datamodel/ResultsNode.java | 97 ------------------- .../datamodel/RootContentChildren.java | 13 --- .../autopsy/datamodel/accounts/Accounts.java | 1 - 14 files changed, 44 insertions(+), 293 deletions(-) delete mode 100644 Core/src/org/sleuthkit/autopsy/datamodel/Results.java delete mode 100644 Core/src/org/sleuthkit/autopsy/datamodel/ResultsNode.java diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AnalysisResults.java b/Core/src/org/sleuthkit/autopsy/datamodel/AnalysisResults.java index ed6bd37319..b0f038ba4a 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/AnalysisResults.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/AnalysisResults.java @@ -1,7 +1,7 @@ /* * Autopsy Forensic Browser * - * Copyright 2011 Basis Technology Corp. + * Copyright 2021 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -19,7 +19,7 @@ package org.sleuthkit.autopsy.datamodel; /** - * Analysis Results node support + * Analysis Results node support. */ public class AnalysisResults implements AutopsyVisitableItem { diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java index ed719a341e..9791d0d5fd 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyItemVisitor.java @@ -53,8 +53,6 @@ public interface AutopsyItemVisitor { T visit(FileSize.FileSizeFilter fsf); - T visit(ExtractedContent ec); - T visit(KeywordHits kh); T visit(HashsetHits hh); @@ -63,8 +61,6 @@ public interface AutopsyItemVisitor { T visit(InterestingHits ih); - T visit(Results r); - T visit(Tags tagsNodeKey); T visit(Reports reportsItem); @@ -94,11 +90,6 @@ public interface AutopsyItemVisitor { protected abstract T defaultVisit(AutopsyVisitableItem ec); - @Override - public T visit(ExtractedContent ec) { - return defaultVisit(ec); - } - @Override public T visit(FileTypesByExtension sf) { return defaultVisit(sf); @@ -204,11 +195,6 @@ public interface AutopsyItemVisitor { return defaultVisit(personGrouping); } - @Override - public T visit(Results r) { - return defaultVisit(r); - } - @Override public T visit(FileTypes ft) { return defaultVisit(ft); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyTreeChildFactory.java b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyTreeChildFactory.java index 9ebb44cb40..845591e261 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyTreeChildFactory.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/AutopsyTreeChildFactory.java @@ -92,7 +92,6 @@ public final class AutopsyTreeChildFactory extends ChildFactory.Detachable keys = new ArrayList<>(Arrays.asList( diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DataArtifacts.java b/Core/src/org/sleuthkit/autopsy/datamodel/DataArtifacts.java index e273d8cf12..2c52278459 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/DataArtifacts.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/DataArtifacts.java @@ -1,7 +1,7 @@ /* * Autopsy Forensic Browser * - * Copyright 2011 Basis Technology Corp. + * Copyright 2021 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -19,7 +19,7 @@ package org.sleuthkit.autopsy.datamodel; /** - * Analysis Results node support + * Analysis Results node support. */ public class DataArtifacts implements AutopsyVisitableItem { diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNodeVisitor.java b/Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNodeVisitor.java index 61bc401ee5..4cdb32ff2c 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNodeVisitor.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNodeVisitor.java @@ -88,11 +88,6 @@ public interface DisplayableItemNodeVisitor { T visit(RecentFilesFilterNode rffn); - /* - * Extracted Results Area - */ - T visit(ResultsNode rn); - T visit(BlackboardArtifactNode ban); T visit(ExtractedContent.TypeNode atn); @@ -405,11 +400,6 @@ public interface DisplayableItemNodeVisitor { return defaultVisit(dataSourceGroupingNode); } - @Override - public T visit(ResultsNode rn) { - return defaultVisit(rn); - } - @Override public T visit(FileTypesNode ft) { return defaultVisit(ft); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java b/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java index 9e3555d438..d042573e53 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java @@ -91,7 +91,7 @@ public class EmailExtracted implements AutopsyVisitableItem { private SleuthkitCase skCase; private final EmailResults emailResults; private final long filteringDSObjId; // 0 if not filtering/grouping by data source - + /** * Constructor * @@ -147,7 +147,7 @@ public class EmailExtracted implements AutopsyVisitableItem { } @SuppressWarnings("deprecation") - public void update() { + public void update() { // clear cache if no case if (skCase == null) { synchronized (accounts) { @@ -159,20 +159,20 @@ public class EmailExtracted implements AutopsyVisitableItem { // get artifact id and path (if present) of all email artifacts int emailArtifactId = BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG.getTypeID(); int pathAttrId = BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PATH.getTypeID(); - - String query = "SELECT \n" + - " art.artifact_id AS artifact_id,\n" + - " (SELECT value_text FROM blackboard_attributes attr\n" + - " WHERE attr.artifact_id = art.artifact_id AND attr.attribute_type_id = " + pathAttrId + "\n" + - " LIMIT 1) AS value_text\n" + - "FROM \n" + - " blackboard_artifacts art\n" + - " WHERE art.artifact_type_id = " + emailArtifactId + "\n" + - ((filteringDSObjId > 0) ? " AND art.data_source_obj_id = " + filteringDSObjId : ""); - + + String query = "SELECT \n" + + " art.artifact_id AS artifact_id,\n" + + " (SELECT value_text FROM blackboard_attributes attr\n" + + " WHERE attr.artifact_id = art.artifact_id AND attr.attribute_type_id = " + pathAttrId + "\n" + + " LIMIT 1) AS value_text\n" + + "FROM \n" + + " blackboard_artifacts art\n" + + " WHERE art.artifact_type_id = " + emailArtifactId + "\n" + + ((filteringDSObjId > 0) ? " AND art.data_source_obj_id = " + filteringDSObjId : ""); + // form hierarchy of account -> folder -> account id Map>> newMapping = new HashMap<>(); - + try (CaseDbQuery dbQuery = skCase.executeQuery(query)) { ResultSet resultSet = dbQuery.getResultSet(); while (resultSet.next()) { @@ -180,7 +180,7 @@ public class EmailExtracted implements AutopsyVisitableItem { Map accountFolderMap = parsePath(resultSet.getString("value_text")); String account = accountFolderMap.get(MAIL_ACCOUNT); String folder = accountFolderMap.get(MAIL_FOLDER); - + Map> folders = newMapping.computeIfAbsent(account, (str) -> new LinkedHashMap<>()); List messages = folders.computeIfAbsent(folder, (str) -> new ArrayList<>()); messages.add(artifactId); @@ -188,18 +188,16 @@ public class EmailExtracted implements AutopsyVisitableItem { } catch (TskCoreException | SQLException ex) { logger.log(Level.WARNING, "Cannot initialize email extraction: ", ex); //NON-NLS } - - + synchronized (accounts) { accounts.clear(); accounts.putAll(newMapping); } - + setChanged(); notifyObservers(); } } - /** * Mail root node grouping all mail accounts, supports account-> folder diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java index 48519061d0..ac9435cea0 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java @@ -20,11 +20,9 @@ package org.sleuthkit.autopsy.datamodel; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.util.Collection; import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.logging.Level; @@ -66,61 +64,9 @@ import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWO * Parent of the "extracted content" artifacts to be displayed in the tree. * Other artifacts are displayed under other more specific parents. */ -public class ExtractedContent implements AutopsyVisitableItem { +public class ExtractedContent { private static final Set INGEST_JOB_EVENTS_OF_INTEREST = EnumSet.of(IngestManager.IngestJobEvent.COMPLETED, IngestManager.IngestJobEvent.CANCELLED); - public static final String NAME = NbBundle.getMessage(RootNode.class, "ExtractedContentNode.name.text"); - private static final Category DEFAULT_CATEGORY = Category.DATA_ARTIFACT; - - private final long filteringDSObjId; // 0 if not filtering/grouping by data source - private SleuthkitCase skCase; // set to null after case has been closed - private final Category category; - - /** - * Constructs extracted content object - * - * @param skCase Case DB - */ - public ExtractedContent(SleuthkitCase skCase) { - this(skCase, 0, DEFAULT_CATEGORY); - } - - public ExtractedContent(SleuthkitCase skCase, Category category) { - this(skCase, 0, DEFAULT_CATEGORY); - } - - /** - * Constructs extracted content object - * - * @param skCase Case DB - * @param objId Object id of the parent datasource - */ - public ExtractedContent(SleuthkitCase skCase, long objId) { - this(skCase, objId, DEFAULT_CATEGORY); - } - - public ExtractedContent(SleuthkitCase skCase, long dataSourceObjId, Category category) { - this.skCase = skCase; - this.filteringDSObjId = dataSourceObjId; - this.category = category; - } - - @Override - public T accept(AutopsyItemVisitor visitor) { - return visitor.visit(this); - } - - public SleuthkitCase getSleuthkitCase() { - return skCase; - } - - long getFilteringDSObjId() { - return filteringDSObjId; - } - - Category getCategory() { - return category; - } @Messages({ "AnalysisResultsNode_name=Analysis Results",}) @@ -177,7 +123,7 @@ public class ExtractedContent implements AutopsyVisitableItem { sheetSet.put(new NodeProperty<>(NbBundle.getMessage(this.getClass(), "ExtractedContentNode.createSheet.name.name"), NbBundle.getMessage(this.getClass(), "ExtractedContentNode.createSheet.name.displayName"), NbBundle.getMessage(this.getClass(), "ExtractedContentNode.createSheet.name.desc"), - NAME)); + super.getDisplayName())); return sheet; } @@ -211,11 +157,11 @@ public class ExtractedContent implements AutopsyVisitableItem { this(new TypeNode(type, dsObjId), type); } - private TypeNodeRecord(UpdatableTypeCountNode typeNode, BlackboardArtifact.Type...types) { + private TypeNodeRecord(UpdatableTypeCountNode typeNode, BlackboardArtifact.Type... types) { this(typeNode, typeNode::updateDisplayName, types); } - TypeNodeRecord(Node node, Runnable onUpdate, BlackboardArtifact.Type...types) { + TypeNodeRecord(Node node, Runnable onUpdate, BlackboardArtifact.Type... types) { this.node = node; this.onUpdate = onUpdate; this.applicableTypes = Stream.of(types) @@ -273,13 +219,13 @@ public class ExtractedContent implements AutopsyVisitableItem { KeywordHits.RootNode keywordsNode = new KeywordHits(skCase, dsObjId).new RootNode(); return new TypeNodeRecord(keywordsNode, new BlackboardArtifact.Type(TSK_KEYWORD_HIT)); - } else if (TSK_INTERESTING_ARTIFACT_HIT.getTypeID() == typeId || - TSK_INTERESTING_FILE_HIT.getTypeID() == typeId) { - + } else if (TSK_INTERESTING_ARTIFACT_HIT.getTypeID() == typeId + || TSK_INTERESTING_FILE_HIT.getTypeID() == typeId) { + InterestingHits.RootNode interestingHitsNode = new InterestingHits(skCase, dsObjId).new RootNode(); - return new TypeNodeRecord(interestingHitsNode, - new BlackboardArtifact.Type(TSK_INTERESTING_ARTIFACT_HIT), - new BlackboardArtifact.Type(TSK_INTERESTING_FILE_HIT)); + return new TypeNodeRecord(interestingHitsNode, + new BlackboardArtifact.Type(TSK_INTERESTING_ARTIFACT_HIT), + new BlackboardArtifact.Type(TSK_INTERESTING_FILE_HIT)); } else { return new TypeNodeRecord(type, dsObjId); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java index c063081699..7a04d3cf33 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/HashsetHits.java @@ -48,14 +48,12 @@ import org.sleuthkit.autopsy.ingest.ModuleDataEvent; import org.sleuthkit.datamodel.BlackboardArtifact; import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE; import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_HASHSET_HIT; -import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT; import org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE; import org.sleuthkit.datamodel.SleuthkitCase; import org.sleuthkit.datamodel.SleuthkitCase.CaseDbQuery; import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.autopsy.datamodel.ExtractedContent.UpdatableTypeCountNode; - /** * Hash set hits node support. Inner classes have all of the nodes in the tree. */ @@ -70,7 +68,6 @@ public class HashsetHits implements AutopsyVisitableItem { private final HashsetResults hashsetResults; private final long filteringDSObjId; // 0 if not filtering/grouping by data source - /** * Constructor * @@ -176,12 +173,12 @@ public class HashsetHits implements AutopsyVisitableItem { public class RootNode extends UpdatableTypeCountNode { public RootNode() { - super(Children.create(new HashsetNameFactory(), true), + super(Children.create(new HashsetNameFactory(), true), Lookups.singleton(DISPLAY_NAME), DISPLAY_NAME, filteringDSObjId, new BlackboardArtifact.Type(TSK_HASHSET_HIT)); - + super.setName(HASHSET_HITS); super.setDisplayName(DISPLAY_NAME); this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/hashset_hits.png"); //NON-NLS diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java index 93b6480c26..27d08f3781 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/InterestingHits.java @@ -51,8 +51,6 @@ import org.sleuthkit.datamodel.SleuthkitCase; import org.sleuthkit.datamodel.SleuthkitCase.CaseDbQuery; import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.autopsy.datamodel.ExtractedContent.UpdatableTypeCountNode; -import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT; - public class InterestingHits implements AutopsyVisitableItem { @@ -171,7 +169,7 @@ public class InterestingHits implements AutopsyVisitableItem { public class RootNode extends UpdatableTypeCountNode { public RootNode() { - super(Children.create(new SetNameFactory(), true), + super(Children.create(new SetNameFactory(), true), Lookups.singleton(DISPLAY_NAME), DISPLAY_NAME, filteringDSObjId, @@ -407,8 +405,8 @@ public class InterestingHits implements AutopsyVisitableItem { this.typeName = typeName; this.setName = setName; /** - * We use the combination of setName and typeName as the name of - * the node to ensure that nodes have a unique name. This comes into + * We use the combination of setName and typeName as the name of the + * node to ensure that nodes have a unique name. This comes into * play when associating paging state with the node. */ super.setName(setName + "_" + typeName); @@ -469,9 +467,9 @@ public class InterestingHits implements AutopsyVisitableItem { private HitFactory(String setName, String typeName) { /** - * The node name passed to the parent constructor must be the - * same as the name set in the InterestingItemTypeNode constructor, - * i.e. setName underscore typeName + * The node name passed to the parent constructor must be the same + * as the name set in the InterestingItemTypeNode constructor, i.e. + * setName underscore typeName */ super(setName + "_" + typeName); this.setName = setName; diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java b/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java index 82ea4263b1..6713a6722b 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java @@ -105,7 +105,7 @@ public class KeywordHits implements AutopsyVisitableItem { static private boolean isOnlyDefaultInstance(List instances) { return (instances.size() == 1) && (instances.get(0).equals(DEFAULT_INSTANCE_NAME)); } - + /** * Constructor * @@ -380,7 +380,7 @@ public class KeywordHits implements AutopsyVisitableItem { public class RootNode extends UpdatableTypeCountNode { public RootNode() { - super(Children.create(new ListFactory(), true), + super(Children.create(new ListFactory(), true), Lookups.singleton(KEYWORD_HITS), KEYWORD_HITS, filteringDSObjId, diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Results.java b/Core/src/org/sleuthkit/autopsy/datamodel/Results.java deleted file mode 100644 index b2d9f4799b..0000000000 --- a/Core/src/org/sleuthkit/autopsy/datamodel/Results.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Autopsy Forensic Browser - * - * Copyright 2011 Basis Technology Corp. - * Contact: carrier sleuthkit org - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.sleuthkit.autopsy.datamodel; - -import org.sleuthkit.datamodel.SleuthkitCase; - -/** - * Results node support - */ -public class Results implements AutopsyVisitableItem { - - private SleuthkitCase skCase; - private final long datasourceObjId; - - public Results(SleuthkitCase skCase) { - this(skCase, 0); - } - - public Results(SleuthkitCase skCase, long dsObjId) { - this.skCase = skCase; - this.datasourceObjId = dsObjId; - } - - @Override - public T accept(AutopsyItemVisitor visitor) { - return visitor.visit(this); - } - - public SleuthkitCase getSleuthkitCase() { - return skCase; - } - - long filteringDataSourceObjId() { - return datasourceObjId; - } -} diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ResultsNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/ResultsNode.java deleted file mode 100644 index e9b2eba696..0000000000 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ResultsNode.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Autopsy Forensic Browser - * - * Copyright 2011-2018 Basis Technology Corp. - * Contact: carrier sleuthkit org - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.sleuthkit.autopsy.datamodel; - -import org.sleuthkit.autopsy.datamodel.accounts.Accounts; -import java.util.Arrays; -import org.openide.nodes.Sheet; -import org.openide.util.NbBundle; -import org.openide.util.lookup.Lookups; -import org.sleuthkit.datamodel.SleuthkitCase; - -/** - * Node for the results section of the tree. - */ -public class ResultsNode extends DisplayableItemNode { - - @NbBundle.Messages("ResultsNode.name.text=Results") - private static final String NAME = Bundle.ResultsNode_name_text(); - - public static String getNameIdentifier() { - return NAME; - } - - public ResultsNode(SleuthkitCase sleuthkitCase) { - this(sleuthkitCase, 0); - } - - public ResultsNode(SleuthkitCase sleuthkitCase, long dsObjId) { - super( - - new RootContentChildren(Arrays.asList( - new ExtractedContent(sleuthkitCase, dsObjId ), - new KeywordHits(sleuthkitCase, dsObjId), - new HashsetHits(sleuthkitCase, dsObjId), - new EmailExtracted(sleuthkitCase, dsObjId), - new InterestingHits(sleuthkitCase, dsObjId ), - new Accounts(sleuthkitCase, dsObjId), - new OsAccounts(sleuthkitCase, dsObjId)) - ), - Lookups.singleton(NAME)); - setName(NAME); - setDisplayName(NAME); - this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/results.png"); //NON-NLS - } - - @Override - public boolean isLeafTypeNode() { - return false; - } - - @Override - public T accept(DisplayableItemNodeVisitor visitor) { - return visitor.visit(this); - } - - @Override - @NbBundle.Messages({ - "ResultsNode.createSheet.name.name=Name", - "ResultsNode.createSheet.name.displayName=Name", - "ResultsNode.createSheet.name.desc=no description"}) - protected Sheet createSheet() { - Sheet sheet = super.createSheet(); - Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES); - if (sheetSet == null) { - sheetSet = Sheet.createPropertiesSet(); - sheet.put(sheetSet); - } - - sheetSet.put(new NodeProperty<>(Bundle.ResultsNode_createSheet_name_name(), - Bundle.ResultsNode_createSheet_name_displayName(), - Bundle.ResultsNode_createSheet_name_desc(), - NAME - )); - return sheet; - } - - @Override - public String getItemType() { - return getClass().getName(); - } -} diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/RootContentChildren.java b/Core/src/org/sleuthkit/autopsy/datamodel/RootContentChildren.java index 192a966490..ed1af75078 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/RootContentChildren.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/RootContentChildren.java @@ -25,8 +25,6 @@ import org.openide.nodes.Children; import org.openide.nodes.Node; import org.openide.util.NbBundle; import org.sleuthkit.autopsy.datamodel.accounts.Accounts; -import org.sleuthkit.datamodel.BlackboardArtifact; -import org.sleuthkit.datamodel.BlackboardArtifact.Category; import org.sleuthkit.datamodel.SleuthkitVisitableItem; /** @@ -84,12 +82,6 @@ public class RootContentChildren extends Children.Keys { * Set Hits, etc.). */ static class CreateAutopsyNodeVisitor extends AutopsyItemVisitor.Default { - - @Override - public ExtractedContent.RootNode visit(ExtractedContent ec) { - return new ExtractedContent.DataArtifactsNode(0); - } - @Override public AbstractNode visit(FileTypesByExtension sf) { return sf.new FileTypesByExtNode(sf.getSleuthkitCase(), null); @@ -150,11 +142,6 @@ public class RootContentChildren extends Children.Keys { return new ViewsNode(v.getSleuthkitCase(), v.filteringDataSourceObjId()); } - @Override - public AbstractNode visit(Results results) { - return new ResultsNode(results.getSleuthkitCase(), results.filteringDataSourceObjId()); - } - @Override public AbstractNode visit(FileTypes ft) { return ft.new FileTypesNode(); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/accounts/Accounts.java b/Core/src/org/sleuthkit/autopsy/datamodel/accounts/Accounts.java index 2eb2c6e021..e8ec4f42bc 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/accounts/Accounts.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/accounts/Accounts.java @@ -69,7 +69,6 @@ import org.sleuthkit.autopsy.datamodel.CreditCards; import org.sleuthkit.autopsy.datamodel.DataModelActionsFactory; import org.sleuthkit.autopsy.datamodel.DisplayableItemNode; import org.sleuthkit.autopsy.datamodel.DisplayableItemNodeVisitor; -import org.sleuthkit.autopsy.datamodel.ExtractedContent; import org.sleuthkit.autopsy.datamodel.ExtractedContent.UpdatableTypeCountNode; import org.sleuthkit.autopsy.datamodel.NodeProperty; import org.sleuthkit.autopsy.directorytree.DirectoryTreeTopComponent;