Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 5373-UserFriendlyException

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

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2018 Basis Technology Corp.
+ * Copyright 2011-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,6 @@ package org.sleuthkit.autopsy.casemodule;
 import java.awt.Cursor;
 import java.util.logging.Level;
 import javax.swing.JComboBox;
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase;
 import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb;
@@ -573,7 +572,7 @@ final class OptionalCasePropertiesPanel extends javax.swing.JPanel {
                         examinerTextField.getText(), tfExaminerPhoneText.getText(),
                         tfExaminerEmailText.getText(), taNotesText.getText()));
             } catch (CaseActionException ex) {
-                Exceptions.printStackTrace(ex);
+                logger.log(Level.WARNING, "Error updating case details", ex);
             }
         }
     }

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

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2013 Basis Technology Corp.
+ * Copyright 2013-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -62,7 +62,6 @@ public class StartupWindowProvider implements StartupWindowInterface {
             if (isRunningFromCommandLine()) {
                 // Autopsy is running from command line
                 logger.log(Level.INFO, "Running from command line"); //NON-NLS
-                System.out.println("Running from command line");
                 startupWindowToUse = new CommandLineStartupWindow();
                 // kick off command line processing
                 new CommandLineIngestManager().start();

Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageCorrelationPropertiesDialog.java

@@ -1,7 +1,7 @@
 /*
  * Central Repository
  *
- * Copyright 2015-2018 Basis Technology Corp.
+ * Copyright 2015-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,7 +26,6 @@ import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle.Messages;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
@@ -74,7 +73,7 @@ final class ManageCorrelationPropertiesDialog extends javax.swing.JDialog {
             correlationTypes.clear();
             correlationTypes.addAll(dbManager.getDefinedCorrelationTypes());
         } catch (EamDbException ex) {
-            Exceptions.printStackTrace(ex);
+            LOGGER.log(Level.WARNING, "Error loading data", ex);
         }
 
         correlationTypes.forEach((aType) -> {

Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageOrganizationsDialog.java

@@ -1,7 +1,7 @@
 /*
  * Central Repository
  *
- * Copyright 2015-2018 Basis Technology Corp.
+ * Copyright 2015-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,7 +28,6 @@ import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle.Messages;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb;
@@ -78,7 +77,7 @@ public final class ManageOrganizationsDialog extends JDialog {
             setButtonsEnabled(organizationList.getSelectedValue());
             newOrg = null;
         } catch (EamDbException ex) {
-            Exceptions.printStackTrace(ex);
+            logger.log(Level.WARNING, "Error getting Central Repo for Organizations dialog", ex);
         }
         display();
     }

Core/src/org/sleuthkit/autopsy/commonpropertiessearch/InterCasePanel.java

@@ -27,10 +27,11 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Observable;
 import java.util.Observer;
+import java.util.logging.Level;
 import javax.swing.ComboBoxModel;
-import org.openide.util.Exceptions;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeInstance;
 import org.sleuthkit.autopsy.centralrepository.datamodel.EamDbException;
+import org.sleuthkit.autopsy.coreutils.Logger;
 
 /**
  * UI controls for Common Files Search scenario where the user intends to find
@@ -38,6 +39,7 @@ import org.sleuthkit.autopsy.centralrepository.datamodel.EamDbException;
  */
 public final class InterCasePanel extends javax.swing.JPanel {
 
+    private final static Logger logger = Logger.getLogger(InterCasePanel.class.getName());
     private static final long serialVersionUID = 1L;
     private final Observable fileTypeFilterObservable;
     static final int NO_CASE_SELECTED = -1;
@@ -121,7 +123,7 @@ public final class InterCasePanel extends javax.swing.JPanel {
                 this.correlationTypeComboBox.addItem(type.getDisplayName());
             }
         } catch (EamDbException ex) {
-            Exceptions.printStackTrace(ex);
+            logger.log(Level.WARNING, "Error getting correlation types", ex);
         }
         this.correlationTypeComboBox.setSelectedIndex(0);
     }

Core/src/org/sleuthkit/autopsy/communications/relationships/MessageViewer.java

@@ -47,7 +47,6 @@ import org.openide.nodes.Children;
 import org.openide.nodes.Node;
 import org.openide.nodes.Node.Property;
 import org.openide.nodes.Node.PropertySet;
-import org.openide.util.Exceptions;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.communications.ModifiableProxyLookup;
@@ -397,7 +396,7 @@ public class MessageViewer extends JPanel implements RelationshipsViewer {
         try {
             rootTablePane.getExplorerManager().setSelectedNodes(new Node[0]);
         } catch (PropertyVetoException ex) {
-            Exceptions.printStackTrace(ex);
+            logger.log(Level.WARNING, "Error setting selected nodes", ex);
         }
         showThreadsPane();
     }//GEN-LAST:event_backButtonActionPerformed

Core/src/org/sleuthkit/autopsy/corecomponents/SortChooser.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2018 Basis Technology Corp.
+ * Copyright 2011-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewChildren.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-18 Basis Technology Corp.
+ * Copyright 2011-19 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -47,7 +47,6 @@ import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Children;
 import org.openide.nodes.FilterNode;
 import org.openide.nodes.Node;
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.autopsy.corecomponents.ResultViewerPersistence.SortCriterion;
@@ -197,7 +196,7 @@ class ThumbnailViewChildren extends Children.Keys<Integer> {
                         }
 
                     } catch (IllegalAccessException | InvocationTargetException ex) {
-                        Exceptions.printStackTrace(ex);
+                        logger.log(Level.WARNING, "Error getting value for thumbnail children", ex);
                     }
                 }
             }

