Fixed UI hang and updated number of hits column name.

This commit is contained in:
Jeff Wallace 2013-10-29 13:35:53 -04:00
parent 952b05c909
commit b18cf9a02f

View File

@ -20,7 +20,7 @@ package org.sleuthkit.autopsy.datamodel;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
@ -28,7 +28,6 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.logging.Level; import java.util.logging.Level;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
import org.openide.nodes.AbstractNode;
import org.openide.nodes.ChildFactory; import org.openide.nodes.ChildFactory;
import org.openide.nodes.Children; import org.openide.nodes.Children;
import org.openide.nodes.Node; import org.openide.nodes.Node;
@ -242,7 +241,7 @@ public class KeywordHits implements AutopsyVisitableItem {
ss = Sheet.createPropertiesSet(); ss = Sheet.createPropertiesSet();
s.put(ss); s.put(ss);
} }
ss.put(new NodeProperty("List Name", ss.put(new NodeProperty("List Name",
"List Name", "List Name",
"no description", "no description",
@ -323,15 +322,15 @@ public class KeywordHits implements AutopsyVisitableItem {
ss = Sheet.createPropertiesSet(); ss = Sheet.createPropertiesSet();
s.put(ss); s.put(ss);
} }
ss.put(new NodeProperty("List Name", ss.put(new NodeProperty("List Name",
"List Name", "List Name",
"no description", "no description",
name)); name));
ss.put(new NodeProperty("Number of Hits", ss.put(new NodeProperty("Files with Hits",
"Number of Hits", "Files with Hits",
"no description", "no description",
children.size())); children.size()));
@ -350,14 +349,16 @@ public class KeywordHits implements AutopsyVisitableItem {
@Override @Override
protected boolean createKeys(List<BlackboardArtifact> list) { protected boolean createKeys(List<BlackboardArtifact> list) {
List<BlackboardArtifact> tempList = new ArrayList<>();
for (long l : children) { for (long l : children) {
try { try {
//TODO: bulk artifact gettings //TODO: bulk artifact gettings
list.add(skCase.getBlackboardArtifact(l)); tempList.add(skCase.getBlackboardArtifact(l));
} catch (TskException ex) { } catch (TskException ex) {
logger.log(Level.WARNING, "TSK Exception occurred", ex); logger.log(Level.WARNING, "TSK Exception occurred", ex);
} }
} }
list.addAll(tempList);
return true; return true;
} }