From b8e5093be2776f22bc6a2535ddf8dbb674313313 Mon Sep 17 00:00:00 2001 From: Brian Carrier Date: Sun, 25 Oct 2015 21:01:24 -0400 Subject: [PATCH 1/2] Made username / pw optional in options panel for ActiveMQ --- .../corecomponents/MultiUserSettingsPanel.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java index c484771edf..4358a00e01 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java @@ -640,16 +640,22 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel { } /** - * Tests whether or not values have been entered in all of the message - * service settings text fields. + * Tests whether or not values have been entered in all of the + * required message service settings text fields. * * @return True or false. */ private boolean messageServiceFieldsArePopulated() { - return !tbMsgHostname.getText().trim().isEmpty() - && !tbMsgPort.getText().trim().isEmpty() - && !tbMsgUsername.getText().trim().isEmpty() - && tbMsgPassword.getPassword().length != 0; + + if ((tbMsgHostname.getText().trim().isEmpty()) || + (tbMsgPort.getText().trim().isEmpty())) { + return false; + } + + // user name and pw are optional, but make sure they are both set or both empty + boolean isUserSet = (tbMsgUsername.getText().trim().isEmpty() == false); + boolean isPwSet = (tbMsgPassword.getPassword().length != 0); + return (isUserSet == isPwSet); } void store() { From bd6d57ab5a88c0ac586ac2ddef3f7161c98ab4df Mon Sep 17 00:00:00 2001 From: Brian Carrier Date: Sun, 25 Oct 2015 21:16:23 -0400 Subject: [PATCH 2/2] Made tooltips reflect optional status --- .../org/sleuthkit/autopsy/corecomponents/Bundle.properties | 4 ++-- .../autopsy/corecomponents/MultiUserSettingsPanel.java | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties index 6daf3f2a79..7364d72922 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/Bundle.properties @@ -186,9 +186,9 @@ MultiUserSettingsPanel.bnTestMessageService.text=Test MultiUserSettingsPanel.lbMessageServiceSettings.text=ActiveMQ Message Service Settings MultiUserSettingsPanel.tbMsgPort.toolTipText=Port Number MultiUserSettingsPanel.tbMsgPort.text= -MultiUserSettingsPanel.tbMsgUsername.toolTipText=User Name +MultiUserSettingsPanel.tbMsgUsername.toolTipText=User Name (optional) MultiUserSettingsPanel.tbMsgUsername.text= -MultiUserSettingsPanel.tbMsgPassword.toolTipText=Password +MultiUserSettingsPanel.tbMsgPassword.toolTipText=Password (optional) MultiUserSettingsPanel.tbMsgPassword.text= MultiUserSettingsPanel.tbMsgHostname.toolTipText=Hostname or IP Address MultiUserSettingsPanel.tbMsgHostname.text= diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java index 4358a00e01..ad83b4340f 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/MultiUserSettingsPanel.java @@ -36,6 +36,8 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel { private static final String PORT_PROMPT = NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbPort.toolTipText"); private static final String USER_NAME_PROMPT = NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbUsername.toolTipText"); private static final String PASSWORD_PROMPT = NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbDbPassword.toolTipText"); + private static final String USER_NAME_PROMPT_OPT = NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbMsgUsername.toolTipText"); + private static final String PASSWORD_PROMPT_OPT = NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.tbMsgPassword.toolTipText"); private static final String INCOMPLETE_SETTINGS_MSG = NbBundle.getMessage(MultiUserSettingsPanel.class, "MultiUserSettingsPanel.validationErrMsg.incomplete"); 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"); @@ -70,8 +72,8 @@ public final class MultiUserSettingsPanel extends javax.swing.JPanel { textPrompts.add(new TextPrompt(PASSWORD_PROMPT, tbDbPassword)); textPrompts.add(new TextPrompt(HOST_NAME_OR_IP_PROMPT, tbMsgHostname)); textPrompts.add(new TextPrompt(PORT_PROMPT, tbMsgPort)); - textPrompts.add(new TextPrompt(USER_NAME_PROMPT, tbMsgUsername)); - textPrompts.add(new TextPrompt(PASSWORD_PROMPT, tbMsgPassword)); + textPrompts.add(new TextPrompt(USER_NAME_PROMPT_OPT, tbMsgUsername)); + textPrompts.add(new TextPrompt(PASSWORD_PROMPT_OPT, tbMsgPassword)); textPrompts.add(new TextPrompt(HOST_NAME_OR_IP_PROMPT, tbSolrHostname)); textPrompts.add(new TextPrompt(PORT_PROMPT, tbSolrPort)); configureTextPrompts(textPrompts);