Remove ValidatorChain varargs usages.

Change-Id: I6018652a059789b36c1119118c85ee0af2c87dd8
Reviewed-on: http://gerrit.dmdirc.com/3170
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionNamePanel.java

@@ -45,11 +45,7 @@ import net.miginfocom.swing.MigLayout;
  */
 public class ActionNamePanel extends JPanel implements PropertyChangeListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class structure is changed
-     * (or anything else that would prevent serialized objects being unserialized with the new
-     * class).
-     */
+    /** A version number for this class. */
     private static final long serialVersionUID = 1;
     /** Original name. */
     private String existingName;
@@ -100,15 +96,16 @@ public class ActionNamePanel extends JPanel implements PropertyChangeListener {
      *
      * @param newName new name
      */
-    @SuppressWarnings("unchecked")
     void setActionName(final String newName) {
         if (newName == null) {
             this.existingName = "";
         } else {
             this.existingName = newName;
         }
-        name.setValidator(new ValidatorChain<>(new FileNameValidator(),
-                new ActionNameValidator(group, existingName)));
+        name.setValidator(ValidatorChain.<String>builder()
+                .addValidator(new FileNameValidator())
+                .addValidator(new ActionNameValidator(group, existingName))
+                .build());
         this.name.setText(newName);
     }
 
@@ -118,12 +115,13 @@ public class ActionNamePanel extends JPanel implements PropertyChangeListener {
     }
 
     /** Initialises the components. */
-    @SuppressWarnings("unchecked")
     private void initComponents() {
         name = new ValidatingJTextField(iconManager,
                 existingName,
-                new ValidatorChain<>(new FileNameValidator(),
-                new ActionNameValidator(group, existingName)));
+                ValidatorChain.<String>builder()
+                .addValidator(new FileNameValidator())
+                .addValidator(new ActionNameValidator(group, existingName))
+                .build());
     }
 
     /** Adds the listeners. */
@@ -161,13 +159,11 @@ public class ActionNamePanel extends JPanel implements PropertyChangeListener {
         return name.getText();
     }
 
-    /** {@inheritDoc} */
     @Override
     public void setEnabled(final boolean enabled) {
         name.setEnabled(enabled);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void propertyChange(final PropertyChangeEvent evt) {
         firePropertyChange("validationResult", evt.getOldValue(), evt.

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialog.java

@@ -119,7 +119,6 @@ public class ActionsManagerDialog extends StandardDialog implements
      * @param groupPanelFactory Factory to use to create group panels.
      */
     @Inject
-    @SuppressWarnings("unchecked")
     public ActionsManagerDialog(
             final MainFrame parentWindow,
             final SwingController controller,
@@ -136,9 +135,10 @@ public class ActionsManagerDialog extends StandardDialog implements
         this.groupPanelFactory = groupPanelFactory;
 
         initComponents();
-        validator = new ValidatorChain<>(
-                new ActionGroupNoDuplicatesInListValidator(groups,
-                (DefaultListModel) groups.getModel()), new FileNameValidator());
+        validator = ValidatorChain.<String>builder().addValidator(
+                new ActionGroupNoDuplicatesInListValidator(
+                groups, (DefaultListModel<ActionGroup>) groups.getModel()))
+                .addValidator(new FileNameValidator()).build();
         addListeners();
         layoutGroupPanel();
         layoutComponents();
@@ -176,7 +176,8 @@ public class ActionsManagerDialog extends StandardDialog implements
         actions.setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
                 "TitledBorder.border"), "Actions"));
 
-        groups.setCellRenderer(new PropertyListCellRenderer<>(groups.getCellRenderer(), ActionGroup.class, "name"));
+        groups.setCellRenderer(new PropertyListCellRenderer<>(groups.getCellRenderer(),
+                ActionGroup.class, "name"));
         groups.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         edit.setEnabled(false);
         delete.setEnabled(false);
@@ -286,11 +287,6 @@ public class ActionsManagerDialog extends StandardDialog implements
         getContentPane().setVisible(true);
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param e Action event
-     */
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == add) {
@@ -424,7 +420,6 @@ public class ActionsManagerDialog extends StandardDialog implements
         }.display();
     }
 
