Merge remote-tracking branch 'upstream/release-4.6.0' into 3284_DiskImageBlockSize

Core/src/org/sleuthkit/autopsy/casemodule/CaseInformationPanel.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2017 Basis Technology Corp.
+ * Copyright 2011-2018 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -61,6 +61,11 @@ class CaseInformationPanel extends javax.swing.JPanel {
             @Override
             public void stateChanged(ChangeEvent e) {
                 tabbedPane.getSelectedComponent().setSize(tabbedPane.getSelectedComponent().getPreferredSize());
+                if (tabbedPane.getSelectedComponent() instanceof CasePropertiesPanel) {
+                    editDetailsButton.setVisible(true);
+                } else {
+                    editDetailsButton.setVisible(false);
+                }
             }
         });
     }

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalListsManagementPanel.java

@@ -365,19 +365,21 @@ class GlobalListsManagementPanel extends javax.swing.JPanel implements OptionsPa
         chooser.addChoosableFileFilter(autopsyFilter);
         chooser.addChoosableFileFilter(encaseFilter);
         chooser.setAcceptAllFileFilterUsed(false);
+        chooser.setMultiSelectionEnabled(true);
         chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
 
         String listName = null;
         int returnVal = chooser.showOpenDialog(this);
         if (returnVal == JFileChooser.APPROVE_OPTION) {
-            File selFile = chooser.getSelectedFile();
-            if (selFile == null) {
-                return;
+            File[] selFiles = chooser.getSelectedFiles();
+
+            for (File file : selFiles) {
+                if (file == null) {
+                    continue; 
                 }
                 
                 //force append extension if not given
-            String fileAbs = selFile.getAbsolutePath();
-
+                String fileAbs = file.getAbsolutePath();
                 final KeywordSearchList reader;
 
                 if (KeywordSearchUtil.isXMLList(fileAbs)) {
@@ -439,7 +441,8 @@ class GlobalListsManagementPanel extends javax.swing.JPanel implements OptionsPa
                     KeywordSearchUtil.displayDialog(
                             NbBundle.getMessage(this.getClass(), "KeywordSearch.listImportFeatureTitle"), NbBundle.getMessage(this.getClass(), "KeywordSearch.kwListFailImportMsg"), KeywordSearchUtil.DIALOG_MESSAGE_TYPE.INFO);
                 }
-            ModuleSettings.setConfigSetting(ModuleSettings.MAIN_SETTINGS, LAST_KEYWORD_LIST_PATH_KEY, selFile.getParent());
+                ModuleSettings.setConfigSetting(ModuleSettings.MAIN_SETTINGS, LAST_KEYWORD_LIST_PATH_KEY, file.getParent());
+            }
         }
         tableModel.resync();