From 95769f9bc6edb03940540eb53b79f59713f77aa9 Mon Sep 17 00:00:00 2001 From: Richard Cordovano Date: Thu, 7 Nov 2019 14:14:32 -0500 Subject: [PATCH] Data source deletion support changes --- Core/src/org/sleuthkit/autopsy/casemodule/Case.java | 4 ++-- .../autopsy/casemodule/DeleteDataSourceAction.java | 6 +++--- .../sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java | 4 ++-- ...{UserFeatureAccessUtils.java => FeatureAccessUtils.java} | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) rename Core/src/org/sleuthkit/autopsy/featureaccess/{UserFeatureAccessUtils.java => FeatureAccessUtils.java} (90%) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java index 6ca6d5ce4d..067a1084d4 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java @@ -18,7 +18,7 @@ */ package org.sleuthkit.autopsy.casemodule; -import org.sleuthkit.autopsy.featureaccess.UserFeatureAccessUtils; +import org.sleuthkit.autopsy.featureaccess.FeatureAccessUtils; import com.google.common.annotations.Beta; import com.google.common.eventbus.Subscribe; import org.sleuthkit.autopsy.casemodule.multiusercases.CaseNodeData; @@ -1102,7 +1102,7 @@ public class Case { /* * Enable the case-specific actions. */ - CallableSystemAction.get(AddImageAction.class).setEnabled(Case.getCurrentCase().getMetadata().getCaseType() == CaseType.SINGLE_USER_CASE || UserFeatureAccessUtils.canCreateOrModifyMultiUserCases()); + CallableSystemAction.get(AddImageAction.class).setEnabled(Case.getCurrentCase().getMetadata().getCaseType() == CaseType.SINGLE_USER_CASE || FeatureAccessUtils.canCreateOrModifyMultiUserCases()); CallableSystemAction.get(CaseCloseAction.class).setEnabled(true); CallableSystemAction.get(CaseDetailsAction.class).setEnabled(true); CallableSystemAction.get(DataSourceSummaryAction.class).setEnabled(true); diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/DeleteDataSourceAction.java b/Core/src/org/sleuthkit/autopsy/casemodule/DeleteDataSourceAction.java index 0929509427..e59510ae9a 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/DeleteDataSourceAction.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/DeleteDataSourceAction.java @@ -27,7 +27,7 @@ import javax.swing.SwingWorker; import org.openide.util.NbBundle; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil; -import org.sleuthkit.autopsy.featureaccess.UserFeatureAccessUtils; +import org.sleuthkit.autopsy.featureaccess.FeatureAccessUtils; import org.sleuthkit.autopsy.ingest.IngestManager; import org.sleuthkit.datamodel.CaseDbSchemaVersionNumber; @@ -59,7 +59,7 @@ public final class DeleteDataSourceAction extends AbstractAction { } @NbBundle.Messages({ - "DeleteDataSourceAction.confirmationDialog.message=Are you sure you want to delete the selected data source from the case?\n Note that the case will be closed and re-opened during the deletion.", + "DeleteDataSourceAction.confirmationDialog.message=Are you sure you want to delete the selected data source from the case?\nNote that the case will be closed and re-opened during the deletion.", "DeleteDataSourceAction.exceptionMessage.dataSourceDeletionError=An error occurred while deleting the data source.\nPlease see the application log for details.", "DeleteDataSourceAction.exceptionMessage.couldNotReopenCase=Failed to re-open the case." }) @@ -113,7 +113,7 @@ public final class DeleteDataSourceAction extends AbstractAction { canBeEnabled = ((version.getMajor() > MIN_CASE_DB_SCHEMA_MAJOR_VERSION) || (version.getMajor() == MIN_CASE_DB_SCHEMA_MAJOR_VERSION && version.getMinor() >= MIN_CASE_DB_SCHEMA_MINOR_VERSION)) && !IngestManager.getInstance().isIngestRunning() && (Case.getCurrentCase().getCaseType() == Case.CaseType.SINGLE_USER_CASE - || UserFeatureAccessUtils.canCreateOrModifyMultiUserCases()); + || FeatureAccessUtils.canCreateOrModifyMultiUserCases()); } return canBeEnabled; } diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java index 76492893b2..2f39768336 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/NewCaseVisualPanel1.java @@ -18,7 +18,7 @@ */ package org.sleuthkit.autopsy.casemodule; -import org.sleuthkit.autopsy.featureaccess.UserFeatureAccessUtils; +import org.sleuthkit.autopsy.featureaccess.FeatureAccessUtils; import java.awt.Component; import org.openide.util.NbBundle; @@ -62,7 +62,7 @@ final class NewCaseVisualPanel1 extends JPanel implements DocumentListener { */ void readSettings() { caseNameTextField.setText(""); - if (UserPreferences.getIsMultiUserModeEnabled() && UserFeatureAccessUtils.canCreateOrModifyMultiUserCases()) { + if (UserPreferences.getIsMultiUserModeEnabled() && FeatureAccessUtils.canCreateOrModifyMultiUserCases()) { multiUserCaseRadioButton.setEnabled(true); multiUserCaseRadioButton.setSelected(true); } else { diff --git a/Core/src/org/sleuthkit/autopsy/featureaccess/UserFeatureAccessUtils.java b/Core/src/org/sleuthkit/autopsy/featureaccess/FeatureAccessUtils.java similarity index 90% rename from Core/src/org/sleuthkit/autopsy/featureaccess/UserFeatureAccessUtils.java rename to Core/src/org/sleuthkit/autopsy/featureaccess/FeatureAccessUtils.java index 384f0ce4f9..8cdfea7910 100644 --- a/Core/src/org/sleuthkit/autopsy/featureaccess/UserFeatureAccessUtils.java +++ b/Core/src/org/sleuthkit/autopsy/featureaccess/FeatureAccessUtils.java @@ -25,7 +25,7 @@ import org.sleuthkit.autopsy.coreutils.PlatformUtil; /** * Check if access to various features is permitted for the current user. */ -final public class UserFeatureAccessUtils { +final public class FeatureAccessUtils { private final static String MULTI_USER_ACCESS_FILE_NAME = "mualimit"; // NON-NLS private final static String MULTI_USER_ACCESS_FILE_PATH = Paths.get(PlatformUtil.getUserConfigDirectory(), MULTI_USER_ACCESS_FILE_NAME).toString(); @@ -42,9 +42,9 @@ final public class UserFeatureAccessUtils { } /** - * Private constructor to prevent instatiation of this utility class. + * Private constructor to prevent instantiation of this utility class. */ - private UserFeatureAccessUtils() { + private FeatureAccessUtils() { } }