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

Case class refinements

Browse Source
This commit is contained in:
Richard Cordovano 2017-01-20 10:02:45 -05:00
parent 02cac46b7b
commit b289e8c75b
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Core/src/org/sleuthkit/autopsy/casemodule/Case.java
View File

@ -426,10 +426,10 @@ public class Case implements SleuthkitCase.ErrorObserver {
@Messages({ @Messages({
"Case.creationException.illegalCaseName=Could not create case: case name contains illegal characters.", "Case.creationException.illegalCaseName=Could not create case: case name contains illegal characters.",
"# {0} - exception message", "Case.creationException.couldNotCreateCase=Could not create case: {0}", "# {0} - exception message", "Case.creationException.couldNotCreateCase=Could not create case: {0}",
"Case.creationMessage.acquiringLocks=Acquiring locks",
"Case.progressIndicatorTitle.creatingCase=Creating Case", "Case.progressIndicatorTitle.creatingCase=Creating Case",
"Case.progressIndicatorCancelButton.cancelLabel=Cancel" "Case.progressIndicatorCancelButton.cancelLabel=Cancel",
}) "Case.progressMessage.preparingToCreateCase=Preparing to create case...",
"Case.progressMessage.acquiringLocks=Acquiring locks...",})
public static void createCurrentCase(String caseDir, String caseDisplayName, String caseNumber, String examiner, CaseType caseType) throws CaseActionException { public static void createCurrentCase(String caseDir, String caseDisplayName, String caseNumber, String examiner, CaseType caseType) throws CaseActionException {
/* /*
@ -454,7 +454,7 @@ public class Case implements SleuthkitCase.ErrorObserver {
} else { } else {
progressIndicator = new LoggingProgressIndicator(); progressIndicator = new LoggingProgressIndicator();
} }
progressIndicator.start(Bundle.Case_creationMessage_acquiringLocks()); progressIndicator.start(Bundle.Case_progressMessage_preparingToCreateCase());
/* /*
* Creating a case is always done in the same non-UI thread that will be * Creating a case is always done in the same non-UI thread that will be
@ -476,7 +476,7 @@ public class Case implements SleuthkitCase.ErrorObserver {
* exclusive case resources lock to allow only one node at a * exclusive case resources lock to allow only one node at a
* time to create/open/upgrade case resources. * time to create/open/upgrade case resources.
*/ */
progressIndicator.start("Acquiring locks"); // RJCTODO: Bundle message progressIndicator.start(Bundle.Case_creationMessage_acquiringLocks());
try (CoordinationService.Lock nameLock = Case.acquireExclusiveCaseNameLock(caseName)) { try (CoordinationService.Lock nameLock = Case.acquireExclusiveCaseNameLock(caseName)) {
assert (null != nameLock); assert (null != nameLock);
acquireSharedCaseDirLock(caseDir); acquireSharedCaseDirLock(caseDir);
@ -505,7 +505,9 @@ public class Case implements SleuthkitCase.ErrorObserver {
* CaseActionException with a user-friendly error message * CaseActionException with a user-friendly error message
* suitable for substitution in the error message below. * suitable for substitution in the error message below.
* *
* RJCTODO: Add TODO comment referencing JIRA * TODO (JIRA-2206): Update Case API to throw more specific
* exceptions so that clients can display error messages based
* on exception type rather than having localized log messages.
*/ */
throw new CaseActionException(Bundle.Case_creationException_couldNotCreateCase(ex.getCause().getMessage()), ex); throw new CaseActionException(Bundle.Case_creationException_couldNotCreateCase(ex.getCause().getMessage()), ex);
} }
@ -528,7 +530,9 @@ public class Case implements SleuthkitCase.ErrorObserver {
* exception. * exception.
*/ */
@Messages({ @Messages({
"# {0} - exception message", "Case.openException.couldNotOpenCase=Could not open case: {0}" "# {0} - exception message", "Case.openException.couldNotOpenCase=Could not open case: {0}",
"Case.progressIndicatorTitle.openingCase=Opening Case",
"Case.progressMessage.preparingToOpenCase=Preparing to open case...",
}) })
public static void openCurrentCase(String caseMetadataFilePath) throws CaseActionException { public static void openCurrentCase(String caseMetadataFilePath) throws CaseActionException {
LOGGER.log(Level.INFO, "Opening case with metadata file path {0}", caseMetadataFilePath); //NON-NLS LOGGER.log(Level.INFO, "Opening case with metadata file path {0}", caseMetadataFilePath); //NON-NLS
@ -538,6 +542,19 @@ public class Case implements SleuthkitCase.ErrorObserver {
} }
CaseMetadata metadata = new CaseMetadata(Paths.get(caseMetadataFilePath)); CaseMetadata metadata = new CaseMetadata(Paths.get(caseMetadataFilePath));
/*
* Set up either a visual progress indicator or a logging progress
* indicator, depending on whether a GUI is present.
*/
CancelButtonListener listener = new CancelButtonListener();
ProgressIndicator progressIndicator;
if (RuntimeProperties.runningWithGUI()) {
progressIndicator = new ModalDialogProgressIndicator(Bundle.Case_progressIndicatorTitle_openingCase(), new String[]{Bundle.Case_progressIndicatorCancelButton_cancelLabel()}, Bundle.Case_progressIndicatorCancelButton_cancelLabel(), null, listener);
} else {
progressIndicator = new LoggingProgressIndicator();
}
progressIndicator.start(Bundle.Case_progressMessage_preparingToOpenCase());
/* /*
* Creating a case is always done in the same non-UI thread that * Creating a case is always done in the same non-UI thread that
* will be used later to close the case. If the case is a multi-user * will be used later to close the case. If the case is a multi-user