diff --git a/Core/src/org/sleuthkit/autopsy/coordinationservice/CoordinationService.java b/Core/src/org/sleuthkit/autopsy/coordinationservice/CoordinationService.java index 5a34a80d58..50564bcf22 100644 --- a/Core/src/org/sleuthkit/autopsy/coordinationservice/CoordinationService.java +++ b/Core/src/org/sleuthkit/autopsy/coordinationservice/CoordinationService.java @@ -387,7 +387,11 @@ public final class CoordinationService { * @return */ private String getFullyQualifiedNodePath(CategoryNode category, String nodePath) { - return categoryNodeToPath.get(category.getDisplayName()) + "/" + nodePath.toUpperCase(); + if(nodePath.startsWith("/")){ + return categoryNodeToPath.get(category.getDisplayName()) + nodePath.toUpperCase(); + }else{ + return categoryNodeToPath.get(category.getDisplayName()) + "/" + nodePath.toUpperCase(); + } } /** diff --git a/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java index 81d207abae..904ab285c8 100644 --- a/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java +++ b/Core/src/org/sleuthkit/autopsy/core/UserPreferences.java @@ -238,9 +238,6 @@ public final class UserPreferences { } public static boolean getIsMultiUserModeEnabled() { - if (!IS_WINDOWS_OS) { - return false; - } return preferences.getBoolean(IS_MULTI_USER_MODE_ENABLED, false); } diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java index 6ebaa4293f..011cac5109 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java @@ -55,7 +55,7 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel { private static final String INVALID_DB_PORT_MSG = NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.validationErrMsg.invalidDatabasePort"); private static final String INVALID_MESSAGE_SERVICE_PORT_MSG = NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.validationErrMsg.invalidMessageServicePort"); private static final String INVALID_INDEXING_SERVER_PORT_MSG = NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.validationErrMsg.invalidIndexingServerPort"); - private static final String NON_WINDOWS_OS_MSG = NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.nonWindowsOs.msg"); + //private static final String NON_WINDOWS_OS_MSG = NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.nonWindowsOs.msg"); private static final long serialVersionUID = 1L; private final MultiUserSettingsPanelController controller; private final Collection textBoxes = new ArrayList<>(); @@ -124,10 +124,6 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel { addDocumentListeners(textBoxes, textBoxChangedListener); goodIcon = new ImageIcon(ImageUtilities.loadImage("org/sleuthkit/autopsy/images/good.png", false)); badIcon = new ImageIcon(ImageUtilities.loadImage("org/sleuthkit/autopsy/images/bad.png", false)); - if (!isWindowsOS) { - cbEnableMultiUser.setEnabled(false); - cbEnableMultiUser.setSelected(false); - } enableMultiUserComponents(textBoxes, cbEnableMultiUser.isSelected()); } @@ -491,11 +487,7 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel { private void cbEnableMultiUserItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_cbEnableMultiUserItemStateChanged if (!cbEnableMultiUser.isSelected()) { - if (!isWindowsOS) { - tbOops.setText(NON_WINDOWS_OS_MSG); - } else { - tbOops.setText(""); - } + tbOops.setText(""); bnTestDatabase.setEnabled(false); lbTestDatabase.setIcon(null); bnTestSolr.setEnabled(false); @@ -684,9 +676,6 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel { } void store() { - if (!isWindowsOS) { - return; - } boolean multiUserCasesEnabled = cbEnableMultiUser.isSelected(); UserPreferences.setIsMultiUserModeEnabled(multiUserCasesEnabled); @@ -741,11 +730,7 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel { * @return true if it's okay, false otherwise. */ boolean valid() { - if (!isWindowsOS) { - tbOops.setText(NON_WINDOWS_OS_MSG); - } else { - tbOops.setText(""); - } + tbOops.setText(""); if (cbEnableMultiUser.isSelected()) { return checkFieldsAndEnableButtons()