From 4dbbe5973b8ed0922db549864b2fae6df22ecee2 Mon Sep 17 00:00:00 2001
From: jmillman <jmillman@basistech.com>
Date: Thu, 19 Sep 2013 11:19:26 -0400
Subject: [PATCH] minor changes related to add image wizard error handling

---
 .../AddImageWizardIngestConfigPanel.java      | 35 +++++++++++--------
 .../netbeans/core/startup/Bundle.properties   |  4 +--
 .../core/windows/view/ui/Bundle.properties    |  6 ++--
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
index 4c7b0a8923..5d53a336aa 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
@@ -517,14 +517,15 @@ class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel<WizardDe
                 // process is over, doesn't need to be dealt with if cancel happens
                 cancelledWhileRunning.disable();
 
-                //enqueue what would be in done() to EDT thread
-                EventQueue.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                        postProcessImage();
-                    }
-                });
+//                //enqueue what would be in done() to EDT thread
+//                EventQueue.invokeLater(new Runnable() {
+//                    @Override
+//                    public void run() {
+//                        postProcessImage();
+//                    }
+//                });
 
+                /////////////////Done() is already executed in EDT per SwingWorker javadocs -jm
             }
 
             return 0;
@@ -572,11 +573,17 @@ class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel<WizardDe
             }
         }
 
+       
+
+        
+        
         /**
          *
          * (called by EventDispatch Thread after doInBackground finishes)
          */
-        protected void postProcessImage() {
+        @Override
+        protected void done() {
+            //these are required to stop the CurrentDirectoryFetcher
             progressBar.setIndeterminate(false);
             setProgress(100);
 
@@ -587,15 +594,13 @@ class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel<WizardDe
                 revert();
                 if (hasCritError) {
                     //core error
-                    progressPanel.getComponent().showErrors(errorString, true);
+                    progressPanel.setErrors(errorString, true);
                 }
                 return;
-            } else {
-                if (errorString != null) {
-                    //data error (non-critical)
-                    logger.log(Level.INFO, "Handling non-critical errors that occured in add image process");
-                    progressPanel.setErrors(errorString, false);
-                }
+            } else if (errorString != null) {
+                //data error (non-critical)
+                logger.log(Level.INFO, "Handling non-critical errors that occured in add image process");
+                progressPanel.setErrors(errorString, false);
             }
 
 
diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
index 0c8b9abcbd..041f19ec47 100644
--- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
+++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
@@ -1,5 +1,5 @@
 #Updated by build script
-#Fri, 23 Aug 2013 15:47:56 -0400
+#Thu, 19 Sep 2013 09:33:45 -0400
 LBL_splash_window_title=Starting Autopsy
 SPLASH_HEIGHT=288
 SPLASH_WIDTH=538
@@ -8,4 +8,4 @@ SplashRunningTextBounds=5,266,530,17
 SplashRunningTextColor=0x0
 SplashRunningTextFontSize=18
 
-currentVersion=Autopsy 20130823
+currentVersion=Autopsy 20130919
diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
index 60b4d85f0e..c8ec8eff71 100644
--- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
+++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
@@ -1,5 +1,5 @@
 #Updated by build script
-#Fri, 23 Aug 2013 15:47:56 -0400
+#Thu, 19 Sep 2013 09:33:45 -0400
 
-CTL_MainWindow_Title=Autopsy 20130823
-CTL_MainWindow_Title_No_Project=Autopsy 20130823
+CTL_MainWindow_Title=Autopsy 20130919
+CTL_MainWindow_Title_No_Project=Autopsy 20130919