From b36c9458fa9a4dd2676c03af76a890635afe0b58 Mon Sep 17 00:00:00 2001
From: Karl Mortensen <kmortensen@basistech.com>
Date: Tue, 28 Jun 2016 15:07:49 -0400
Subject: [PATCH] Set focus to new keyword text box upon events

---
 .../autopsy/keywordsearch/GlobalEditListPanel.java         | 2 +-
 .../autopsy/keywordsearch/GlobalListsManagementPanel.java  | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java
index a381e98059..8190c5d83b 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java
@@ -454,7 +454,7 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis
         chRegex.setSelected(false);
         addWordField.setText("");
         pcs.firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
-
+        setFocusOnKeywordTextBox();
         setButtonStates();
     }//GEN-LAST:event_addWordButtonActionPerformed
 
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalListsManagementPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalListsManagementPanel.java
index 070fe4b99f..1f7baf6ece 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalListsManagementPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalListsManagementPanel.java
@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.List;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
+import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import javax.swing.table.AbstractTableModel;
@@ -65,6 +66,12 @@ class GlobalListsManagementPanel extends javax.swing.JPanel implements OptionsPa
         listsTable.setRowSelectionAllowed(true);
         tableModel.resync();
 
+        listsTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
+            @Override
+            public void valueChanged(ListSelectionEvent e) {
+                globalListSettingsPanel.setFocusOnKeywordTextBox();
+            }
+        });
         /*
          * XmlKeywordSearchList.getCurrent().addPropertyChangeListener(new
          * PropertyChangeListener() {