From 74845fa4ed64c6bd5487b2eadcacf6367ffe79c8 Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Mon, 3 Apr 2017 10:11:06 -0400
Subject: [PATCH 1/2] 2454 Removed redundant else block corrected level of
 access for disk lists

---
 .../org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
index 865882c62f..e965cadeca 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
@@ -501,8 +501,6 @@ final class LocalDiskPanel extends JPanel {
      */
     private class LocalDiskModel implements TableModel {
 
-        private List<LocalDisk> physicalDrives = new ArrayList<>();
-        private List<LocalDisk> partitions = new ArrayList<>();
         private LocalDiskThread worker = null;
         private boolean ready = false;
         private volatile boolean loadingDisks = false;
@@ -609,6 +607,8 @@ final class LocalDiskPanel extends JPanel {
         class LocalDiskThread extends SwingWorker<Object, Void> {
 
             private final Logger logger = Logger.getLogger(LocalDiskThread.class.getName());
+            private List<LocalDisk> physicalDrives = new ArrayList<>();
+            private List<LocalDisk> partitions = new ArrayList<>();
 
             @Override
             protected Object doInBackground() throws Exception {
@@ -674,10 +674,6 @@ final class LocalDiskPanel extends JPanel {
                         pathTextField.setText("");
                         fireUpdateEvent();
                         ready = true;
-                    } else {
-                        //this should not be possible but happens
-                        //possible threading error when this method is called while running
-                        logger.log(Level.INFO, "Loading local disks was canceled"); //NON-NLS
                     }
                 }
                 diskTable.revalidate();

From fd781e207ddadf9f104e91fa7d0aecd252bb69c1 Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Mon, 3 Apr 2017 14:25:08 -0400
Subject: [PATCH 2/2] 2492 - dialog opened by Edit Keyword button now titled
 Edit Keyword

---
 .../sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java
index 227b034683..8e9d4bb5c5 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalEditListPanel.java
@@ -125,6 +125,7 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis
         }
     }
 
+    @NbBundle.Messages("GlobalEditListPanel.editKeyword.title=Edit Keyword")      
     /**
      * Adds keywords to a  keyword list, returns true if at least one keyword was successfully added and no
      * duplicates were found.
@@ -139,6 +140,9 @@ class GlobalEditListPanel extends javax.swing.JPanel implements ListSelectionLis
         int dupeCount = 0;
         int badCount = 1;  // Default to 1 so we enter the loop the first time
 
+        if (!existingKeywords.isEmpty()){  //if there is an existing keyword then this action was called by the edit button
+            dialog.setTitle(NbBundle.getMessage(GlobalEditListPanel.class, "GlobalEditListPanel.editKeyword.title"));
+        }
         while (badCount > 0) {
             dialog.setInitialKeywordList(keywordsToRedisplay, isLiteral, isWholeWord);
             dialog.display();