-    /** {@inheritDoc} */
     @Override
     public void valueChanged(final ListSelectionEvent e) {
         if (e.getValueIsAdjusting()) {
@@ -441,7 +436,6 @@ public class ActionsManagerDialog extends StandardDialog implements
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void processEvent(final ActionType type, final StringBuffer format,
             final Object... arguments) {

src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasPanel.java

@@ -95,10 +95,10 @@ public class AliasPanel extends JPanel implements ActionListener {
 
         this.actionFactory = actionFactory;
 
-        @SuppressWarnings("unchecked")
-        final ValidatorChain<String> chain = new ValidatorChain<>(
-                new CommandNameValidator(commandController.getCommandChar()),
-                new FileNameValidator());
+        final ValidatorChain<String> chain = ValidatorChain.<String>builder()
+                .addValidator(new CommandNameValidator(commandController.getCommandChar()))
+                .addValidator(new FileNameValidator())
+                .build();
         command = new ValidatingTextFieldInputField(iconManager, colourManager, globalConfig, chain);
         command.setEnabled(false);
 

src/com/dmdirc/addons/ui_swing/dialogs/serversetting/IgnoreListPanel.java

@@ -31,6 +31,7 @@ import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.validators.NotEmptyValidator;
 import com.dmdirc.util.validators.RegexValidator;
 import com.dmdirc.util.validators.ValidatorChain;
+import com.dmdirc.util.validators.ValidatorChainBuilder;
 
 import java.awt.Dialog.ModalityType;
 import java.awt.Window;
@@ -80,7 +81,7 @@ public final class IgnoreListPanel extends JPanel implements ActionListener, Lis
     /**
      * Creates a new instance of IgnoreList.
      *
-     * @param iconManager   Icon manager
+     * @param iconManager  Icon manager
      * @param connection   The connection whose ignore list should be displayed.
      * @param parentWindow Parent window
      */
@@ -168,21 +169,18 @@ public final class IgnoreListPanel extends JPanel implements ActionListener, Lis
         connection.saveIgnoreList();
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param e Action event
-     */
-    @SuppressWarnings("unchecked")
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == addButton) {
+            final ValidatorChainBuilder<String> validatorBuilder = ValidatorChain.builder();
+            validatorBuilder.addValidator(new NotEmptyValidator());
+            if (viewToggle.isSelected()) {
+                validatorBuilder.addValidator(new RegexValidator());
+            }
+
             new StandardInputDialog(parentWindow,
                     ModalityType.MODELESS, iconManager, "New ignore list entry",
-                    "Please enter the new ignore list entry",
-                    viewToggle.isSelected() ? new ValidatorChain<>(
-                    new NotEmptyValidator(), new RegexValidator())
-                    : new NotEmptyValidator()) {
+                    "Please enter the new ignore list entry", validatorBuilder.build()) {
                 /** A version number for this class. */
                 private static final long serialVersionUID = 2;
 
@@ -205,8 +203,7 @@ public final class IgnoreListPanel extends JPanel implements ActionListener, Lis
                     //Ignore
                 }
             }.display();
-        } else if (e.getSource() == delButton && list.getSelectedIndex()
-                != -1) {
+        } else if (e.getSource() == delButton && list.getSelectedIndex() != -1) {
             new StandardQuestionDialog(parentWindow,
                     ModalityType.APPLICATION_MODAL,
                     "Confirm deletion",
@@ -234,7 +231,6 @@ public final class IgnoreListPanel extends JPanel implements ActionListener, Lis
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public void valueChanged(final ListSelectionEvent e) {
         if (list.getSelectedIndex() == -1) {