diff --git a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
index 4043c1d767..7ee3540366 100644
--- a/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
+++ b/CoreComponents/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
@@ -332,6 +332,8 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
for (int i = 0; i < maxRows; i++) {
PropertySet[] props = node.getChildren().getNodeAt(i).getPropertySets();
+ if (props.length == 0) //rare special case
+ continue;
Property[] property = props[0].getProperties();
objs[i] = new Object[property.length];
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestService.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestService.java
index d8e2e3c7e0..2f5f0382ca 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestService.java
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestService.java
@@ -179,7 +179,7 @@ public class HashDbIngestService implements IngestServiceFsContent {
detailsSb.append("");
- managerProxy.postMessage(IngestMessage.createDataMessage(++messageId, this, "Found notable file: " + name, detailsSb.toString(), name+md5Hash, badFile));
+ managerProxy.postMessage(IngestMessage.createDataMessage(++messageId, this, "Notable: " + name, detailsSb.toString(), name+md5Hash, badFile));
IngestManager.fireServiceDataEvent(new ServiceDataEvent(MODULE_NAME, ARTIFACT_TYPE.TSK_HASHSET_HIT, Collections.singletonList(badFile)));
ret = ProcessResult.OK;
} else if (status.equals(TskData.FileKnown.KNOWN)) {
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSimplePanel.form b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSimplePanel.form
index 5092fb9003..1ab5403efd 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSimplePanel.form
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSimplePanel.form
@@ -26,11 +26,11 @@
-
+
-
+
@@ -39,15 +39,15 @@
-
+
-
+
-
+
@@ -55,9 +55,6 @@
-
-
-
@@ -65,9 +62,6 @@
-
-
-
@@ -75,9 +69,6 @@
-
-
-
@@ -85,9 +76,6 @@
-
-
-
diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSimplePanel.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSimplePanel.java
index 03927aec01..4de15a7bee 100644
--- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSimplePanel.java
+++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbSimplePanel.java
@@ -87,16 +87,12 @@ public class HashDbSimplePanel extends javax.swing.JPanel {
knownValLabel = new javax.swing.JLabel();
notableValLabel = new javax.swing.JLabel();
- knownLabel.setFont(new java.awt.Font("Tahoma", 1, 12)); // NOI18N
knownLabel.setText(org.openide.util.NbBundle.getMessage(HashDbSimplePanel.class, "HashDbSimplePanel.knownLabel.text")); // NOI18N
- notableLabel.setFont(new java.awt.Font("Tahoma", 1, 12)); // NOI18N
notableLabel.setText(org.openide.util.NbBundle.getMessage(HashDbSimplePanel.class, "HashDbSimplePanel.notableLabel.text")); // NOI18N
- knownValLabel.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
knownValLabel.setText(org.openide.util.NbBundle.getMessage(HashDbSimplePanel.class, "HashDbSimplePanel.knownValLabel.text")); // NOI18N
- notableValLabel.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
notableValLabel.setText(org.openide.util.NbBundle.getMessage(HashDbSimplePanel.class, "HashDbSimplePanel.notableValLabel.text")); // NOI18N
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
@@ -112,22 +108,22 @@ public class HashDbSimplePanel extends javax.swing.JPanel {
.addComponent(knownValLabel))
.addGroup(layout.createSequentialGroup()
.addComponent(notableLabel)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(notableValLabel)))
- .addContainerGap(18, Short.MAX_VALUE))
+ .addContainerGap(42, Short.MAX_VALUE))
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
- .addComponent(knownValLabel)
- .addComponent(knownLabel))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(knownLabel)
+ .addComponent(knownValLabel))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(notableValLabel)
.addComponent(notableLabel))
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(18, Short.MAX_VALUE))
);
}// //GEN-END:initComponents
// Variables declaration - do not modify//GEN-BEGIN:variables
diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
index dd5d05883b..ee3621ce37 100644
--- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
+++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestMessagePanel.java
@@ -228,9 +228,9 @@ class IngestMessagePanel extends javax.swing.JPanel {
if (i == 0) {
column.setPreferredWidth(((int) (d.width * 0.23)));
} else if (i == 1) {
- column.setPreferredWidth(((int) (d.width * 0.14)));
+ column.setPreferredWidth(((int) (d.width * 0.07)));
} else {
- column.setPreferredWidth(((int) (d.width * 0.62)));
+ column.setPreferredWidth(((int) (d.width * 0.69)));
}
}
}
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java
index a1911ef064..36bb7c7759 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestService.java
@@ -648,7 +648,7 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
} else {
subjectSb.append("Keyword hit: ");
}
- subjectSb.append("<");
+ //subjectSb.append("<");
String uniqueKey = null;
BlackboardAttribute attr = written.getAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD.getTypeID());
if (attr != null) {
@@ -657,7 +657,7 @@ public final class KeywordSearchIngestService implements IngestServiceFsContent
uniqueKey = keyword.toLowerCase();
}
- subjectSb.append(">");
+ //subjectSb.append(">");
//String uniqueKey = queryStr;
//details