mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor changes related to add image wizard error handling

Browse Source
This commit is contained in:
jmillman 2013-09-19 11:19:26 -04:00
parent 13cc11a2f4
commit 4dbbe5973b
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
View File

@ -517,14 +517,15 @@ class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel<WizardDe
// process is over, doesn't need to be dealt with if cancel happens // process is over, doesn't need to be dealt with if cancel happens
cancelledWhileRunning.disable(); cancelledWhileRunning.disable();
//enqueue what would be in done() to EDT thread // //enqueue what would be in done() to EDT thread
EventQueue.invokeLater(new Runnable() { // EventQueue.invokeLater(new Runnable() {
@Override // @Override
public void run() { // public void run() {
postProcessImage(); // postProcessImage();
} // }
}); // });
/////////////////Done() is already executed in EDT per SwingWorker javadocs -jm
} }
return 0; return 0;
@ -572,11 +573,17 @@ class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel<WizardDe
} }
} }
/** /**
* *
* (called by EventDispatch Thread after doInBackground finishes) * (called by EventDispatch Thread after doInBackground finishes)
*/ */
protected void postProcessImage() { @Override
protected void done() {
//these are required to stop the CurrentDirectoryFetcher
progressBar.setIndeterminate(false); progressBar.setIndeterminate(false);
setProgress(100); setProgress(100);
@ -587,15 +594,13 @@ class AddImageWizardIngestConfigPanel implements WizardDescriptor.Panel<WizardDe
revert(); revert();
if (hasCritError) { if (hasCritError) {
//core error //core error
progressPanel.getComponent().showErrors(errorString, true); progressPanel.setErrors(errorString, true);
} }
return; return;
} else { } else if (errorString != null) {
if (errorString != null) { //data error (non-critical)
//data error (non-critical) logger.log(Level.INFO, "Handling non-critical errors that occured in add image process");
logger.log(Level.INFO, "Handling non-critical errors that occured in add image process"); progressPanel.setErrors(errorString, false);
progressPanel.setErrors(errorString, false);
}
} }

4
branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
View File

@ -1,5 +1,5 @@
#Updated by build script #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 LBL_splash_window_title=Starting Autopsy
SPLASH_HEIGHT=288 SPLASH_HEIGHT=288
SPLASH_WIDTH=538 SPLASH_WIDTH=538
@ -8,4 +8,4 @@ SplashRunningTextBounds=5,266,530,17
SplashRunningTextColor=0x0 SplashRunningTextColor=0x0
SplashRunningTextFontSize=18 SplashRunningTextFontSize=18
currentVersion=Autopsy 20130823 currentVersion=Autopsy 20130919

6
branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
View File

@ -1,5 +1,5 @@
#Updated by build script #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=Autopsy 20130919
CTL_MainWindow_Title_No_Project=Autopsy 20130823 CTL_MainWindow_Title_No_Project=Autopsy 20130919