From 48ece808a4f6465d0c59a35d537fdbd0e80caf95 Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Fri, 2 Aug 2019 15:11:14 -0400
Subject: [PATCH] 5373 move autopsyexceptionhandler

---
 Core/nbproject/project.xml                                   | 1 +
 .../org/sleuthkit/autopsy/coreutils/Bundle.properties-MERGED | 4 +---
 .../{coreutils => exceptions}/AutopsyExceptionHandler.java   | 5 ++++-
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename Core/src/org/sleuthkit/autopsy/{coreutils => exceptions}/AutopsyExceptionHandler.java (96%)

diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index 967399cc20..518d0028f1 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -327,6 +327,7 @@
                 <package>org.sleuthkit.autopsy.datasourceprocessors</package>
                 <package>org.sleuthkit.autopsy.directorytree</package>
                 <package>org.sleuthkit.autopsy.events</package>
+                <package>org.sleuthkit.autopsy.exceptions</package>
                 <package>org.sleuthkit.autopsy.filesearch</package>
                 <package>org.sleuthkit.autopsy.guiutils</package>
                 <package>org.sleuthkit.autopsy.healthmonitor</package>
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/coreutils/Bundle.properties-MERGED
index 17791d159d..702b726e08 100755
--- a/Core/src/org/sleuthkit/autopsy/coreutils/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/Bundle.properties-MERGED
@@ -23,9 +23,7 @@ PlatformUtil.getProcVmUsed.sigarNotInit.msg=Cannot get virt mem used, sigar not
 PlatformUtil.getProcVmUsed.gen.msg=Cannot get virt mem used, {0}
 PlatformUtil.getJvmMemInfo.usageText=JVM heap usage: {0}, JVM non-heap usage: {1}
 PlatformUtil.getPhysicalMemInfo.usageText=Physical memory usage (max, total, free): {0}, {1}, {2}
-PlatformUtil.getAllMemUsageInfo.usageText={0}\n\
-{1}\n\
-Process Virtual Memory: {2}
+PlatformUtil.getAllMemUsageInfo.usageText={0}\n{1}\nProcess Virtual Memory: {2}
 # {0} - file name
 ReadImageTask.mesageText=Reading image: {0}
 StringExtract.illegalStateException.cannotInit.msg=Unicode table not properly initialized, cannot instantiate StringExtract
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/AutopsyExceptionHandler.java b/Core/src/org/sleuthkit/autopsy/exceptions/AutopsyExceptionHandler.java
similarity index 96%
rename from Core/src/org/sleuthkit/autopsy/coreutils/AutopsyExceptionHandler.java
rename to Core/src/org/sleuthkit/autopsy/exceptions/AutopsyExceptionHandler.java
index 3b7c333bc3..13b73583a2 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/AutopsyExceptionHandler.java
+++ b/Core/src/org/sleuthkit/autopsy/exceptions/AutopsyExceptionHandler.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.sleuthkit.autopsy.coreutils;
+package org.sleuthkit.autopsy.exceptions;
 
 import java.util.logging.Filter;
 import java.util.logging.Handler;
@@ -26,6 +26,9 @@ import java.util.logging.SimpleFormatter;
 import javax.swing.JOptionPane;
 import org.openide.util.lookup.ServiceProvider;
 import org.netbeans.core.NbErrorManager;
+import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
+import org.sleuthkit.autopsy.coreutils.Version;
 
 /**
  * Replaces default NetBeans exception handler. Displays messages in a dialog.