From f1a4e7b96d262a632aeaf2c137bbf5375244d6bf Mon Sep 17 00:00:00 2001
From: Jeff Wallace <jwallace@basistech.com>
Date: Thu, 31 Oct 2013 12:22:23 -0400
Subject: [PATCH] Removed 'File Name' and 'Context' columns from keyword search
 results.

---
 .../KeywordSearchFilterNode.java              | 19 -------------------
 .../KeywordSearchResultFactory.java           |  8 --------
 2 files changed, 27 deletions(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchFilterNode.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchFilterNode.java
index 968631e27a..9cec5ce15d 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchFilterNode.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchFilterNode.java
@@ -67,22 +67,6 @@ class KeywordSearchFilterNode extends FilterNode {
         return snippet;
     }
 
-    Property<String> getSnippetProperty() {
-
-        Property<String> prop = new PropertySupport.ReadOnly<String>("snippet",
-                String.class, "Context", "Snippet of matching content.") {
-
-            @Override
-            public String getValue() {
-                return getSnippet();
-            }
-        };
-
-        prop.setValue("suppressCustomEditor", Boolean.TRUE); // remove the "..." (editing) button
-
-        return prop;
-    }
-
     @Override
     public Node.PropertySet[] getPropertySets() {
         Node.PropertySet[] propertySets = super.getPropertySets();
@@ -100,9 +84,6 @@ class KeywordSearchFilterNode extends FilterNode {
 
                 int j = 0;
                 for (Property<?> p : oldProperties) {
-                    if (j++ == 1) {
-                        newPs.put(getSnippetProperty());
-                    }
                     newPs.put(p);
                 }
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java
index 5d8e23e9c9..6c677eec85 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchResultFactory.java
@@ -79,13 +79,6 @@ public class KeywordSearchResultFactory extends ChildFactory<KeyValueQuery> {
                 return BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD_REGEXP.getDisplayName();
             }
         },
-        MATCH {
-
-            @Override
-            public String toString() {
-                return "File Name";
-            }
-        },
         CONTEXT {
 
             @Override
@@ -268,7 +261,6 @@ public class KeywordSearchResultFactory extends ChildFactory<KeyValueQuery> {
                 final int previewChunk = hitContents.get(f);
                 //get unique match result files
                 Map<String, Object> resMap = new LinkedHashMap<>();
-                setCommonProperty(resMap, CommonPropertyTypes.MATCH, f.getName());
 
                 try {
                     String snippet;