Core/src/org/sleuthkit/autopsy/coreutils/PlatformUtil.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2012-2018 Basis Technology Corp.
+ * Copyright 2012-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -119,19 +119,19 @@ public class PlatformUtil {
     public static String getUserPythonModulesPath() {
         return getUserDirectory().getAbsolutePath() + File.separator + PYTHON_MODULES_SUBDIRECTORY;
     }
-    
+
     /**
      * Get root path where the user's Ocr language packs are stored.
-     * 
+     *
      * @return Absolute path to the Ocr language packs root directory.
      */
     public static String getOcrLanguagePacksPath() {
         return getUserDirectory().getAbsolutePath() + File.separator + OCR_LANGUAGE_SUBDIRECTORY;
     }
-    
+
     /**
      * Get the names of the language packs installed at the user directory.
-     * 
+     *
      * @return List of language packs base names
      */
     public static List<String> getOcrLanguagePacks() {
@@ -139,20 +139,20 @@ public class PlatformUtil {
 
         List<String> languagePacks = new ArrayList<>();
         for (File languagePack : languagePackRootDir.listFiles()) {
-            String fileExt = FilenameUtils.getExtension(languagePack.getName()); 
+            String fileExt = FilenameUtils.getExtension(languagePack.getName());
             if (!languagePack.isDirectory() && OCR_LANGUAGE_PACK_EXT.equals(fileExt)) {
                 String packageName = FilenameUtils.getBaseName(languagePack.getName());
                 languagePacks.add(packageName);
             }
         }
-        
+
         return languagePacks;
     }
 
     /**
      * Get root path where the user's object detection classifiers are stored.
-     * 
+     *
-     * @return Absolute path to the object detection classifiers root directory. 
+     * @return Absolute path to the object detection classifiers root directory.
      */
     public static String getObjectDetectionClassifierPath() {
         return getUserDirectory().getAbsolutePath() + File.separator + CLASSIFIERS_SUBDIRECTORY;

Core/src/org/sleuthkit/autopsy/ingest/IngestProfiles.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2017 Basis Technology Corp.
+ * Copyright 2011-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,9 +24,10 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
-import org.openide.util.Exceptions;
+import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 
@@ -40,7 +41,7 @@ public final class IngestProfiles {
     private static final String PROFILE_DESC_KEY = "Profile_Description";
     private static final String PROFILE_FILTER_KEY = "Profile_Filter";
     private static final String PROFILE_FILE_EXT = ".properties";
-
+    private static final Logger logger = Logger.getLogger(IngestProfiles.class.getName());
     /**
      * Gets the collection of profiles which currently exist.
      *
@@ -143,7 +144,7 @@ public final class IngestProfiles {
                 Files.deleteIfExists(Paths.get(PlatformUtil.getUserConfigDirectory(), selectedProfile.getName() + PROFILE_FILE_EXT));
                 FileUtils.deleteDirectory(IngestJobSettings.getSavedModuleSettingsFolder(selectedProfile.getName() + File.separator).toFile());
             } catch (IOException ex) {
-                Exceptions.printStackTrace(ex);
+                logger.log(Level.WARNING, "Error deleting directory for profile " + selectedProfile.getName(), ex);
             }
         }
 

Core/src/org/sleuthkit/autopsy/ingest/RunIngestSubMenu.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2018 Basis Technology Corp.
+ * Copyright 2011-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,12 +22,14 @@ import org.sleuthkit.autopsy.ingest.runIngestModuleWizard.RunIngestModulesAction
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.logging.Level;
 import javax.swing.JComponent;
 import javax.swing.JMenuItem;
 import org.openide.awt.DynamicMenuContent;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
+import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.TskCoreException;
 
@@ -37,6 +39,8 @@ import org.sleuthkit.datamodel.TskCoreException;
  */
 final class RunIngestSubMenu extends JMenuItem implements DynamicMenuContent {
 
+    private static final Logger logger = Logger.getLogger(RunIngestSubMenu.class.getName());
+
     /**
      * Creates main menu/popup menu items. It's called each time a popup menu is
      * constructed and just once for the main menu. Main menu updates happen
@@ -54,7 +58,7 @@ final class RunIngestSubMenu extends JMenuItem implements DynamicMenuContent {
             // No open Cases, create a disabled empty menu
             return getEmpty();
         } catch (TskCoreException | NoCurrentCaseException e) {
-            System.out.println("Exception getting images: " + e.getMessage()); //NON-NLS
+            logger.log(Level.INFO, "Exception getting images: " + e.getMessage());
         }
         JComponent[] comps = new JComponent[dataSources.size()];
 

Core/src/org/sleuthkit/autopsy/modules/iOS/ContactAnalyzer.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2014-2018 Basis Technology Corp.
+ * Copyright 2014-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -216,7 +216,6 @@ final class ContactAnalyzer {
         try {
             while ((length = is.read(buffer)) != -1) {
                 os.write(buffer, 0, length);
-                System.out.println(length);
                 os.flush();
 
             }
@@ -239,13 +238,13 @@ final class ContactAnalyzer {
                 ostream.write(c);
             }
         } catch (IOException e) {
-            System.out.println("Error: " + e.getMessage()); //NON-NLS
+            logger.log(Level.WARNING, "Error copying file", e);
         } finally {
             try {
                 istream.close();
                 ostream.close();
             } catch (IOException e) {
-                System.out.println("File did not close"); //NON-NLS
+                logger.log(Level.WARNING, "File did not close", e);
             }
         }
     }

Core/src/org/sleuthkit/autopsy/modules/stix/StixArtifactData.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
- *
+ * 
- * Copyright 2013-2018 Basis Technology Corp.
+ * Copyright 2013-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -70,7 +70,7 @@ class StixArtifactData {
 
     @Messages({"StixArtifactData.indexError.message=Failed to index STIX interesting file hit artifact for keyword search.",
         "StixArtifactData.noOpenCase.errMsg=No open case available."})
-    public void createArtifact(String a_title) throws TskCoreException {
+    void createArtifact(String a_title) throws TskCoreException {
         Blackboard blackboard;
         try {
             blackboard = Case.getCurrentCaseThrows().getSleuthkitCase().getBlackboard();
@@ -104,8 +104,4 @@ class StixArtifactData {
             }
         }
     }
-
-    public void print() {
-        System.out.println("  " + observableId + " " + file.getName());
-    }
 }

Core/src/org/sleuthkit/autopsy/test/InterestingArtifactCreatorIngestModule.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2018 Basis Technology Corp.
+ * Copyright 2011-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,8 +21,6 @@ package org.sleuthkit.autopsy.test;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.logging.Level;
-
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
@@ -128,7 +126,7 @@ final class InterestingArtifactCreatorIngestModule extends FileIngestModuleAdapt
             logger.log(Level.SEVERE, String.format("Failed to process file (obj_id = %d)", file.getId()), ex);
             return ProcessResult.ERROR;
         } catch (Blackboard.BlackboardException ex) {
-            Exceptions.printStackTrace(ex);
+            logger.log(Level.WARNING, "Blackboard Exception processing file with obj_id = " + file.getId(), ex);
         }
         return ProcessResult.OK;
     }

Core/src/org/sleuthkit/autopsy/textextractors/StringsTextExtractor.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2018 Basis Technology Corp.
+ * Copyright 2011-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -454,7 +454,6 @@ final class StringsTextExtractor implements TextExtractor {
                             convertBuffRemain = bytesInConvertBuff - convertBuffOffset;
                         }
                     } catch (TskCoreException ex) {
-                        //Exceptions.printStackTrace(ex);
                         fileEOF = true;
                     }
                 }

Core/test/qa-functional/src/org/sleuthkit/autopsy/commonpropertiessearch/InterCaseTestUtils.java

@@ -2,7 +2,7 @@
  *
  * Autopsy Forensic Browser
  *
- * Copyright 2018 Basis Technology Corp.
+ * Copyright 2018-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -46,19 +46,11 @@ import org.sleuthkit.autopsy.testutils.CaseUtils;
 import org.sleuthkit.autopsy.testutils.IngestUtils;
 import org.sleuthkit.datamodel.TskCoreException;
 import junit.framework.Assert;
-import org.sleuthkit.autopsy.casemodule.CaseActionException;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeInstance;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase;
 import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb;
-import org.sleuthkit.autopsy.commonpropertiessearch.AbstractCommonAttributeInstance;
-import org.sleuthkit.autopsy.commonpropertiessearch.CaseDBCommonAttributeInstanceNode;
-import org.sleuthkit.autopsy.commonpropertiessearch.CentralRepoCommonAttributeInstance;
-import org.sleuthkit.autopsy.commonpropertiessearch.CentralRepoCommonAttributeInstanceNode;
-import org.sleuthkit.autopsy.commonpropertiessearch.CommonAttributeCountSearchResults;
 import org.sleuthkit.autopsy.datamodel.utils.DataSourceLoader;
-import org.sleuthkit.autopsy.commonpropertiessearch.CommonAttributeValue;
-import org.sleuthkit.autopsy.commonpropertiessearch.CommonAttributeValueList;
 import org.sleuthkit.autopsy.coreutils.TimeStampUtils;
 import org.sleuthkit.autopsy.datamodel.DisplayableItemNode;
 import org.sleuthkit.autopsy.modules.dataSourceIntegrity.DataSourceIntegrityModuleFactory;
@@ -279,10 +271,8 @@ class InterCaseTestUtils {
             for (CorrelationCase correlationCase : EamDb.getInstance().getCases()) {
                 mapOfCaseIdsToCase.put(correlationCase.getDisplayName(), correlationCase.getID());
             }
-            System.out.println("EAM IS ENABLED");
             return mapOfCaseIdsToCase;
         } else {
-            System.out.println("EAMDB NOT ENABLED");
             //it is reasonable that this might happen...
             //  for example when we test the feature in the absence of an enabled eamdb 
             return new HashMap<>(0);

Core/test/unit/src/org/sleuthkit/autopsy/texttranslation/translators/BingTranslatorTest.java

@@ -85,8 +85,7 @@ public class BingTranslatorTest {
 //        /*
 //        //It's unrealistic to expect the same answer every time, but sometimes
 //        //it's helpful to have this in your debug process.
-//        System.out.println(translation);
+//        assertEquals("Result did not match expected result", expectedTranslation, translation);
-//        assertEquals(expectedTranslation, translation);
 //        */
 //    }
 }

Core/test/unit/src/org/sleuthkit/autopsy/texttranslation/translators/GoogleTranslatorTest.java

@@ -37,8 +37,8 @@ public class GoogleTranslatorTest {
 //        //It's unrealistic to expect the same answer every time, but sometimes
 //        //it's helpful to have this in your debug process.
 //        
-//          String expResult = "translate"; assertEquals(expResult, result);
+//        String expResult = "translate"; assertEquals(expResult, result);
-//          System.out.println(result);
+//        assertEquals("Result did not match expected result" expResult, result);
          
     }
 //Commented out because using TranslateOption with the current version of Guava is not supported JIRA-5063
@@ -63,7 +63,6 @@ public class GoogleTranslatorTest {
 //        //It's unrealistic to expect the same answer every time, but sometimes
 //        //it's helpful to have this in your debug process.
 //        String expResult = "¡Hola Mundo!";
-//        assertEquals(expResult, result);
+//        assertEquals("Result did not match expected result", expResult, result);
-//        System.out.println(result);
 //    }
 }

ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java

@@ -64,7 +64,6 @@ import static org.apache.commons.collections4.CollectionUtils.isNotEmpty;
 import static org.apache.commons.lang3.ObjectUtils.notEqual;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.openide.util.Exceptions;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.events.ContentTagAddedEvent;
@@ -658,7 +657,7 @@ public class GroupManager {
                 
                 updateCurrentPathGroup(pathGroupKey);
             } catch (TskCoreException | TskDataException ex) {
-                Exceptions.printStackTrace(ex);
+                logger.log(Level.WARNING, "Error getting drawabledb for fileId " + fileId, ex);
             }   
                     
             // Update all the groups that this file belongs to
@@ -986,7 +985,7 @@ public class GroupManager {
                                         .findAny().ifPresent(obj_id -> types.add(mimeType));
                             }
                         } catch (SQLException | TskCoreException ex) {
-                            Exceptions.printStackTrace(ex);
+                            logger.log(Level.WARNING, "Error getting group by MIME type", ex);
                         }
                         results.putAll(null, types);
 

ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/SortChooser.java

@@ -174,7 +174,6 @@ public class SortChooser<X, Y extends Comparator<X>> extends HBox {
                     Image icon = (Image) item.getClass().getMethod("getIcon").invoke(item);
                     setGraphic(new ImageView(icon));
                 } catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
-//                    Exceptions.printStackTrace(ex);
                     setText(item.toString());
                     setGraphic(null);
                 }

KeywordSearch/test/unit/src/org/sleuthkit/autopsy/keywordsearch/CreditCardValidatorTest.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011-2017 Basis Technology Corp.
+ * Copyright 2011-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -48,8 +48,6 @@ public class CreditCardValidatorTest {
 
     @Test
     public void testLengthMatchesBin() {
-        System.out.println("lengthMatchesBin");
-
         //amex must be 15
         assertEquals(true, CreditCardValidator.isValidCCN("3431 136294 58529"));
         assertEquals(false, CreditCardValidator.isValidCCN("3431-136294-5850")); //too short
@@ -95,8 +93,6 @@ public class CreditCardValidatorTest {
      */
     @Test
     public void testIsValidCCN16() {
-        System.out.println("isValidCCN");
-
         //rules for separators and grouping for 16 digits
         assertEquals(true, CreditCardValidator.isValidCCN("1234567890318342"));// dashes
         assertEquals(true, CreditCardValidator.isValidCCN("1234-5678-9031-8342"));// dashes
@@ -111,8 +107,6 @@ public class CreditCardValidatorTest {
 
     @Test
     public void testIsValidCCN15() {
-        System.out.println("isValidCCN");
-
         //amex are fifteen digits, and grouped 4 6 5
         //amex cards that strart with 34
         assertEquals(true, CreditCardValidator.isValidCCN("3431 136294 58529"));
@@ -143,7 +137,6 @@ public class CreditCardValidatorTest {
 
     @Test
     public void testIsValidCCN19() {
-        System.out.println("isValidCCN");
         //nineteen digit (visa) cards 4-4-4-4-3
         assertEquals(true, CreditCardValidator.isValidCCN("4539747947839518654"));
         assertEquals(true, CreditCardValidator.isValidCCN("4539-7479-4783-9518-654"));
@@ -168,8 +161,6 @@ public class CreditCardValidatorTest {
 
     @Test
     public void testIsValidCCN18() {
-        System.out.println("isValidCCN");
-
         assertEquals(true, CreditCardValidator.isValidCCN("123456789031834267"));
         assertEquals(true, CreditCardValidator.isValidCCN("1234 5678 9031 8342 67"));
         assertEquals(true, CreditCardValidator.isValidCCN("1234-56789031834-267"));
@@ -181,8 +172,6 @@ public class CreditCardValidatorTest {
 
     @Test
     public void testIsValidCCN17() {
-        System.out.println("isValidCCN");
-
         assertEquals(true, CreditCardValidator.isValidCCN("12345678903183426"));
         assertEquals(true, CreditCardValidator.isValidCCN("1234 5678 9031 8342 6"));
         assertEquals(true, CreditCardValidator.isValidCCN("1234-56789031834-26"));
@@ -194,8 +183,6 @@ public class CreditCardValidatorTest {
 
     @Test
     public void testIsValidCCN14() {
-        System.out.println("isValidCCN");
-
         assertEquals(true, CreditCardValidator.isValidCCN("12345678903183"));
         assertEquals(true, CreditCardValidator.isValidCCN("1234 5678 9031 83"));
         assertEquals(true, CreditCardValidator.isValidCCN("1234-5678903183"));
@@ -207,8 +194,6 @@ public class CreditCardValidatorTest {
 
     @Test
     public void testIsValidCCN13() {
-        System.out.println("isValidCCN");
-
         assertEquals(true, CreditCardValidator.isValidCCN("1234567890318"));
         assertEquals(true, CreditCardValidator.isValidCCN("1234 5678 9031 8"));
         assertEquals(true, CreditCardValidator.isValidCCN("1234-567890318"));
@@ -220,8 +205,6 @@ public class CreditCardValidatorTest {
 
     @Test
     public void testIsValidCCN12() {
-        System.out.println("isValidCCN");
-
         assertEquals(true, CreditCardValidator.isValidCCN("123456789031"));
         assertEquals(true, CreditCardValidator.isValidCCN("1234 5678 9031"));
         assertEquals(true, CreditCardValidator.isValidCCN("1234-56789031"));

ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/jni/ScalpelCarver.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2013 Basis Technology Corp.
+ * Copyright 2013-2019 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -79,11 +79,9 @@ public class ScalpelCarver {
             success = true;
         } catch (UnsatisfiedLinkError ex) {
             String msg = NbBundle.getMessage(ScalpelCarver.class, "ScalpelCarver.loadLib.errMsg.cannotLoadLib", id);
-            System.out.println(msg + ex.toString());
             logger.log(Level.SEVERE, msg, ex);
         } catch (Exception ex) {
             String msg = NbBundle.getMessage(ScalpelCarver.class, "ScalpelCarver.loadLib.errMsg.cannotLoadLib2", id);
-            System.out.println(msg + ex.toString());
             logger.log(Level.SEVERE, msg, ex);
         }