From bccaae09a0b9b9ae08792f7ae3604f03043ca71d Mon Sep 17 00:00:00 2001
From: Sophie Mori <smori@basistech.com>
Date: Tue, 27 Sep 2016 11:29:14 -0400
Subject: [PATCH] Changed list selection behavior

---
 .../org/sleuthkit/autopsy/directorytree/AddRuleDialog.java | 1 -
 .../directorytree/ExternalViewerGlobalSettingsPanel.java   | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/AddRuleDialog.java b/Core/src/org/sleuthkit/autopsy/directorytree/AddRuleDialog.java
index 946ddfebba..6e576b6da1 100755
--- a/Core/src/org/sleuthkit/autopsy/directorytree/AddRuleDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/AddRuleDialog.java
@@ -31,7 +31,6 @@ import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 import org.openide.util.NbBundle;
-import org.openide.util.NbBundle.Messages;
 
 /**
  * A dialog for adding or editing an external viewer rule
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerGlobalSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerGlobalSettingsPanel.java
index 9958079f5a..91ea298ea1 100755
--- a/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerGlobalSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/ExternalViewerGlobalSettingsPanel.java
@@ -227,7 +227,9 @@ public class ExternalViewerGlobalSettingsPanel extends javax.swing.JPanel implem
             } else {
                 rules.add(newRule);
                 updateRulesListModel();
-                rulesList.setSelectedIndex(rules.size() - 1);
+                int index = rules.indexOf(newRule);
+                rulesList.setSelectedIndex(index);
+                enableButtons();
                 firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null);
             }
         }
@@ -253,6 +255,7 @@ public class ExternalViewerGlobalSettingsPanel extends javax.swing.JPanel implem
             }
         }
         rulesList.setSelectedIndex(selected);
+        enableButtons();
     }//GEN-LAST:event_editRuleButtonActionPerformed
 
     private void deleteRuleButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteRuleButtonActionPerformed
@@ -270,7 +273,6 @@ public class ExternalViewerGlobalSettingsPanel extends javax.swing.JPanel implem
     @Override
     public void load() {
         rules = ExternalViewerRulesManager.getInstance().getUserRules();
-        Collections.sort(rules);
         updateRulesListModel();
         enableButtons();
     }
@@ -290,6 +292,7 @@ public class ExternalViewerGlobalSettingsPanel extends javax.swing.JPanel implem
      */
     private void updateRulesListModel() {
         rulesListModel.clear();
+        Collections.sort(rules);
         for (ExternalViewerRule rule : rules) {
             rulesListModel.addElement(rule);
         }