From 9924cc8490c8cfcc9119a7931c13d65f1c444c83 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 07 Apr 2015 15:21:18 +0000
Subject: [PATCH] OPENDJ-1714 Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java | 70 ++---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java | 612 ++++++++++++++++++++++----------------------------
2 files changed, 301 insertions(+), 381 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
index d8e45a5..1db10c2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
@@ -31,6 +31,8 @@
import static org.forgerock.util.Utils.*;
import static org.opends.messages.QuickSetupMessages.*;
+import static org.opends.quicksetup.util.Utils.*;
+
import static com.forgerock.opendj.util.OperatingSystem.isWindows;
import org.opends.admin.ads.ServerDescriptor;
@@ -46,14 +48,29 @@
import org.opends.quicksetup.util.ProgressMessageFormatter;
import org.opends.quicksetup.util.Utils;
-import javax.swing.*;
+import javax.swing.Box;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JEditorPane;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
import javax.swing.border.EmptyBorder;
import javax.swing.text.JTextComponent;
-import java.awt.*;
+
+import java.awt.CardLayout;
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
import java.util.Map;
import java.util.TreeSet;
@@ -65,13 +82,12 @@
private static final long serialVersionUID = -7356174829193265699L;
- private boolean displayServerLocation;
+ private static final String EOL = System.getProperty("line.separator");
- private HashMap<FieldName, JLabel> hmLabels =
- new HashMap<FieldName, JLabel>();
+ private final boolean displayServerLocation;
- private HashMap<FieldName, JTextComponent> hmFields =
- new HashMap<FieldName, JTextComponent>();
+ private final HashMap<FieldName, JLabel> hmLabels = new HashMap<FieldName, JLabel>();
+ private final HashMap<FieldName, JTextComponent> hmFields = new HashMap<FieldName, JTextComponent>();
private JPanel bottomComponent;
private JCheckBox startCheckBox;
private JCheckBox enableWindowsServiceCheckBox;
@@ -79,8 +95,7 @@
private JComboBox viewCombo;
private final LocalizableMessage DISPLAY_TEXT = INFO_REVIEW_DISPLAY_TEXT.get();
- private final LocalizableMessage DISPLAY_EQUIVALENT_COMMAND =
- INFO_REVIEW_DISPLAY_EQUIVALENT_COMMAND.get();
+ private final LocalizableMessage DISPLAY_EQUIVALENT_COMMAND = INFO_REVIEW_DISPLAY_EQUIVALENT_COMMAND.get();
private JComponent cardLayoutPanel;
@@ -90,8 +105,9 @@
/**
* Constructor of the panel.
- * @param application Application represented by this panel
- * the fields of the panel.
+ *
+ * @param application
+ * Application represented by this panel the fields of the panel.
*/
public InstallReviewPanel(GuiApplication application)
{
@@ -101,49 +117,35 @@
}
/** {@inheritDoc} */
+ @Override
public void beginDisplay(UserData userData)
{
if (displayServerLocation)
{
setFieldValue(FieldName.SERVER_LOCATION, userData.getServerLocation());
}
- setFieldValue(FieldName.HOST_NAME,
- String.valueOf(userData.getHostName()));
- setFieldValue(FieldName.SERVER_PORT,
- String.valueOf(userData.getServerPort()));
- setFieldValue(FieldName.ADMIN_CONNECTOR_PORT,
- String.valueOf(userData.getAdminConnectorPort()));
- setFieldValue(FieldName.SECURITY_OPTIONS,
- Utils.getSecurityOptionsString(userData.getSecurityOptions(), false));
- setFieldValue(FieldName.DIRECTORY_MANAGER_DN, userData
- .getDirectoryManagerDn());
+ setFieldValue(FieldName.HOST_NAME, userData.getHostName());
+ setFieldValue(FieldName.SERVER_PORT, Integer.toString(userData.getServerPort()));
+ setFieldValue(FieldName.ADMIN_CONNECTOR_PORT, Integer.toString((userData.getAdminConnectorPort())));
+ setFieldValue(FieldName.SECURITY_OPTIONS, Utils.getSecurityOptionsString(userData.getSecurityOptions(), false));
+ setFieldValue(FieldName.DIRECTORY_MANAGER_DN, userData.getDirectoryManagerDn());
setFieldValue(FieldName.DATA_OPTIONS, Utils.getDataDisplayString(userData));
- if (userData.mustCreateAdministrator())
- {
- setFieldValue(FieldName.GLOBAL_ADMINISTRATOR_UID,
- String.valueOf(userData.getGlobalAdministratorUID()));
- getField(FieldName.GLOBAL_ADMINISTRATOR_UID).setVisible(true);
- getLabel(FieldName.GLOBAL_ADMINISTRATOR_UID).setVisible(true);
- }
- else
- {
- getField(FieldName.GLOBAL_ADMINISTRATOR_UID).setVisible(false);
- getLabel(FieldName.GLOBAL_ADMINISTRATOR_UID).setVisible(false);
- }
- if (userData.getReplicationOptions().getType() ==
- DataReplicationOptions.Type.STANDALONE)
+ final boolean mustCreateAdministrator = userData.mustCreateAdministrator();
+ if (mustCreateAdministrator)
{
- getField(FieldName.REPLICATION_PORT).setVisible(false);
- getLabel(FieldName.REPLICATION_PORT).setVisible(false);
+ setFieldValue(FieldName.GLOBAL_ADMINISTRATOR_UID, userData.getGlobalAdministratorUID());
}
- else
+ getField(FieldName.GLOBAL_ADMINISTRATOR_UID).setVisible(mustCreateAdministrator);
+ getLabel(FieldName.GLOBAL_ADMINISTRATOR_UID).setVisible(mustCreateAdministrator);
+
+ final boolean standalone = userData.getReplicationOptions().getType() == DataReplicationOptions.Type.STANDALONE;
+ if (!standalone)
{
- setFieldValue(FieldName.REPLICATION_PORT,
- getReplicationPortString(userData));
- getField(FieldName.REPLICATION_PORT).setVisible(true);
- getLabel(FieldName.REPLICATION_PORT).setVisible(true);
+ setFieldValue(FieldName.REPLICATION_PORT, getReplicationPortString(userData));
}
+ getField(FieldName.REPLICATION_PORT).setVisible(!standalone);
+ getLabel(FieldName.REPLICATION_PORT).setVisible(!standalone);
setFieldValue(FieldName.SERVER_JAVA_ARGUMENTS, getRuntimeString(userData));
@@ -155,41 +157,47 @@
/**
* Creates and returns the instructions panel.
+ *
* @return the instructions panel.
*/
+ @Override
protected Component createInstructionsPanel()
{
- JPanel instructionsPanel = new JPanel(new GridBagLayout());
+ final JPanel instructionsPanel = new JPanel(new GridBagLayout());
instructionsPanel.setOpaque(false);
- LocalizableMessage instructions = getInstructions();
- JLabel l = new JLabel(instructions.toString());
+ final LocalizableMessage instructions = getInstructions();
+ final JLabel l = new JLabel(instructions.toString());
l.setFont(UIFactory.INSTRUCTIONS_FONT);
- LocalizableMessage[] values = {
+ final LocalizableMessage[] values = {
DISPLAY_TEXT,
DISPLAY_EQUIVALENT_COMMAND
};
- DefaultComboBoxModel model = new DefaultComboBoxModel(values);
+
+ final DefaultComboBoxModel model = new DefaultComboBoxModel(values);
viewCombo = new JComboBox();
viewCombo.setModel(model);
viewCombo.setSelectedIndex(0);
viewCombo.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent ev)
{
updateInputPanel();
}
});
- GridBagConstraints gbc = new GridBagConstraints();
+ final GridBagConstraints gbc = new GridBagConstraints();
gbc.gridx = 0;
gbc.gridy = 0;
gbc.anchor = GridBagConstraints.WEST;
instructionsPanel.add(l, gbc);
+
gbc.gridx = 1;
gbc.weightx = 1.0;
instructionsPanel.add(Box.createHorizontalGlue(), gbc);
+
gbc.gridx = 2;
gbc.weightx = 0.0;
gbc.insets.left = UIFactory.LEFT_INSET_BROWSE;
@@ -199,19 +207,20 @@
}
/** {@inheritDoc} */
+ @Override
protected boolean requiresScroll()
{
return false;
}
/** {@inheritDoc} */
+ @Override
protected Component createInputPanel()
{
- JPanel panel = UIFactory.makeJPanel();
+ final JPanel panel = UIFactory.makeJPanel();
panel.setLayout(new GridBagLayout());
- GridBagConstraints gbc = new GridBagConstraints();
-
+ final GridBagConstraints gbc = new GridBagConstraints();
gbc.insets = UIFactory.getEmptyInsets();
gbc.gridwidth = GridBagConstraints.REMAINDER;
gbc.weightx = 1.0;
@@ -219,7 +228,7 @@
gbc.fill = GridBagConstraints.BOTH;
panel.add(createFieldsPanel(), gbc);
- JComponent chk = getBottomComponent();
+ final JComponent chk = getBottomComponent();
if (chk != null) {
gbc.insets.top = UIFactory.TOP_INSET_PRIMARY_FIELD;
gbc.weighty = 0.0;
@@ -231,27 +240,30 @@
}
/** {@inheritDoc} */
+ @Override
public Object getFieldValue(FieldName fieldName)
{
- Object value = null;
if (fieldName == FieldName.SERVER_START_INSTALLER)
{
- value = getStartCheckBox().isSelected();
+ return getStartCheckBox().isSelected();
}
else if (fieldName == FieldName.ENABLE_WINDOWS_SERVICE)
{
- value = getEnableWindowsServiceCheckBox().isSelected();
+ return getEnableWindowsServiceCheckBox().isSelected();
}
- return value;
+
+ return null;
}
/** {@inheritDoc} */
+ @Override
protected LocalizableMessage getInstructions()
{
return INFO_REVIEW_PANEL_INSTRUCTIONS.get();
}
/** {@inheritDoc} */
+ @Override
protected LocalizableMessage getTitle()
{
return INFO_REVIEW_PANEL_TITLE.get();
@@ -259,17 +271,14 @@
private void updateInputPanel()
{
- CardLayout cl = (CardLayout)cardLayoutPanel.getLayout();
+ final CardLayout cl = (CardLayout) cardLayoutPanel.getLayout();
cl.show(cardLayoutPanel, viewCombo.getSelectedItem().toString());
}
- /**
- * Create the components and populate the Maps.
- */
+ /** Create the components and populate the Maps. */
private void populateLabelAndFieldsMap()
{
- HashMap<FieldName, LabelFieldDescriptor> hm =
- new HashMap<FieldName, LabelFieldDescriptor>();
+ final HashMap<FieldName, LabelFieldDescriptor> hm = new HashMap<FieldName, LabelFieldDescriptor>();
if (displayServerLocation)
{
@@ -293,10 +302,10 @@
LabelFieldDescriptor.LabelType.PRIMARY, 0));
hm.put(FieldName.ADMIN_CONNECTOR_PORT, new LabelFieldDescriptor(
- INFO_ADMIN_CONNECTOR_PORT_LABEL.get(),
- INFO_ADMIN_CONNECTOR_PORT_TOOLTIP.get(),
- LabelFieldDescriptor.FieldType.READ_ONLY,
- LabelFieldDescriptor.LabelType.PRIMARY, 0));
+ INFO_ADMIN_CONNECTOR_PORT_LABEL.get(),
+ INFO_ADMIN_CONNECTOR_PORT_TOOLTIP.get(),
+ LabelFieldDescriptor.FieldType.READ_ONLY,
+ LabelFieldDescriptor.LabelType.PRIMARY, 0));
hm.put(FieldName.SECURITY_OPTIONS, new LabelFieldDescriptor(
INFO_SERVER_SECURITY_LABEL.get(),
@@ -326,92 +335,51 @@
LabelFieldDescriptor.LabelType.PRIMARY, 0));
hm.put(FieldName.SERVER_JAVA_ARGUMENTS, new LabelFieldDescriptor(
- INFO_RUNTIME_OPTIONS_LABEL.get(), null,
- LabelFieldDescriptor.FieldType.READ_ONLY,
- LabelFieldDescriptor.LabelType.PRIMARY, 0));
+ INFO_RUNTIME_OPTIONS_LABEL.get(), null,
+ LabelFieldDescriptor.FieldType.READ_ONLY,
+ LabelFieldDescriptor.LabelType.PRIMARY, 0));
- for (FieldName fieldName : hm.keySet())
+ for (final FieldName fieldName : hm.keySet())
{
- LabelFieldDescriptor desc = hm.get(fieldName);
-
- JTextComponent field = UIFactory.makeJTextComponent(desc, null);
+ final LabelFieldDescriptor desc = hm.get(fieldName);
+ final JLabel label = UIFactory.makeJLabel(desc);
+ final JTextComponent field = UIFactory.makeJTextComponent(desc, null);
field.setOpaque(false);
- JLabel label = UIFactory.makeJLabel(desc);
-
- hmFields.put(fieldName, field);
label.setLabelFor(field);
+ hmFields.put(fieldName, field);
hmLabels.put(fieldName, label);
}
}
- /**
- * Returns the label associated with the given field name.
- * @param fieldName the field name for which we want to retrieve the JLabel.
- * @return the label associated with the given field name.
- */
private JLabel getLabel(FieldName fieldName)
{
return hmLabels.get(fieldName);
}
- /**
- * Returns the JTextComponent associated with the given field name.
- * @param fieldName the field name for which we want to retrieve the
- * JTextComponent.
- * @return the JTextComponent associated with the given field name.
- */
private JTextComponent getField(FieldName fieldName)
{
return hmFields.get(fieldName);
}
- /**
- * Updates the JTextComponent associated with a FieldName with a text value.
- * @param fieldName the field name of the JTextComponent that we want to
- * update.
- * @param value the value to be set.
- */
private void setFieldValue(FieldName fieldName, String value)
{
getField(fieldName).setText(value);
}
- /**
- * Returns the String representing the replication port configuration.
- * @param userInstallData the install data provided of the user.
- * @return the localized string describing the Replication Ports chosen by
- * the user.
- */
private String getReplicationPortString(UserData userInstallData)
{
- LocalizableMessageBuilder buf = new LocalizableMessageBuilder();
+ final LocalizableMessageBuilder buf = new LocalizableMessageBuilder();
+ final DataReplicationOptions repl = userInstallData.getReplicationOptions();
+ final SuffixesToReplicateOptions suf = userInstallData.getSuffixesToReplicateOptions();
+ final Map<ServerDescriptor, AuthenticationData> remotePorts = userInstallData.getRemoteWithNoReplicationPort();
- DataReplicationOptions repl =
- userInstallData.getReplicationOptions();
-
- SuffixesToReplicateOptions suf =
- userInstallData.getSuffixesToReplicateOptions();
-
- Map<ServerDescriptor, AuthenticationData> remotePorts =
- userInstallData.getRemoteWithNoReplicationPort();
-
- if ((repl.getType() == DataReplicationOptions.Type.IN_EXISTING_TOPOLOGY) &&
- (suf.getType() ==
- SuffixesToReplicateOptions.Type.REPLICATE_WITH_EXISTING_SUFFIXES) &&
- remotePorts.size() > 0)
+ if (repl.getType() == DataReplicationOptions.Type.IN_EXISTING_TOPOLOGY
+ && suf.getType() == SuffixesToReplicateOptions.Type.REPLICATE_WITH_EXISTING_SUFFIXES
+ && remotePorts.size() > 0)
{
- String serverToConnectDisplay;
- AuthenticationData authData =
- userInstallData.getReplicationOptions().getAuthenticationData();
- if (authData != null)
- {
- serverToConnectDisplay = authData.getHostName()+":"+authData.getPort();
- }
- else
- {
- serverToConnectDisplay = "";
- }
+ final AuthenticationData authData = userInstallData.getReplicationOptions().getAuthenticationData();
+ final String serverToConnectDisplay = authData == null ? "" : authData.getHostName() + ":" + authData.getPort();
String s;
if (userInstallData.getReplicationOptions().useSecureReplication())
{
@@ -420,12 +388,12 @@
}
else
{
- s = String.valueOf(userInstallData.getReplicationOptions()
- .getReplicationPort());
+ s = Integer.toString(userInstallData.getReplicationOptions().getReplicationPort());
}
buf.append(s);
- TreeSet<LocalizableMessage> remoteServerLines = new TreeSet<LocalizableMessage>();
- for (ServerDescriptor server : remotePorts.keySet())
+
+ final TreeSet<LocalizableMessage> remoteServerLines = new TreeSet<LocalizableMessage>();
+ for (final ServerDescriptor server : remotePorts.keySet())
{
String serverDisplay;
if (server.getHostPort(false).equalsIgnoreCase(serverToConnectDisplay))
@@ -436,91 +404,72 @@
{
serverDisplay = server.getHostPort(true);
}
- AuthenticationData repPort = remotePorts.get(server);
+
+ final AuthenticationData repPort = remotePorts.get(server);
if (repPort.useSecureConnection())
{
s = INFO_SECURE_REPLICATION_PORT_LABEL.get(repPort.getPort()).toString();
}
else
{
- s = String.valueOf(repPort.getPort());
+ s = Integer.toString(repPort.getPort());
}
- remoteServerLines.add(INFO_REMOTE_SERVER_REPLICATION_PORT.get(s,
- serverDisplay));
+ remoteServerLines.add(INFO_REMOTE_SERVER_REPLICATION_PORT.get(s, serverDisplay));
}
- for (LocalizableMessage line : remoteServerLines)
+
+ for (final LocalizableMessage line : remoteServerLines)
{
- buf.append("\n").append(line);
+ buf.append(EOL).append(line);
}
}
else
{
buf.append(userInstallData.getReplicationOptions().getReplicationPort());
}
+
return buf.toString();
}
- /**
- * Returns the String representing the runtime configuration.
- * @param userData the DataOptions of the user.
- * @return the localized string describing the runtime options chosen by the
- * user.
- */
private String getRuntimeString(UserData userData)
{
- String s;
- JavaArguments serverArguments =
- userData.getJavaArguments(UserData.SERVER_SCRIPT_NAME);
- JavaArguments importArguments =
- userData.getJavaArguments(UserData.IMPORT_SCRIPT_NAME);
-
-
- boolean defaultServer =
- userData.getDefaultJavaArguments(UserData.SERVER_SCRIPT_NAME).equals(
- serverArguments);
- boolean defaultImport =
- userData.getDefaultJavaArguments(UserData.IMPORT_SCRIPT_NAME).equals(
- importArguments);
+ final JavaArguments serverArguments = userData.getJavaArguments(UserData.SERVER_SCRIPT_NAME);
+ final JavaArguments importArguments = userData.getJavaArguments(UserData.IMPORT_SCRIPT_NAME);
+ final boolean defaultServer = userData.getDefaultJavaArguments(UserData.SERVER_SCRIPT_NAME).equals(serverArguments);
+ final boolean defaultImport = userData.getDefaultJavaArguments(UserData.IMPORT_SCRIPT_NAME).equals(importArguments);
if (defaultServer && defaultImport)
{
- s = INFO_DEFAULT_JAVA_ARGUMENTS.get().toString();
+ return INFO_DEFAULT_JAVA_ARGUMENTS.get().toString();
}
else if (defaultServer)
{
- s = INFO_USE_CUSTOM_IMPORT_RUNTIME.get(
- importArguments.getStringArguments()).toString();
+ return INFO_USE_CUSTOM_IMPORT_RUNTIME.get(importArguments.getStringArguments()).toString();
}
else if (defaultImport)
{
- s = INFO_USE_CUSTOM_SERVER_RUNTIME.get(
- serverArguments.getStringArguments()).toString();
+ return INFO_USE_CUSTOM_SERVER_RUNTIME.get(serverArguments.getStringArguments()).toString();
}
- else
- {
- s = INFO_USE_CUSTOM_SERVER_RUNTIME.get(
- serverArguments.getStringArguments())+"\n"+
- INFO_USE_CUSTOM_IMPORT_RUNTIME.get(
- importArguments.getStringArguments());
- }
- return s;
+
+ return INFO_USE_CUSTOM_SERVER_RUNTIME.get(serverArguments.getStringArguments()) + EOL
+ + INFO_USE_CUSTOM_IMPORT_RUNTIME.get(importArguments.getStringArguments());
}
/**
* Returns and creates the fields panel.
+ *
* @return the fields panel.
*/
+ @Override
protected JPanel createFieldsPanel()
{
- JPanel fieldsPanel = new JPanel(new GridBagLayout());
+ final JPanel fieldsPanel = new JPanel(new GridBagLayout());
fieldsPanel.setOpaque(false);
- GridBagConstraints gbc = new GridBagConstraints();
-
+ final GridBagConstraints gbc = new GridBagConstraints();
cardLayoutPanel = new JPanel(new CardLayout());
cardLayoutPanel.setOpaque(false);
- JComponent p = createReadOnlyPanel();
+ final JComponent p = createReadOnlyPanel();
p.setBorder(new EmptyBorder(UIFactory.TOP_INSET_SECONDARY_FIELD,
UIFactory.LEFT_INSET_SECONDARY_FIELD,
UIFactory.BOTTOM_INSET_SECONDARY_FIELD,
@@ -548,70 +497,64 @@
gbc.gridwidth = 3;
gbc.fill = GridBagConstraints.BOTH;
fieldsPanel.add(cardLayoutPanel, gbc);
+
return fieldsPanel;
}
private JComponent createReadOnlyPanel()
{
- JPanel panel = new JPanel(new GridBagLayout());
+ final JPanel panel = new JPanel(new GridBagLayout());
panel.setOpaque(false);
- GridBagConstraints gbc = new GridBagConstraints();
+ final GridBagConstraints gbc = new GridBagConstraints();
- FieldName[] fieldNames;
+ final List<FieldName> fieldNames = new LinkedList<FieldName>();
if (displayServerLocation)
{
- fieldNames =
- new FieldName[]
- {
- FieldName.SERVER_LOCATION, FieldName.HOST_NAME,
- FieldName.SERVER_PORT, FieldName.ADMIN_CONNECTOR_PORT,
- FieldName.SECURITY_OPTIONS,
- FieldName.DIRECTORY_MANAGER_DN, FieldName.GLOBAL_ADMINISTRATOR_UID,
- FieldName.DATA_OPTIONS, FieldName.REPLICATION_PORT,
- FieldName.SERVER_JAVA_ARGUMENTS
- };
- }
- else
- {
- fieldNames =
- new FieldName[]
- {
- FieldName.HOST_NAME, FieldName.SERVER_PORT,
- FieldName.ADMIN_CONNECTOR_PORT,
- FieldName.SECURITY_OPTIONS, FieldName.DIRECTORY_MANAGER_DN,
- FieldName.GLOBAL_ADMINISTRATOR_UID, FieldName.DATA_OPTIONS,
- FieldName.REPLICATION_PORT, FieldName.SERVER_JAVA_ARGUMENTS
- };
+ fieldNames.add(FieldName.SERVER_LOCATION);
}
- for (int i = 0; i < fieldNames.length; i++)
+ fieldNames.addAll(Arrays.asList(
+ new FieldName[] {
+ FieldName.HOST_NAME, FieldName.SERVER_PORT,
+ FieldName.ADMIN_CONNECTOR_PORT, FieldName.SECURITY_OPTIONS,
+ FieldName.DIRECTORY_MANAGER_DN, FieldName.GLOBAL_ADMINISTRATOR_UID,
+ FieldName.DATA_OPTIONS, FieldName.REPLICATION_PORT,
+ FieldName.SERVER_JAVA_ARGUMENTS
+ }
+ ));
+
+ boolean isFirst = true;
+ for (final FieldName fieldName : fieldNames)
{
gbc.gridwidth = GridBagConstraints.RELATIVE;
gbc.weightx = 0.0;
- if (i > 0)
+ if (!isFirst)
{
gbc.insets.top = UIFactory.TOP_INSET_PRIMARY_FIELD;
- } else
+ }
+ else
{
gbc.insets.top = 0;
}
gbc.insets.left = 0;
gbc.anchor = GridBagConstraints.NORTHWEST;
- panel.add(getLabel(fieldNames[i]), gbc);
+ panel.add(getLabel(fieldName), gbc);
gbc.weightx = 1.0;
gbc.fill = GridBagConstraints.HORIZONTAL;
- if (i > 0)
+ if (!isFirst)
{
gbc.insets.top = UIFactory.TOP_INSET_PRIMARY_FIELD;
- } else
+ }
+ else
{
gbc.insets.top = 0;
}
gbc.insets.left = UIFactory.LEFT_INSET_PRIMARY_FIELD;
-
gbc.gridwidth = GridBagConstraints.REMAINDER;
- panel.add(getField(fieldNames[i]), gbc);
+
+ panel.add(getField(fieldName), gbc);
+ isFirst = false;
}
gbc.weighty = 1.0;
@@ -622,42 +565,51 @@
return panel;
}
- private Component createEquivalentCommandPanel(JScrollPane scroll)
+ private Component createEquivalentCommandPanel(final JScrollPane scroll)
{
equivalentCommandPane = UIFactory.makeProgressPane(scroll);
equivalentCommandPane.setAutoscrolls(true);
scroll.setViewportView(equivalentCommandPane);
equivalentCommandPane.setOpaque(false);
+
return equivalentCommandPane;
}
/** {@inheritDoc} */
+ @Override
protected JComponent getBottomComponent()
{
if (bottomComponent == null)
{
bottomComponent = new JPanel(new GridBagLayout());
bottomComponent.setOpaque(false);
- GridBagConstraints gbc = new GridBagConstraints();
+
+ final GridBagConstraints gbc = new GridBagConstraints();
gbc.anchor = GridBagConstraints.WEST;
- JPanel auxPanel = new JPanel(new GridBagLayout());
+
+ final JPanel auxPanel = new JPanel(new GridBagLayout());
auxPanel.setOpaque(false);
+
gbc.gridwidth = 3;
auxPanel.add(getStartCheckBox(), gbc);
+
gbc.insets.left = UIFactory.LEFT_INSET_SECONDARY_FIELD;
gbc.gridwidth = GridBagConstraints.RELATIVE;
auxPanel.add(getWarningLabel(), gbc);
+
gbc.gridwidth = GridBagConstraints.REMAINDER;
gbc.insets.left = 0;
gbc.weightx = 1.0;
auxPanel.add(Box.createHorizontalGlue(), gbc);
bottomComponent.add(auxPanel, gbc);
+
if (isWindows())
{
gbc.insets.top = UIFactory.TOP_INSET_PRIMARY_FIELD;
bottomComponent.add(getEnableWindowsServiceCheckBox(), gbc);
}
}
+
return bottomComponent;
}
@@ -666,8 +618,8 @@
if (warningLabel == null)
{
warningLabel = UIFactory.makeJLabel(UIFactory.IconType.WARNING,
- INFO_INSTALL_SERVER_MUST_BE_TEMPORARILY_STARTED.get(),
- UIFactory.TextStyle.READ_ONLY);
+ INFO_INSTALL_SERVER_MUST_BE_TEMPORARILY_STARTED.get(),
+ UIFactory.TextStyle.READ_ONLY);
}
return warningLabel;
}
@@ -676,13 +628,13 @@
{
if (startCheckBox == null)
{
- startCheckBox =
- UIFactory.makeJCheckBox(INFO_START_SERVER_LABEL.get(),
- INFO_START_SERVER_TOOLTIP.get(), UIFactory.TextStyle.CHECKBOX);
- startCheckBox.setSelected(
- getApplication().getUserData().getStartServer());
+ startCheckBox = UIFactory.makeJCheckBox(INFO_START_SERVER_LABEL.get(),
+ INFO_START_SERVER_TOOLTIP.get(),
+ UIFactory.TextStyle.CHECKBOX);
+ startCheckBox.setSelected(getApplication().getUserData().getStartServer());
startCheckBox.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent ev)
{
checkStartWarningLabel();
@@ -691,6 +643,7 @@
}
});
}
+
return startCheckBox;
}
@@ -698,205 +651,174 @@
{
if (enableWindowsServiceCheckBox == null)
{
- enableWindowsServiceCheckBox =
- UIFactory.makeJCheckBox(INFO_ENABLE_WINDOWS_SERVICE_LABEL.get(),
- INFO_ENABLE_WINDOWS_SERVICE_TOOLTIP.get(),
- UIFactory.TextStyle.CHECKBOX);
- enableWindowsServiceCheckBox.setSelected(
- getApplication().getUserData().getEnableWindowsService());
+ enableWindowsServiceCheckBox = UIFactory.makeJCheckBox(INFO_ENABLE_WINDOWS_SERVICE_LABEL.get(),
+ INFO_ENABLE_WINDOWS_SERVICE_TOOLTIP.get(),
+ UIFactory.TextStyle.CHECKBOX);
+ enableWindowsServiceCheckBox.setSelected(getApplication().getUserData().getEnableWindowsService());
enableWindowsServiceCheckBox.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent ev)
{
if (isWindows())
{
- lastUserData.setEnableWindowsService(
- enableWindowsServiceCheckBox.isSelected());
+ lastUserData.setEnableWindowsService(enableWindowsServiceCheckBox.isSelected());
updateEquivalentCommand(lastUserData);
}
}
});
}
+
return enableWindowsServiceCheckBox;
}
/**
- * Depending on whether we want to replicate or not, we do have to start
- * the server temporarily to update its configuration and initialize data.
+ * Depending on whether we want to replicate or not, we do have to start the
+ * server temporarily to update its configuration and initialize data.
*/
private void checkStartWarningLabel()
{
boolean visible = !getStartCheckBox().isSelected();
if (visible)
{
- UserData userData = getApplication().getUserData();
- DataReplicationOptions rep = userData.getReplicationOptions();
- visible = rep.getType() != DataReplicationOptions.Type.STANDALONE;
+ final UserData userData = getApplication().getUserData();
+ visible = userData.getReplicationOptions().getType() != DataReplicationOptions.Type.STANDALONE;
}
getWarningLabel().setVisible(visible);
}
private void updateEquivalentCommand(UserData userData)
{
- HtmlProgressMessageFormatter formatter =
- new HtmlProgressMessageFormatter();
- StringBuilder sb = new StringBuilder();
+ final HtmlProgressMessageFormatter formatter = new HtmlProgressMessageFormatter();
+ final StringBuilder sb = new StringBuilder();
- String s = getEquivalentJavaPropertiesProcedure(userData, formatter);
+ final String s = getEquivalentJavaPropertiesProcedure(userData, formatter);
if (s != null && s.length() > 0)
{
- sb.append(s);
- sb.append(formatter.getTaskSeparator());
+ sb.append(s)
+ .append(formatter.getTaskSeparator());
}
- sb.append(formatter.getFormattedProgress(
- INFO_INSTALL_SETUP_EQUIVALENT_COMMAND_LINE.get()));
- sb.append(formatter.getLineBreak());
- sb.append(Constants.HTML_BOLD_OPEN)
- .append(Utils.getFormattedEquivalentCommandLine(
- Utils.getSetupEquivalentCommandLine(userData), formatter))
- .append(Constants.HTML_BOLD_CLOSE);
- if (userData.getReplicationOptions().getType() ==
- DataReplicationOptions.Type.IN_EXISTING_TOPOLOGY)
+ sb.append(formatter.getFormattedProgress(INFO_INSTALL_SETUP_EQUIVALENT_COMMAND_LINE.get()))
+ .append(formatter.getLineBreak())
+ .append(Constants.HTML_BOLD_OPEN)
+ .append(getFormattedEquivalentCommandLine(getSetupEquivalentCommandLine(userData), formatter))
+ .append(Constants.HTML_BOLD_CLOSE);
+
+ if (userData.getReplicationOptions().getType() == DataReplicationOptions.Type.IN_EXISTING_TOPOLOGY)
{
sb.append(formatter.getTaskSeparator());
- ArrayList<ArrayList<String>> cmdLines =
- Utils.getDsReplicationEnableEquivalentCommandLines(userData);
+ final List<List<String>> cmdLines = getDsReplicationEnableEquivalentCommandLines(userData);
if (cmdLines.size() == 1)
{
- sb.append(formatter.getFormattedProgress(
- INFO_INSTALL_ENABLE_REPLICATION_EQUIVALENT_COMMAND_LINE.get()));
+ sb.append(formatter.getFormattedProgress(INFO_INSTALL_ENABLE_REPLICATION_EQUIVALENT_COMMAND_LINE.get()));
}
else if (cmdLines.size() > 1)
{
- sb.append(formatter.getFormattedProgress(
- INFO_INSTALL_ENABLE_REPLICATION_EQUIVALENT_COMMAND_LINES.get()));
- }
- for (ArrayList<String> cmdLine : cmdLines)
- {
- sb.append(formatter.getLineBreak());
- sb.append(Constants.HTML_BOLD_OPEN)
- .append(Utils.getFormattedEquivalentCommandLine(cmdLine,
- formatter))
- .append(Constants.HTML_BOLD_CLOSE);
+ sb.append(formatter.getFormattedProgress(INFO_INSTALL_ENABLE_REPLICATION_EQUIVALENT_COMMAND_LINES.get()));
}
- sb.append(formatter.getLineBreak());
- sb.append(formatter.getLineBreak());
- cmdLines =
- Utils.getDsReplicationInitializeEquivalentCommandLines(userData);
- if (cmdLines.size() == 1)
+ for (final List<String> cmdLine : cmdLines)
{
- sb.append(formatter.getFormattedProgress(
- INFO_INSTALL_INITIALIZE_REPLICATION_EQUIVALENT_COMMAND_LINE.get()));
- }
- else if (cmdLines.size() > 1)
- {
- sb.append(formatter.getFormattedProgress(
- INFO_INSTALL_INITIALIZE_REPLICATION_EQUIVALENT_COMMAND_LINES.get()));
- }
-
- for (ArrayList<String> cmdLine : cmdLines)
- {
- sb.append(formatter.getLineBreak());
- sb.append(Constants.HTML_BOLD_OPEN)
- .append(Utils.getFormattedEquivalentCommandLine(cmdLine,
- formatter))
- .append(Constants.HTML_BOLD_CLOSE);
- }
- }
- else if (userData.getReplicationOptions().getType() ==
- DataReplicationOptions.Type.FIRST_IN_TOPOLOGY)
- {
- sb.append(formatter.getTaskSeparator());
- sb.append(formatter.getFormattedProgress(
- INFO_INSTALL_ENABLE_REPLICATION_EQUIVALENT_COMMAND_LINES.get()));
- ArrayList<ArrayList<String>> cmdLines =
- Utils.getDsConfigReplicationEnableEquivalentCommandLines(userData);
- for (ArrayList<String> cmdLine : cmdLines)
- {
- sb.append(formatter.getLineBreak());
- sb.append(Constants.HTML_BOLD_OPEN)
- .append(Utils.getFormattedEquivalentCommandLine(cmdLine,
- formatter))
- .append(Constants.HTML_BOLD_CLOSE);
- }
- }
-
- if (userData.getReplicationOptions().getType() !=
- DataReplicationOptions.Type.STANDALONE &&
- !userData.getStartServer())
- {
- sb.append(formatter.getTaskSeparator());
- String cmd =
- Utils.getPath(Installation.getLocal().getServerStopCommandFile());
- sb.append(formatter.getFormattedProgress(
- INFO_INSTALL_STOP_SERVER_EQUIVALENT_COMMAND_LINE.get()));
- sb.append(formatter.getLineBreak());
- sb.append(Constants.HTML_BOLD_OPEN)
- .append(formatter.getFormattedProgress(LocalizableMessage.raw(cmd)))
+ sb.append(formatter.getLineBreak())
+ .append(Constants.HTML_BOLD_OPEN)
+ .append(getFormattedEquivalentCommandLine(cmdLine, formatter))
.append(Constants.HTML_BOLD_CLOSE);
+ }
+
+ sb.append(formatter.getLineBreak());
+ sb.append(formatter.getLineBreak());
+ final List<List<String>> dsReplicationCmdLines = getDsReplicationInitializeEquivalentCommandLines(userData);
+
+ if (cmdLines.size() == 1)
+ {
+ sb.append(formatter.getFormattedProgress(INFO_INSTALL_INITIALIZE_REPLICATION_EQUIVALENT_COMMAND_LINE.get()));
+ }
+ else if (cmdLines.size() > 1)
+ {
+ sb.append(formatter.getFormattedProgress(INFO_INSTALL_INITIALIZE_REPLICATION_EQUIVALENT_COMMAND_LINES.get()));
+ }
+
+ for (final List<String> cmdLine : dsReplicationCmdLines)
+ {
+ sb.append(formatter.getLineBreak())
+ .append(Constants.HTML_BOLD_OPEN)
+ .append(Utils.getFormattedEquivalentCommandLine(cmdLine, formatter))
+ .append(Constants.HTML_BOLD_CLOSE);
+ }
}
+ else if (userData.getReplicationOptions().getType() == DataReplicationOptions.Type.FIRST_IN_TOPOLOGY)
+ {
+ sb.append(formatter.getTaskSeparator())
+ .append(formatter.getFormattedProgress(INFO_INSTALL_ENABLE_REPLICATION_EQUIVALENT_COMMAND_LINES.get()));
+ for (final List<String> cmdLine : getDsConfigReplicationEnableEquivalentCommandLines(userData))
+ {
+ sb.append(formatter.getLineBreak())
+ .append(Constants.HTML_BOLD_OPEN)
+ .append(Utils.getFormattedEquivalentCommandLine(cmdLine, formatter))
+ .append(Constants.HTML_BOLD_CLOSE);
+ }
+ }
+
+ if (userData.getReplicationOptions().getType() != DataReplicationOptions.Type.STANDALONE
+ && !userData.getStartServer())
+ {
+ sb.append(formatter.getTaskSeparator());
+ final String cmd = getPath(Installation.getLocal().getServerStopCommandFile());
+ sb.append(formatter.getFormattedProgress(INFO_INSTALL_STOP_SERVER_EQUIVALENT_COMMAND_LINE.get()))
+ .append(formatter.getLineBreak())
+ .append(Constants.HTML_BOLD_OPEN)
+ .append(formatter.getFormattedProgress(LocalizableMessage.raw(cmd)))
+ .append(Constants.HTML_BOLD_CLOSE);
+ }
+
equivalentCommandPane.setText(sb.toString());
}
- private String getEquivalentJavaPropertiesProcedure(
- UserData userData,
- ProgressMessageFormatter formatter)
+ private String getEquivalentJavaPropertiesProcedure(final UserData userData,
+ final ProgressMessageFormatter formatter)
{
- StringBuilder sb = new StringBuilder();
- JavaArguments serverArguments =
- userData.getJavaArguments(UserData.SERVER_SCRIPT_NAME);
- JavaArguments importArguments =
- userData.getJavaArguments(UserData.IMPORT_SCRIPT_NAME);
+ final StringBuilder sb = new StringBuilder();
+ final JavaArguments serverArguments = userData.getJavaArguments(UserData.SERVER_SCRIPT_NAME);
+ final JavaArguments importArguments = userData.getJavaArguments(UserData.IMPORT_SCRIPT_NAME);
+ final List<String> linesToAdd = new ArrayList<String>();
- ArrayList<String> linesToAdd = new ArrayList<String>();
-
- boolean defaultServer =
- userData.getDefaultJavaArguments(UserData.SERVER_SCRIPT_NAME).equals(
- serverArguments);
- boolean defaultImport =
- userData.getDefaultJavaArguments(UserData.IMPORT_SCRIPT_NAME).equals(
- importArguments);
+ final boolean defaultServer =
+ userData.getDefaultJavaArguments(UserData.SERVER_SCRIPT_NAME).equals(serverArguments);
+ final boolean defaultImport =
+ userData.getDefaultJavaArguments(UserData.IMPORT_SCRIPT_NAME).equals(importArguments);
if (!defaultServer)
{
linesToAdd.add(getJavaArgPropertyForScript(UserData.SERVER_SCRIPT_NAME)
- +": "+serverArguments.getStringArguments());
+ + ": " + serverArguments.getStringArguments());
}
+
if (!defaultImport)
{
- linesToAdd.add(getJavaArgPropertyForScript(UserData.IMPORT_SCRIPT_NAME)+
- ": "+importArguments.getStringArguments());
+ linesToAdd.add(getJavaArgPropertyForScript(UserData.IMPORT_SCRIPT_NAME)
+ + ": " + importArguments.getStringArguments());
}
if (linesToAdd.size() == 1)
{
- String arg0 = getJavaPropertiesFilePath(userData);
- String arg1 = linesToAdd.get(0);
- sb.append(formatter.getFormattedProgress(
- INFO_EDIT_JAVA_PROPERTIES_LINE.get(arg0, arg1)));
+ final String arg0 = getJavaPropertiesFilePath(userData);
+ final String arg1 = linesToAdd.get(0);
+ sb.append(formatter.getFormattedProgress(INFO_EDIT_JAVA_PROPERTIES_LINE.get(arg0, arg1)));
}
else if (linesToAdd.size() > 1)
{
- String arg0 = getJavaPropertiesFilePath(userData);
- String arg1 = joinAsString("\n", linesToAdd);
- sb.append(
- formatter.getFormattedProgress(INFO_EDIT_JAVA_PROPERTIES_LINES.get(
- arg0, arg1)));
+ final String arg0 = getJavaPropertiesFilePath(userData);
+ final String arg1 = joinAsString(EOL, linesToAdd);
+ sb.append(formatter.getFormattedProgress(INFO_EDIT_JAVA_PROPERTIES_LINES.get(arg0, arg1)));
}
return sb.toString();
}
- /**
- * Returns the java argument property for a given script.
- * @param scriptName the script name.
- * @return the java argument property for a given script.
- */
private static String getJavaArgPropertyForScript(String scriptName)
{
- return scriptName+".java-args";
+ return scriptName + ".java-args";
}
private String getJavaPropertiesFilePath(UserData userData)
@@ -911,8 +833,8 @@
path = Utils.getInstallPathFromClasspath();
path = Utils.getInstancePathFromInstallPath(path);
}
- return Utils.getPath(
- Utils.getPath(path, Installation.CONFIG_PATH_RELATIVE),
- Installation.DEFAULT_JAVA_PROPERTIES_FILE);
+
+ return getPath(getPath(path, Installation.CONFIG_PATH_RELATIVE), Installation.DEFAULT_JAVA_PROPERTIES_FILE);
}
+
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
index c148538..53c3612 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
@@ -1552,13 +1552,14 @@
/**
* Returns a String representation of the provided command-line.
- * @param cmd the command-line arguments.
- * @param formatter the formatted to be used to create the String
- * representation.
+ *
+ * @param cmd
+ * the command-line arguments.
+ * @param formatter
+ * the formatted to be used to create the String representation.
* @return a String representation of the provided command-line.
*/
- public static String getFormattedEquivalentCommandLine(ArrayList<String> cmd,
- ProgressMessageFormatter formatter)
+ public static String getFormattedEquivalentCommandLine(List<String> cmd, ProgressMessageFormatter formatter)
{
StringBuilder builder = new StringBuilder();
builder.append(formatter.getFormattedProgress(LocalizableMessage.raw(cmd.get(0))));
@@ -1799,44 +1800,42 @@
/**
* Returns the list of equivalent command-lines that must be executed to
* enable replication as the setup does.
- * @param userData the user data.
+ *
+ * @param userData
+ * the user data.
* @return the list of equivalent command-lines that must be executed to
- * enable replication as the setup does.
+ * enable replication as the setup does.
*/
- public static ArrayList<ArrayList<String>>
- getDsReplicationEnableEquivalentCommandLines(
- UserData userData)
+ public static List<List<String>> getDsReplicationEnableEquivalentCommandLines(final UserData userData)
{
- ArrayList<ArrayList<String>> cmdLines = new ArrayList<ArrayList<String>>();
- Map<ServerDescriptor, Set<String>> hmServerBaseDNs =
- getServerDescriptorBaseDNMap(userData);
+ final List<List<String>> cmdLines = new ArrayList<List<String>>();
+ final Map<ServerDescriptor, Set<String>> hmServerBaseDNs = getServerDescriptorBaseDNMap(userData);
for (ServerDescriptor server : hmServerBaseDNs.keySet())
{
- cmdLines.add(getDsReplicationEnableEquivalentCommandLine(userData,
- hmServerBaseDNs.get(server), server));
+ cmdLines.add(getDsReplicationEnableEquivalentCommandLine(userData, hmServerBaseDNs.get(server), server));
}
+
return cmdLines;
}
/**
* Returns the list of equivalent command-lines that must be executed to
* initialize replication as the setup does.
- * @param userData the user data.
+ *
+ * @param userData
+ * the user data.
* @return the list of equivalent command-lines that must be executed to
- * initialize replication as the setup does.
+ * initialize replication as the setup does.
*/
- public static ArrayList<ArrayList<String>>
- getDsReplicationInitializeEquivalentCommandLines(
- UserData userData)
+ public static List<List<String>> getDsReplicationInitializeEquivalentCommandLines(UserData userData)
{
- ArrayList<ArrayList<String>> cmdLines = new ArrayList<ArrayList<String>>();
- Map<ServerDescriptor, Set<String>> hmServerBaseDNs =
- getServerDescriptorBaseDNMap(userData);
+ final List<List<String>> cmdLines = new ArrayList<List<String>>();
+ final Map<ServerDescriptor, Set<String>> hmServerBaseDNs = getServerDescriptorBaseDNMap(userData);
for (ServerDescriptor server : hmServerBaseDNs.keySet())
{
- cmdLines.add(getDsReplicationInitializeEquivalentCommandLine(userData,
- hmServerBaseDNs.get(server), server));
+ cmdLines.add(getDsReplicationInitializeEquivalentCommandLine(userData, hmServerBaseDNs.get(server), server));
}
+
return cmdLines;
}
@@ -2103,19 +2102,18 @@
}
/**
- * Returns the equivalent dsconfig command-line required to configure
- * the first replicated server in the topology.
- * @param userData the user data.
- * @return the equivalent dsconfig command-line required to configure
- * the first replicated server in the topology.
+ * Returns the equivalent dsconfig command-line required to configure the
+ * first replicated server in the topology.
+ *
+ * @param userData
+ * the user data.
+ * @return the equivalent dsconfig command-line required to configure the
+ * first replicated server in the topology.
*/
- public static ArrayList<ArrayList<String>>
- getDsConfigReplicationEnableEquivalentCommandLines(
- UserData userData)
+ public static List<List<String>> getDsConfigReplicationEnableEquivalentCommandLines(UserData userData)
{
- ArrayList<ArrayList<String>> cmdLines = new ArrayList<ArrayList<String>>();
-
- String cmdName = getCommandLinePath(userData, "dsconfig");
+ final List<List<String>> cmdLines = new ArrayList<List<String>>();
+ final String cmdName = getCommandLinePath(userData, "dsconfig");
ArrayList<String> connectionArgs = new ArrayList<String>();
connectionArgs.add("--hostName");
--
Gitblit v1.10.0