From cf12bcfa05c4c22021ea01edcef29caa344a85c9 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Mon, 8 Apr 2019 12:42:54 -0400 Subject: [PATCH] Updates for admin extended case deletion --- .../experimental/autoingest/Bundle.properties-MERGED | 6 +++++- .../experimental/autoingest/CasesDashboardCustomizer.java | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED index 9635528330..7cf0eee59d 100755 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED @@ -89,6 +89,10 @@ AutoIngestControlPanel.runningTable.toolTipText=The Running table displays the c AutoIngestControlPanel.SharedConfigurationDisabled=Shared configuration disabled AutoIngestControlPanel.ShowLogFailed.Message=Case log file does not exist AutoIngestControlPanel.ShowLogFailed.Title=Unable to display case log +# {0} - case db status +# {1} - search svc Status +# {2} - coord svc Status +# {3} - msg broker status AutoIngestControlPanel.tbServicesStatusMessage.Message=Case databases {0}, keyword search {1}, coordination {2}, messaging {3} AutoIngestControlPanel.tbServicesStatusMessage.Message.Down=down AutoIngestControlPanel.tbServicesStatusMessage.Message.Unknown=unknown @@ -194,7 +198,6 @@ DeleteCaseTask.progress.deletingResourcesLockNode=Deleting case resources znode. DeleteCaseTask.progress.gettingManifestPaths=Getting manifest file paths... # {0} - manifest file path DeleteCaseTask.progress.lockingManifest=Locking manifest file {0}... -DeleteCaseTask.progress.Manifest=Deleting manifest file {0}... DeleteCaseTask.progress.openingCaseDatabase=Opening the case database... DeleteCaseTask.progress.openingCaseMetadataFile=Opening case metadata file... # {0} - manifest file path @@ -206,6 +209,7 @@ HINT_CasesDashboardTopComponent=This is an adminstrative dashboard for multi-use OpenAutoIngestLogAction.deletedLogErrorMsg=The case auto ingest log has been deleted. OpenAutoIngestLogAction.logOpenFailedErrorMsg=Failed to open case auto ingest log. See application log for details. OpenAutoIngestLogAction.menuItemText=Open Auto Ingest Log File +# {0} - caseErrorMessage OpenCaseAction.errorMsg=Failed to open case: {0} OpenCaseAction.menuItemText=Open OpenIDE-Module-Long-Description=This module contains features that are being developed by Basis Technology and are not part of the default Autopsy distribution. You can enable this module to use the new features. The features should be stable, but their exact behavior and API are subject to change.\n\nWe make no guarantee that the API of this module will not change, so developers should be careful when relying on it. diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/CasesDashboardCustomizer.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/CasesDashboardCustomizer.java index 3b6482fc4c..dbe8b507d1 100755 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/CasesDashboardCustomizer.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/CasesDashboardCustomizer.java @@ -39,7 +39,7 @@ final class CasesDashboardCustomizer implements MultiUserCaseBrowserCustomizer { private final DeleteCaseAction deleteCaseAction; private final DeleteCaseInputAction deleteCaseInputAction; private final DeleteCaseOutputAction deleteCaseOutputAction; - private final DeleteCaseInputAndOutputAction deleteAllAction; + private final DeleteCaseInputAndOutputAction deleteCaseInputAndOutputAction; /** * Constructs a customizer for the multi-user case browser panel used in the @@ -57,7 +57,7 @@ final class CasesDashboardCustomizer implements MultiUserCaseBrowserCustomizer { deleteCaseAction = new DeleteCaseAction(); deleteCaseInputAction = new DeleteCaseInputAction(); deleteCaseOutputAction = new DeleteCaseOutputAction(); - deleteAllAction = new DeleteCaseInputAndOutputAction(); + deleteCaseInputAndOutputAction = new DeleteCaseInputAndOutputAction(); } @Override @@ -96,7 +96,7 @@ final class CasesDashboardCustomizer implements MultiUserCaseBrowserCustomizer { if (CasesDashboardCustomizer.extendedFeaturesAreEnabled()) { actions.add(deleteCaseInputAction); actions.add(deleteCaseOutputAction); - actions.add(deleteAllAction); + actions.add(deleteCaseInputAndOutputAction); } else { actions.add(deleteCaseAction); }