mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
@@ -66,10 +66,7 @@ import org.opends.server.util.ServerConstants; import org.opends.server.util.StaticUtils; /** * The panel displayed when the user wants to define a new attribute in the * schema. */ /** The panel displayed when the user wants to define a new attribute in the schema. */ public class NewAttributePanel extends StatusGenericPanel { private static final long serialVersionUID = 2340170241535771321L; @@ -227,10 +224,10 @@ availableMatchingRules.add(matchingRuleNameMap.get(key)); } final JComboBox[] combos = { approximate, equality, ordering, substring }; for (JComboBox combo : combos) final JComboBox<?>[] combos = { approximate, equality, ordering, substring }; for (JComboBox<?> combo : combos) { final DefaultComboBoxModel model = (DefaultComboBoxModel) combo.getModel(); final DefaultComboBoxModel<?> model = (DefaultComboBoxModel<?>) combo.getModel(); final List<Object> el = new ArrayList<Object>(availableMatchingRules); el.add(0, model.getSize() == 0 ? NO_MATCHING_RULE : model.getElementAt(0)); updateComboBoxModel(el, model); opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -14,7 +14,6 @@ * Copyright 2008-2009 Sun Microsystems, Inc. * Portions Copyright 2011-2016 ForgeRock AS. */ package org.opends.guitools.controlpanel.ui; import static org.opends.messages.AdminToolMessages.*; @@ -101,9 +100,7 @@ import com.forgerock.opendj.cli.CommandBuilder; /** * The class that appears when the user clicks on 'New Base DN'. */ /** The class that appears when the user clicks on 'New Base DN'. */ public class NewBaseDNPanel extends StatusGenericPanel { private static final int MAX_ENTRIES_NUMBER_GENERATED = 1000; opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewDomainPanel.java
@@ -14,12 +14,12 @@ * Copyright 2008 Sun Microsystems, Inc. * Portions Copyright 2014-2016 ForgeRock AS. */ package org.opends.guitools.controlpanel.ui; import static org.opends.messages.AdminToolMessages.*; import java.util.ArrayList; import javax.swing.JLabel; import javax.swing.JTextField; @@ -30,19 +30,19 @@ { private static final long serialVersionUID = -595396547491445219L; /** {@inheritDoc} */ @Override public LocalizableMessage getTitle() { return INFO_CTRL_NEW_DOMAIN_PANEL_TITLE.get(); } /** {@inheritDoc} */ @Override protected LocalizableMessage getProgressDialogTitle() { return INFO_CTRL_NEW_DOMAIN_PANEL_TITLE.get(); } /** {@inheritDoc} */ @Override protected void checkSyntax(ArrayList<LocalizableMessage> errors) { for (JLabel label : labels) opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewEntryFromLDIFPanel.java
@@ -12,9 +12,8 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2008-2009 Sun Microsystems, Inc. * Portions Copyright 2014-2015 ForgeRock AS. * Portions Copyright 2014-2016 ForgeRock AS. */ package org.opends.guitools.controlpanel.ui; import static org.opends.messages.AdminToolMessages.*; @@ -34,16 +33,13 @@ import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import org.forgerock.i18n.LocalizableMessage; import org.opends.guitools.controlpanel.browser.BrowserController; import org.opends.guitools.controlpanel.ui.nodes.BasicNode; import org.opends.guitools.controlpanel.util.Utilities; import org.forgerock.i18n.LocalizableMessage; import org.opends.server.util.LDIFException; /** * The panel used to create a new entry using an LDIF representation. * */ /** The panel used to create a new entry using an LDIF representation. */ public class NewEntryFromLDIFPanel extends AbstractNewEntryPanel { private static final long serialVersionUID = -3923907357481784964L; @@ -51,29 +47,26 @@ private JButton checkSyntax; private JLabel lSyntaxCorrect; /** * Default constructor. * */ /** Default constructor. */ public NewEntryFromLDIFPanel() { super(); createLayout(); } /** {@inheritDoc} */ @Override public Component getPreferredFocusComponent() { return ldif; } /** {@inheritDoc} */ @Override public boolean requiresScroll() { return false; } /** {@inheritDoc} */ @Override public void setParent(BasicNode parentNode, BrowserController controller) { super.setParent(parentNode, controller); @@ -89,21 +82,19 @@ ldif.setCaretPosition(emptyDn.length()); } /** {@inheritDoc} */ @Override protected LocalizableMessage getProgressDialogTitle() { return INFO_CTRL_PANEL_NEW_ENTRY_FROM_LDIF_TITLE.get(); } /** {@inheritDoc} */ @Override public LocalizableMessage getTitle() { return INFO_CTRL_PANEL_NEW_ENTRY_FROM_LDIF_TITLE.get(); } /** * Creates the layout of the panel (but the contents are not populated here). */ /** Creates the layout of the panel (but the contents are not populated here). */ private void createLayout() { GridBagConstraints gbc = new GridBagConstraints(); @@ -135,19 +126,19 @@ ldif = Utilities.createTextArea(LocalizableMessage.EMPTY, 20, 50); ldif.getDocument().addDocumentListener(new DocumentListener() { /** {@inheritDoc} */ @Override public void removeUpdate(DocumentEvent ev) { lSyntaxCorrect.setVisible(false); } /** {@inheritDoc} */ @Override public void changedUpdate(DocumentEvent ev) { removeUpdate(ev); } /** {@inheritDoc} */ @Override public void insertUpdate(DocumentEvent ev) { removeUpdate(ev); @@ -168,7 +159,7 @@ checkSyntax.setOpaque(false); checkSyntax.addActionListener(new ActionListener() { /** {@inheritDoc} */ @Override public void actionPerformed(ActionEvent ev) { ArrayList<LocalizableMessage> errors = new ArrayList<>(); @@ -201,13 +192,13 @@ add(checkSyntax, gbc); } /** {@inheritDoc} */ @Override public void toBeDisplayed(boolean visible) { lSyntaxCorrect.setVisible(false); } /** {@inheritDoc} */ @Override protected void checkSyntax(ArrayList<LocalizableMessage> errors) { try @@ -224,7 +215,7 @@ } } /** {@inheritDoc} */ @Override protected String getLDIF() { return ldif.getText(); opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewGroupPanel.java
@@ -14,7 +14,6 @@ * Copyright 2008-2010 Sun Microsystems, Inc. * Portions Copyright 2013-2016 ForgeRock AS. */ package org.opends.guitools.controlpanel.ui; import static org.opends.messages.AdminToolMessages.*; @@ -48,22 +47,19 @@ import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.LocalizedIllegalArgumentException; import org.forgerock.opendj.ldap.DN; import org.opends.guitools.controlpanel.browser.BrowserController; import org.opends.guitools.controlpanel.ui.nodes.BasicNode; import org.opends.guitools.controlpanel.ui.nodes.BrowserNodeInfo; import org.opends.guitools.controlpanel.ui.nodes.DndBrowserNodes; import org.opends.guitools.controlpanel.util.Utilities; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.LocalizedIllegalArgumentException; import org.forgerock.opendj.ldap.DN; import org.opends.server.types.LDAPURL; import org.opends.server.types.OpenDsException; import org.opends.server.util.ServerConstants; /** * The panel to create a group. * */ /** The panel to create a group. */ public class NewGroupPanel extends AbstractNewEntryPanel { private static final long serialVersionUID = -8173120152617813282L; @@ -76,7 +72,6 @@ private JLabel lLDAPURL; private JLabel lReferenceGroup; private JLabel[] labels = {lName, lDescription, lMembers, lDn}; private JTextField name = Utilities.createLongTextField(); @@ -99,24 +94,18 @@ private JLabel dn = Utilities.createDefaultLabel(); /** * An array containing the fields of this panel. */ /** An array containing the fields of this panel. */ protected final JTextField[] fields = {name, description, filter, referenceGroup}; /** * Default constructor. * */ /** Default constructor. */ public NewGroupPanel() { super(); createLayout(); } /** {@inheritDoc} */ @Override public void setParent(BasicNode parentNode, BrowserController controller) { super.setParent(parentNode, controller); @@ -129,36 +118,36 @@ filter.setText("ldap:///"+parentNode.getDN()+"??sub?(<your filter>)"); } /** {@inheritDoc} */ @Override public LocalizableMessage getTitle() { return INFO_CTRL_PANEL_NEW_GROUP_PANEL_TITLE.get(); } /** {@inheritDoc} */ @Override public Component getPreferredFocusComponent() { return name; } /** {@inheritDoc} */ @Override protected LocalizableMessage getProgressDialogTitle() { return INFO_CTRL_PANEL_NEW_GROUP_PANEL_TITLE.get(); } /** {@inheritDoc} */ @Override protected boolean checkSyntaxBackground() { return staticGroup.isSelected(); } /** {@inheritDoc} */ @Override protected void checkSyntax(ArrayList<LocalizableMessage> errors) { Runnable runnable = new Runnable() { /** {@inheritDoc} */ @Override public void run() { for (JLabel label : labels) @@ -229,6 +218,7 @@ { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { setSecondaryInvalid(lMemberDNs); @@ -294,10 +284,7 @@ } } /** * Creates the layout of the panel (but the contents are not populated here). */ /** Creates the layout of the panel (but the contents are not populated here). */ private void createLayout() { GridBagConstraints gbc = new GridBagConstraints(); @@ -348,7 +335,7 @@ staticGroup.setSelected(true); ActionListener actionListener = new ActionListener() { /** {@inheritDoc} */ @Override public void actionPerformed(ActionEvent ev) { checkEnabling(); @@ -414,7 +401,7 @@ addMembers.addActionListener(new ActionListener() { /** {@inheritDoc} */ @Override public void actionPerformed(ActionEvent ev) { addMembersClicked(); @@ -488,7 +475,7 @@ Utilities.createButton(INFO_CTRL_PANEL_BROWSE_BUTTON_LABEL.get()); browseReferenceGroup.addActionListener(new ActionListener() { /** {@inheritDoc} */ @Override public void actionPerformed(ActionEvent ev) { browseReferenceGroupClicked(); @@ -496,22 +483,21 @@ }); p.add(browseReferenceGroup, gbc2); DocumentListener listener = new DocumentListener() { /** {@inheritDoc} */ @Override public void insertUpdate(DocumentEvent ev) { updateDNValue(); } /** {@inheritDoc} */ @Override public void changedUpdate(DocumentEvent ev) { insertUpdate(ev); } /** {@inheritDoc} */ @Override public void removeUpdate(DocumentEvent ev) { insertUpdate(ev); @@ -525,27 +511,27 @@ DropTargetListener dropTargetlistener = new DropTargetListener() { /** {@inheritDoc} */ @Override public void dragEnter(DropTargetDragEvent e) { } /** {@inheritDoc} */ @Override public void dragExit(DropTargetEvent e) { } /** {@inheritDoc} */ @Override public void dragOver(DropTargetDragEvent e) { } /** {@inheritDoc} */ @Override public void dropActionChanged(DropTargetDragEvent e) { } /** {@inheritDoc} */ @Override public void drop(DropTargetDropEvent e) { try { @@ -670,7 +656,7 @@ } } /** {@inheritDoc} */ @Override protected String getLDIF() { StringBuilder sb = new StringBuilder(); @@ -739,4 +725,3 @@ lReferenceGroup.setEnabled(virtualGroup.isSelected()); } }
@@ -14,7 +14,6 @@ * Copyright 2008-2010 Sun Microsystems, Inc. * Portions Copyright 2014-2016 ForgeRock AS. */ package org.opends.guitools.controlpanel.ui; import static org.opends.messages.AdminToolMessages.*; @@ -49,6 +48,7 @@ import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.LocalizableMessageBuilder; import org.forgerock.opendj.ldap.schema.AttributeType; import org.forgerock.opendj.ldap.schema.ObjectClassType; import org.opends.guitools.controlpanel.datamodel.ServerDescriptor; import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent; @@ -63,7 +63,6 @@ import org.opends.guitools.controlpanel.ui.renderer.SchemaElementComboBoxCellRenderer; import org.opends.guitools.controlpanel.util.Utilities; import org.opends.server.config.ConfigConstants; import org.forgerock.opendj.ldap.schema.AttributeType; import org.opends.server.types.ObjectClass; import org.opends.server.types.Schema; import org.opends.server.util.ServerConstants; @@ -103,7 +102,7 @@ private JTextField name = Utilities.createMediumTextField(); private SuperiorObjectClassesEditor superiors = new SuperiorObjectClassesEditor(); private JComboBox type = Utilities.createComboBox(); private JComboBox<ObjectClassType> type = Utilities.createComboBox(); private JTextField oid = Utilities.createMediumTextField(); private JTextField description = Utilities.createLongTextField(); private JTextField origin = Utilities.createLongTextField(); @@ -128,19 +127,19 @@ createLayout(); } /** {@inheritDoc} */ @Override public LocalizableMessage getTitle() { return INFO_CTRL_PANEL_NEW_OBJECTCLASS_PANEL_TITLE.get(); } /** {@inheritDoc} */ @Override public Component getPreferredFocusComponent() { return name; } /** {@inheritDoc} */ @Override public void configurationChanged(ConfigurationChangeEvent ev) { final ServerDescriptor desc = ev.getNewDescriptor(); @@ -182,6 +181,7 @@ } SwingUtilities.invokeLater(new Runnable() { @Override public void run() { setEnabledOK(!error[0]); @@ -212,7 +212,7 @@ } } /** {@inheritDoc} */ @Override public void okClicked() { ArrayList<LocalizableMessage> errors = new ArrayList<>(); @@ -220,7 +220,7 @@ { setPrimaryValid(label); } String n = getObjectClassName(); String n = getText(name); LocalizableMessageBuilder err = new LocalizableMessageBuilder(); if (n.length() == 0) { @@ -240,7 +240,7 @@ } } n = oid.getText().trim(); n = getText(oid); if (n.length() > 0) { if (!StaticUtils.isValidSchemaElement(n, 0, n.length(), err)) @@ -258,7 +258,7 @@ } } if (aliases.getText().trim().length() > 0) if (getText(aliases).length() > 0) { String[] al = aliases.getText().split(","); if (al.length > 0) @@ -308,7 +308,7 @@ } if (errors.isEmpty()) { String ocName = getObjectClassName(); String ocName = getText(name); launchOperation(newTask, INFO_CTRL_PANEL_CREATING_OBJECTCLASS_SUMMARY.get(ocName), INFO_CTRL_PANEL_CREATING_OBJECTCLASS_COMPLETE.get(), @@ -347,7 +347,7 @@ attributes.getSelectedList1().getSelectedIndices(), attributes.getSelectedList2().getSelectedIndices() }; JList[] lists = JList<?>[] lists = { attributes.getAvailableList(), attributes.getSelectedList1(), @@ -357,7 +357,6 @@ Collection<AttributeType> allAttrs = schema.getAttributeTypes(); attributes.getAvailableListModel().addAll(allAttrs); HashSet<AttributeType> toDelete = new HashSet<>(); for (AttributeType attr : attributes.getSelectedListModel1().getData()) { @@ -416,9 +415,7 @@ } } /** * Creates the layout of the panel (but the contents are not populated here). */ /** Creates the layout of the panel (but the contents are not populated here). */ private void createLayout() { GridBagConstraints gbc = new GridBagConstraints(); @@ -447,7 +444,7 @@ SuperiorObjectClassesChangedListener listener = new SuperiorObjectClassesChangedListener() { /** {@inheritDoc} */ @Override public void parentObjectClassesChanged( SuperiorObjectClassesChangedEvent ev) { @@ -508,7 +505,7 @@ }; superiors.addParentObjectClassesChangedListener(listener); DefaultComboBoxModel model = new DefaultComboBoxModel(); DefaultComboBoxModel<ObjectClassType> model = new DefaultComboBoxModel<>(); for (ObjectClassType t : ObjectClassType.values()) { model.addElement(t); @@ -522,7 +519,7 @@ attributes = new DoubleAddRemovePanel<>(0, AttributeType.class); Comparator<AttributeType> comparator = new Comparator<AttributeType>() { /** {@inheritDoc} */ @Override public int compare(AttributeType attr1, AttributeType attr2) { return attr1.getNameOrOID().toLowerCase().compareTo( @@ -603,7 +600,7 @@ add(labels, comps, inlineHelps, p, gbc1); ChangeListener changeListener = new ChangeListener() { /** {@inheritDoc} */ @Override public void stateChanged(ChangeEvent e) { p.setVisible(expander.isSelected()); @@ -616,17 +613,17 @@ file.setText(ConfigConstants.FILE_USER_SCHEMA_ELEMENTS); } private String getObjectClassName() private String getText(JTextField textField) { return name.getText().trim(); return textField.getText().trim(); } private String getOID() { String o = oid.getText().trim(); String o = getText(oid); if (o.length() == 0) { o = getObjectClassName()+"-oid"; o = getText(name) + "-oid"; } return o; } @@ -639,12 +636,12 @@ private Map<String, List<String>> getExtraProperties() { Map<String, List<String>> map = new HashMap<>(); String f = file.getText().trim(); String f = getText(file); if (f.length() > 0) { map.put(ServerConstants.SCHEMA_PROPERTY_FILENAME, newArrayList(f)); } String or = origin.getText().trim(); String or = getText(origin); if (or.length() > 0) { map.put(ServerConstants.SCHEMA_PROPERTY_ORIGIN, newArrayList(or)); @@ -652,14 +649,13 @@ return map; } private ArrayList<String> getAliases() private List<String> getAliases() { ArrayList<String> al = new ArrayList<>(); String s = aliases.getText().trim(); List<String> al = new ArrayList<>(); String s = getText(aliases); if (s.length() > 0) { String[] a = s.split(","); for (String alias : a) for (String alias : s.split(",")) { al.add(alias.trim()); } @@ -670,19 +666,19 @@ private ArrayList<String> getAllNames() { ArrayList<String> al = new ArrayList<>(); al.add(getObjectClassName()); al.add(getText(name)); al.addAll(getAliases()); return al; } private String getDescription() { return description.getText().trim(); return getText(description); } private ObjectClass getObjectClass() { return new ObjectClass("", getObjectClassName(), getAllNames(), return new ObjectClass("", getText(name), getAllNames(), getOID(), getDescription(), getObjectClassSuperiors(), @@ -723,16 +719,13 @@ { private ListCellRenderer defaultRenderer; /** * Renderer constructor. * */ /** Renderer constructor. */ public AttributeTypeCellRenderer() { defaultRenderer = attributes.getAvailableList().getCellRenderer(); } /** {@inheritDoc} */ @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewOrganizationPanel.java
@@ -14,7 +14,6 @@ * Copyright 2008 Sun Microsystems, Inc. * Portions Copyright 2014-2016 ForgeRock AS */ package org.opends.guitools.controlpanel.ui; import static org.opends.messages.AdminToolMessages.*; @@ -22,67 +21,49 @@ import java.awt.Component; import java.awt.GridBagConstraints; import java.util.ArrayList; import javax.swing.JLabel; import javax.swing.JTextField; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import org.forgerock.i18n.LocalizableMessage; import org.opends.guitools.controlpanel.browser.BrowserController; import org.opends.guitools.controlpanel.ui.nodes.BasicNode; import org.opends.guitools.controlpanel.util.Utilities; import org.forgerock.i18n.LocalizableMessage; /** The panel used to create a new organization. */ public class NewOrganizationPanel extends AbstractNewEntryPanel class NewOrganizationPanel extends AbstractNewEntryPanel { private static final long serialVersionUID = 6560126551083160773L; /** * The label for the name. */ protected final JLabel lName = Utilities.createPrimaryLabel(); /** * The label for the description. */ protected final JLabel lDescription = Utilities.createPrimaryLabel(); /** * The label for the DN. */ protected final JLabel lDn = Utilities.createPrimaryLabel(); /** The label for the name. */ private final JLabel lName = Utilities.createPrimaryLabel(); /** The label for the description. */ private final JLabel lDescription = Utilities.createPrimaryLabel(); /** The label for the DN. */ private final JLabel lDn = Utilities.createPrimaryLabel(); /** * An array containing all the labels. */ /** An array containing all the labels. */ protected final JLabel[] labels = {lName, lDescription, lDn}; /** * The field containing the name. */ /** The field containing the name. */ protected final JTextField name = Utilities.createLongTextField(); /** * The field containing the description. */ /** The field containing the description. */ protected final JTextField description = Utilities.createLongTextField(); /** * The label containing the DN value. */ /** The label containing the DN value. */ protected final JLabel dn = Utilities.createDefaultLabel(); /** * An array containing all the components. */ protected final Component[] comps = {name, description, dn}; /** An array containing all the components. */ private final Component[] comps = { name, description, dn }; /** * Default constructor. * */ /** Default constructor. */ public NewOrganizationPanel() { super(); createLayout(); } /** {@inheritDoc} */ @Override public void setParent(BasicNode parentNode, BrowserController controller) { super.setParent(parentNode, controller); @@ -96,13 +77,13 @@ } } /** {@inheritDoc} */ @Override public LocalizableMessage getTitle() { return INFO_CTRL_NEW_ORGANIZATION_PANEL_TITLE.get(); } /** {@inheritDoc} */ @Override public Component getPreferredFocusComponent() { return name; @@ -112,12 +93,13 @@ * Returns the title of the progress dialog. * @return the title of the progress dialog. */ @Override protected LocalizableMessage getProgressDialogTitle() { return INFO_CTRL_NEW_ORGANIZATION_PANEL_TITLE.get(); } /** {@inheritDoc} */ @Override protected void checkSyntax(ArrayList<LocalizableMessage> errors) { for (JLabel label : labels) @@ -137,10 +119,7 @@ } } /** * Creates the layout of the panel (but the contents are not populated here). */ /** Creates the layout of the panel (but the contents are not populated here). */ private void createLayout() { GridBagConstraints gbc = new GridBagConstraints(); @@ -200,19 +179,19 @@ DocumentListener listener = new DocumentListener() { /** {@inheritDoc} */ @Override public void insertUpdate(DocumentEvent ev) { updateDNValue(); } /** {@inheritDoc} */ @Override public void changedUpdate(DocumentEvent ev) { insertUpdate(ev); } /** {@inheritDoc} */ @Override public void removeUpdate(DocumentEvent ev) { insertUpdate(ev); @@ -225,11 +204,7 @@ } } /** * Updates the contents of DN value to reflect the data that the user * is providing. * */ /** Updates the contents of DN value to reflect the data that the user is providing. */ protected void updateDNValue() { String value = name.getText().trim(); @@ -263,4 +238,3 @@ return sb.toString(); } }
@@ -14,7 +14,6 @@ * Copyright 2008-2009 Sun Microsystems, Inc. * Portions Copyright 2014-2016 ForgeRock AS. */ package org.opends.guitools.controlpanel.ui; import static org.opends.messages.AdminToolMessages.*; @@ -22,15 +21,17 @@ import java.awt.Component; import java.awt.GridBagConstraints; import java.io.IOException; import java.util.ArrayList;import javax.swing.JLabel; import java.util.ArrayList; import javax.swing.JLabel; import javax.swing.JTextField; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import org.forgerock.i18n.LocalizableMessage; import org.opends.guitools.controlpanel.browser.BrowserController; import org.opends.guitools.controlpanel.ui.nodes.BasicNode; import org.opends.guitools.controlpanel.util.Utilities; import org.forgerock.i18n.LocalizableMessage; import org.opends.server.types.OpenDsException; /** The panel used to create a new organizational unit. */ @@ -64,17 +65,14 @@ private Component[] comps = {name, description, address, telephoneNumber, faxNumber, dn}; /** * Default constructor. * */ /** Default constructor. */ public NewOrganizationalUnitPanel() { super(); createLayout(); } /** {@inheritDoc} */ @Override public void setParent(BasicNode parentNode, BrowserController controller) { super.setParent(parentNode, controller); @@ -88,25 +86,25 @@ } } /** {@inheritDoc} */ @Override public LocalizableMessage getTitle() { return INFO_CTRL_PANEL_NEW_OU_PANEL_TITLE.get(); } /** {@inheritDoc} */ @Override public Component getPreferredFocusComponent() { return name; } /** {@inheritDoc} */ @Override protected LocalizableMessage getProgressDialogTitle() { return INFO_CTRL_PANEL_NEW_OU_PANEL_TITLE.get(); } /** {@inheritDoc} */ @Override protected void checkSyntax(ArrayList<LocalizableMessage> errors) { for (JLabel label : labels) @@ -143,10 +141,7 @@ } } /** * Creates the layout of the panel (but the contents are not populated here). */ /** Creates the layout of the panel (but the contents are not populated here). */ private void createLayout() { GridBagConstraints gbc = new GridBagConstraints(); @@ -197,19 +192,19 @@ DocumentListener listener = new DocumentListener() { /** {@inheritDoc} */ @Override public void insertUpdate(DocumentEvent ev) { updateDNValue(); } /** {@inheritDoc} */ @Override public void changedUpdate(DocumentEvent ev) { insertUpdate(ev); } /** {@inheritDoc} */ @Override public void removeUpdate(DocumentEvent ev) { insertUpdate(ev); @@ -222,11 +217,7 @@ } } /** * Updates the contents of DN value to reflect the data that the user * is providing. * */ /** Updates the contents of DN value to reflect the data that the user is providing. */ private void updateDNValue() { String value = name.getText().trim(); opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/NewUserPanel.java
@@ -14,7 +14,6 @@ * Copyright 2008-2009 Sun Microsystems, Inc. * Portions Copyright 2014-2016 ForgeRock AS. */ package org.opends.guitools.controlpanel.ui; import static org.opends.messages.AdminToolMessages.*; @@ -25,6 +24,7 @@ import java.awt.event.ActionListener; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import javax.swing.DefaultComboBoxModel; import javax.swing.JComboBox; @@ -34,10 +34,10 @@ import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import org.forgerock.i18n.LocalizableMessage; import org.opends.guitools.controlpanel.browser.BrowserController; import org.opends.guitools.controlpanel.ui.nodes.BasicNode; import org.opends.guitools.controlpanel.util.Utilities; import org.forgerock.i18n.LocalizableMessage; import org.opends.server.types.OpenDsException; /** The panel used to create a new user. */ @@ -81,10 +81,10 @@ private JTextField eMail = Utilities.createLongTextField(); private JTextField telephoneNumber = Utilities.createLongTextField(); private JTextField faxNumber = Utilities.createLongTextField(); private JComboBox namingAttribute = Utilities.createComboBox(); private JComboBox<String> namingAttribute = Utilities.createComboBox(); private JLabel dn = Utilities.createDefaultLabel(); Component[] comps = {firstName, lastName, commonName, userID, private Component[] comps = { firstName, lastName, commonName, userID, password, confirmPassword, eMail, telephoneNumber, faxNumber, namingAttribute, dn}; @@ -92,17 +92,14 @@ {commonName, firstName, lastName, userID}; private final String[] NAMING_ATTRIBUTES = {"cn", "givenName", "sn", "uid"}; /** * Default constructor. * */ /** Default constructor. */ public NewUserPanel() { super(); createLayout(); } /** {@inheritDoc} */ @Override public void setParent(BasicNode parentNode, BrowserController controller) { super.setParent(parentNode, controller); @@ -116,25 +113,25 @@ } } /** {@inheritDoc} */ @Override public LocalizableMessage getTitle() { return INFO_CTRL_PANEL_NEW_USER_PANEL_TITLE.get(); } /** {@inheritDoc} */ @Override public Component getPreferredFocusComponent() { return firstName; } /** {@inheritDoc} */ @Override protected LocalizableMessage getProgressDialogTitle() { return INFO_CTRL_PANEL_NEW_USER_PANEL_TITLE.get(); } /** {@inheritDoc} */ @Override protected void checkSyntax(ArrayList<LocalizableMessage> errors) { for (JLabel label : labels) @@ -158,18 +155,11 @@ String attr = (String)namingAttribute.getSelectedItem(); for (int i=0 ; i<NAMING_ATTRIBUTE_TEXTFIELDS.length; i++) { boolean isRequired = false; for (JTextField tf : requiredFields) { if (tf == NAMING_ATTRIBUTE_TEXTFIELDS[i]) { isRequired = true; break; } } JTextField namingAttrTextField = NAMING_ATTRIBUTE_TEXTFIELDS[i]; boolean isRequired = contains(requiredFields, namingAttrTextField); if (!isRequired && attr.equalsIgnoreCase(NAMING_ATTRIBUTES[i])) { String value = NAMING_ATTRIBUTE_TEXTFIELDS[i].getText().trim(); String value = namingAttrTextField.getText().trim(); if (value.length() == 0) { errors.add(ERR_CTRL_PANEL_USER_NAMING_ATTRIBUTE_REQUIRED.get(attr)); @@ -180,9 +170,7 @@ char[] pwd1 = password.getPassword(); char[] pwd2 = confirmPassword.getPassword(); String sPwd1 = new String(pwd1); String sPwd2 = new String(pwd2); if (!sPwd1.equals(sPwd2)) if (!Arrays.equals(pwd1, pwd2)) { errors.add(ERR_CTRL_PANEL_PASSWORD_DO_NOT_MATCH.get()); } @@ -205,10 +193,19 @@ } } private boolean contains(JTextField[] requiredFields, JTextField toFind) { for (JTextField tf : requiredFields) { if (tf == toFind) { return true; } } return false; } /** * Creates the layout of the panel (but the contents are not populated here). */ /** Creates the layout of the panel (but the contents are not populated here). */ private void createLayout() { GridBagConstraints gbc = new GridBagConstraints(); @@ -269,19 +266,19 @@ DocumentListener listener = new DocumentListener() { /** {@inheritDoc} */ @Override public void insertUpdate(DocumentEvent ev) { updateDNValue(); } /** {@inheritDoc} */ @Override public void changedUpdate(DocumentEvent ev) { insertUpdate(ev); } /** {@inheritDoc} */ @Override public void removeUpdate(DocumentEvent ev) { insertUpdate(ev); @@ -293,12 +290,12 @@ tf.getDocument().addDocumentListener(listener); } DefaultComboBoxModel model = new DefaultComboBoxModel(NAMING_ATTRIBUTES); DefaultComboBoxModel<String> model = new DefaultComboBoxModel<>(NAMING_ATTRIBUTES); namingAttribute.setModel(model); namingAttribute.setSelectedItem(NAMING_ATTRIBUTES[0]); namingAttribute.addActionListener(new ActionListener() { /** {@inheritDoc} */ @Override public void actionPerformed(ActionEvent ev) { updateDNValue(); @@ -306,11 +303,7 @@ }); } /** * Updates the contents of DN value to reflect the data that the user * is providing. * */ /** Updates the contents of DN value to reflect the data that the user is providing. */ private void updateDNValue() { String attr = (String)namingAttribute.getSelectedItem();
