Move validators out of config.prefs.validator

Fixes issue 4253

Change-Id: Ibb46a6a1ba5c62d525b65f55d39632b82e335539
Reviewed-on: http://gerrit.dmdirc.com/1455
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

src/com/dmdirc/config/prefs/validator/ActionGroupValidator.java → src/com/dmdirc/actions/validators/ActionGroupValidator.java

@@ -20,8 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.config.prefs.validator;
+package com.dmdirc.actions.validators;
 
+import com.dmdirc.util.validators.ValidationResponse;
+import com.dmdirc.util.validators.Validator;
 import com.dmdirc.actions.ActionManager;
 
 /**

src/com/dmdirc/config/prefs/validator/ActionNameValidator.java → src/com/dmdirc/actions/validators/ActionNameValidator.java

@@ -20,8 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.config.prefs.validator;
+package com.dmdirc.actions.validators;
 
+import com.dmdirc.util.validators.ValidationResponse;
+import com.dmdirc.util.validators.Validator;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionGroup;
 

src/com/dmdirc/config/prefs/validator/ConditionRuleValidator.java → src/com/dmdirc/actions/validators/ConditionRuleValidator.java

@@ -20,8 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.config.prefs.validator;
+package com.dmdirc.actions.validators;
 
+import com.dmdirc.util.validators.ValidationResponse;
+import com.dmdirc.util.validators.Validator;
 import com.dmdirc.actions.ConditionTree;
 
 /**

src/com/dmdirc/commandparser/commands/ValidatingCommand.java

@@ -22,7 +22,7 @@
 package com.dmdirc.commandparser.commands;
 
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.config.prefs.validator.ValidationResponse;
+import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 /**

src/com/dmdirc/commandparser/commands/chat/Me.java

@@ -32,7 +32,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.ValidatingCommand;
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.config.prefs.validator.ValidationResponse;
+import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 /**

src/com/dmdirc/config/prefs/validator/CommandNameValidator.java → src/com/dmdirc/commandparser/validators/CommandNameValidator.java

@@ -20,8 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.config.prefs.validator;
+package com.dmdirc.commandparser.validators;
 
+import com.dmdirc.util.validators.RegexStringValidator;
+import com.dmdirc.util.validators.ValidatorChain;
 import com.dmdirc.commandparser.CommandManager;
 import java.util.regex.Pattern;
 

src/com/dmdirc/config/prefs/PreferencesManager.java

@@ -25,8 +25,8 @@ package com.dmdirc.config.prefs;
 import com.dmdirc.Main;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.config.prefs.validator.NumericalValidator;
-import com.dmdirc.config.prefs.validator.OptionalValidator;
+import com.dmdirc.util.validators.NumericalValidator;
+import com.dmdirc.util.validators.OptionalValidator;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
 import com.dmdirc.util.ListenerList;

src/com/dmdirc/config/prefs/PreferencesSetting.java

@@ -22,8 +22,8 @@
 package com.dmdirc.config.prefs;
 
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.config.prefs.validator.PermissiveValidator;
-import com.dmdirc.config.prefs.validator.Validator;
+import com.dmdirc.util.validators.PermissiveValidator;
+import com.dmdirc.util.validators.Validator;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/com/dmdirc/config/prefs/validator/FileNameValidator.java

@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.config.prefs.validator;
-
-/**
- * Validates filenames.
- */
-public class FileNameValidator implements Validator<String> {
-
-    /** Filename regex. */
-    private static final String FILENAME_REGEX = "[A-Za-z0-9 \\-_!]+";
-    /** Failure reason. */
-    private static final String FAILURE_REASON = "Must be a valid filename";
-
-    /** {@inheritDoc} */
-    @Override
-    public ValidationResponse validate(final String object) {
-        if (object.matches(FILENAME_REGEX)) {
-            return new ValidationResponse();
-        } else {
-            return new ValidationResponse(FAILURE_REASON);
-        }
-    }
-}

src/com/dmdirc/config/prefs/validator/IdentValidator.java

@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.config.prefs.validator;
-
-/**
- * Validates idents.
- */
-public class IdentValidator implements Validator<String> {
-
-    /** Ident regex. */
-    private static final String IDENT_REGEX = "[A-Za-z0-9\\[\\]{|}\\-\\^\\\\]*";
-    /** Failure reason. */
-    private static final String FAILURE_REASON = "Ident must only contain "
-            + "letters, numbers and []{}|-^\\.";
-
-    /** {@inheritDoc} */
-    @Override
-    public ValidationResponse validate(final String object) {
-        if (object.matches(IDENT_REGEX)) {
-            return new ValidationResponse();
-        } else {
-            return new ValidationResponse(FAILURE_REASON);
-        }
-    }
-}

src/com/dmdirc/config/prefs/validator/NicknameValidator.java

@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.config.prefs.validator;
-
-/**
- * Validates nicknames.
- */
-public class NicknameValidator implements Validator<String> {
-
-    /** Nickname regex. */
-    private static final String NICKNAME_REGEX = "[A-Za-z0-9\\[\\]{|}\\-\\^\\\\\\`\\_]+";
-    /** Failure reason. */
-    private static final String FAILURE_REASON = "Nickname must only contain "
-            + "letters, numbers and []{}|-^\\.`_";
-
-    /** {@inheritDoc} */
-    @Override
-    public ValidationResponse validate(final String object) {
-        if (object.matches(NICKNAME_REGEX)) {
-            return new ValidationResponse();
-        } else {
-            return new ValidationResponse(FAILURE_REASON);
-        }
-    }
-}

src/com/dmdirc/config/prefs/validator/NotEmptyValidator.java

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.config.prefs.validator;
-
-/**
- * Validator checking the string is not empty.
- */
-public class NotEmptyValidator implements Validator<String> {
-
-    /**
-     * 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).
-     */
-    private static final long serialVersionUID = 1;
-
-    /** {@inheritDoc} */
-    @Override
-    public ValidationResponse validate(final String object) {
-        if (object == null || object.isEmpty()) {
-            return new ValidationResponse("Cannot be an empty string.");
-        } else {
-            return new ValidationResponse();
-        }
-    }
-
-}

src/com/dmdirc/config/prefs/validator/NumericalValidator.java

@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.config.prefs.validator;
-
-/**
- * Validates that a number is within certain bounds.
- *
- * @author chris
- */
-public class NumericalValidator implements Validator<String> {
-
-    /** The minimum value for this number. */
-    protected final int min;
-
-    /** The maximum value for this number. */
-    protected final int max;
-
-    /**
-     * Creates a new numerical validator with the specified bounds.
-     *
-     * @param min The minimum value for the number, or -1 for unlimited.
-     * @param max The maximum value for the number, or -1 for unlimited.
-     */
-    public NumericalValidator(int min, int max) {
-        this.max = max == -1 ? Integer.MAX_VALUE : max;
-        this.min = min == -1 ? Integer.MIN_VALUE : min;
-        if (this.min > this.max) {
-            throw new IllegalArgumentException("min must be less than max.");
-        }
-    }
-
-    /**
-     * Retrieves the maximum value that this validator will allow.
-     *
-     * @return This validator's maximum value
-     */
-    public int getMax() {
-        return max;
-    }
-
-    /**
-     * Retrieves the minimum value that this validator will allow.
-     *
-     * @return This validator's minimum value
-     */
-    public int getMin() {
-        return min;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public ValidationResponse validate(final String object) {
-        int intv;
-
-        try {
-            intv = Integer.parseInt(object);
-        } catch (NumberFormatException ex) {
-            return new ValidationResponse("Must be a valid number");
-        }
-
-        if (intv < min) {
-            return new ValidationResponse("Must be at least " + min);
-        } else if (intv > max) {
-            return new ValidationResponse("Must be at most " + max);
-        } else {
-            return new ValidationResponse();
-        }
-    }
-
-}

src/com/dmdirc/config/prefs/validator/OptionalValidator.java

@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.config.prefs.validator;
-
-/**
- * Validates an optional setting in tandem with another validator.
- */
-public class OptionalValidator implements Validator<String> {
-
-    /** The minimum value for this number. */
-    protected final Validator<String> validator;
-
-    /**
-     * Creates a new Optional validator.
-     *
-     * @param validator The validator for the setting's value, if present
-     */
-    public OptionalValidator(final Validator<String> validator) {
-        this.validator = validator;
-    }
-
-    /**
-     * Gets the secondary validator.
-     *
-     * @return Secondary validator
-     */
-    public Validator<String> getValidator() {
-        return validator;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public ValidationResponse validate(final String object) {
-        final int colonIndex = object.indexOf(':');
-
-        if (colonIndex == -1) {
-            return new ValidationResponse("Must contain boolean int seperator.");
-        }
-
-        final String booleanv = object.substring(0, colonIndex);
-
-        if (!"true".equals(booleanv) && !"false".equals(booleanv)) {
-            return new ValidationResponse("Must be true or false.");
-        }
-
-        return validator.validate(object.substring(colonIndex + 1));
-    }
-
-}

src/com/dmdirc/config/prefs/validator/PermissiveValidator.java

@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.dmdirc.config.prefs.validator;
-
-/**
- * A validator that permits everything.
- *
- * @param <V> The type of data that this validator validates
- * @author chris
- */
-public class PermissiveValidator<V> implements Validator<V> {
-    
-    /**
-     * Creates a new instance of PermissiveValidator.
-     */
-    public PermissiveValidator() {
-        super();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public ValidationResponse validate(final V object) {
-        return new ValidationResponse();
-    }
-
-}

src/com/dmdirc/config/prefs/validator/PortValidator.java

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.dmdirc.config.prefs.validator;
-
-/**
- * Validates a port number.
- *
- * @author chris
- */
-public class PortValidator extends NumericalValidator {
-
-    /** The minimum port number. */
-    private static final int MIN_PORT = 1;
-
-    /** The maximum port number. */
-    private static final int MAX_PORT = 65535;
-
-    public PortValidator() {
-        super(MIN_PORT, MAX_PORT);
-    }
-
-}

src/com/dmdirc/config/prefs/validator/RegexStringValidator.java

@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.config.prefs.validator;
-
-/**
- * Regex validator.
- */
-public class RegexStringValidator implements Validator<String> {
-
-    /** Regex. */
-    private final String regex;
-    /** Failure reason. */
-    private final String failedReason;
-
-    /**
-     * Instantiates a new regex validator.
-     *
-     * @param regex Regex to validate text against
-     * @param failedReason Reason for validation failure
-     */
-    public RegexStringValidator(final String regex, final String failedReason) {
-        this.regex = regex;
-        this.failedReason = failedReason;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public ValidationResponse validate(final String object) {
-        if (object.matches(regex)) {
-            return new ValidationResponse();
-        } else {
-            return new ValidationResponse(failedReason);
-        }
-    }
-
-}

src/com/dmdirc/config/prefs/validator/RegexValidator.java

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.config.prefs.validator;
-
-/**
- * Validates a regular expression.
- *
- * @author chris
- */
-public class RegexValidator implements Validator<String> {
-
-    /** {@inheritDoc} */
-    @Override
-    public ValidationResponse validate(final String object) {
-        try {
-            // Is there a proper way of doing this, as opposed to just seeing
-            // if it breaks?
-
-            "abc".matches(object);
-            return new ValidationResponse();
-        } catch (Exception ex) {
-            return new ValidationResponse(ex.getMessage());
-        }
-    }
-
-}

src/com/dmdirc/config/prefs/validator/StringLengthValidator.java

@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.dmdirc.config.prefs.validator;
-
-/**
- * Validates that the length of a string is within certain bounds.
- * 
- * @author chris
- */
-public class StringLengthValidator implements Validator<String> {
-    
-    /** The minimum string length. */
-    protected final int min;
-    
-    /** The maximum string length. */
-    protected final int max;
-
-    /**
-     * Creates a new string length validator that requires a string be between
-     * the specified min/max length.
-     *
-     * @param min The minimum length of the string, or -1 for unlimited.
-     * @param max The maximum length of the string, or -1 for unlimited.
-     */
-    public StringLengthValidator(final int min, final int max) {
-        this.min = min;
-        this.max = max;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public ValidationResponse validate(final String object) {
-        if (object.length() < min && min != -1) {
-            return new ValidationResponse("Must be at least " + min + " characters long");
-        } else if (object.length() > max && max != -1) {
-            return new ValidationResponse("Must be at most " + max + " characters long");
-        } else {
-            return new ValidationResponse();
-        }
-    }
-
-}

src/com/dmdirc/config/prefs/validator/URIValidator.java

@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.config.prefs.validator;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-
-/**
- * Validates a string to see if it compiles to a URI.
- */
-public class URIValidator implements Validator<String> {
-
-    /** {@inheritDoc} */
-    @Override
-    public ValidationResponse validate(final String object) {
-        ValidationResponse result;
-        try {
-            final URI uri = new URI(object);
-            if (uri.getHost() == null || uri.getHost().isEmpty()) {
-                result = new ValidationResponse("Address requires a hostname.");
-            } else {
-                result = new ValidationResponse();
-            }
-        } catch (URISyntaxException ex) {
-            result = new ValidationResponse(ex.getReason());
-        }
-        return result;
-    }
-}

src/com/dmdirc/config/prefs/validator/ValidationResponse.java

@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.dmdirc.config.prefs.validator;
-
-/**
- * Describes the response from a Validator. The response may be either positive
- * or negative. Negative responses have an associated failure reason.
- *
- * @author chris
- */
-public class ValidationResponse {
-
-    /** The failure reason, or null if the validation passed. */
-    private final String failure;
-
-    /**
-     * Creates a new ValidationResponse for a positive response.
-     */
-    public ValidationResponse() {
-        this(null);
-    }
-
-    /**
-     * Creates a new ValidationResponse for a negative response.
-     *
-     * @param failure The reason for the negative response.
-     */
-    public ValidationResponse(final String failure) {
-        this.failure = failure;
-    }
-
-    /**
-     * Determines whether or not this response indicates that a failure occured.
-     *
-     * @return True if a failure occured, false otherwise.
-     */
-    public boolean isFailure() {
-        return failure != null;
-    }
-
-    /**
-     * Retrieves the reason for the validation failure.
-     *
-     * @return The reason for the validation failure.
-     */
-    public String getFailureReason() {
-        return failure;
-    }
-
-}

src/com/dmdirc/config/prefs/validator/Validator.java

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.config.prefs.validator;
-
-/**
- * Validator interface.
- *
- * @param <V> Type to validate
- */
-public interface Validator<V> {
-
-    /**
-     * Validates the object.
-     *
-     * @param object Object to validate
-     *
-     * @return A validation response indicating the success/failure of the
-     * validation
-     */
-    ValidationResponse validate(final V object);
-
-}

src/com/dmdirc/config/prefs/validator/ValidatorChain.java

@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.config.prefs.validator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Allows multiple validators to be chained together.
- *
- * @param <A> The type of class that this chain validates
- * @author chris
- */
-public class ValidatorChain<A> implements Validator<A> {
-
-    /** A list of validators to use. */
-    private final List<Validator<A>> validatorList
-            = new ArrayList<Validator<A>>();
-
-    /**
-     * Creates a new validator chain containing the specified validators.
-     *
-     * @param validators The validators to be used in this chain.
-     */
-    public ValidatorChain(final Validator<A> ... validators) {
-        for (Validator<A> validator : validators) {
-            validatorList.add(validator);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public ValidationResponse validate(final A object) {
-        for (Validator<A> validator : validatorList) {
-            final ValidationResponse res = validator.validate(object);
-
-            if (res.isFailure()) {
-                return res;
-            }
-        }
-
-        return new ValidationResponse();
-    }
-
-}

src/com/dmdirc/config/prefs/validator/URLProtocolValidator.java → src/com/dmdirc/config/validators/URLProtocolValidator.java

@@ -20,8 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.config.prefs.validator;
+package com.dmdirc.config.validators;
 
+import com.dmdirc.util.validators.ValidationResponse;
+import com.dmdirc.util.validators.Validator;
 import com.dmdirc.config.IdentityManager;
 
 /**

src/com/dmdirc/plugins/Plugin.java

@@ -23,7 +23,7 @@
 package com.dmdirc.plugins;
 
 import com.dmdirc.config.prefs.PreferencesManager;
-import com.dmdirc.config.prefs.validator.ValidationResponse;
+import com.dmdirc.util.validators.ValidationResponse;
 import java.io.File;
 
 /**

src/com/dmdirc/plugins/PluginInfo.java

@@ -27,7 +27,7 @@ import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
-import com.dmdirc.config.prefs.validator.ValidationResponse;
+import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.updater.Version;

src/com/dmdirc/ui/input/InputHandler.java

@@ -31,7 +31,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.ValidatingCommand;
 import com.dmdirc.commandparser.commands.WrappableCommand;
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.config.prefs.validator.ValidationResponse;
+import com.dmdirc.util.validators.ValidationResponse;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.tabstyles.TabCompletionResult;

test/com/dmdirc/config/prefs/validator/ActionGroupValidatorTest.java → test/com/dmdirc/actions/validators/ActionGroupValidatorTest.java

@@ -20,8 +20,9 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.config.prefs.validator;
+package com.dmdirc.actions.validators;
 
+import com.dmdirc.actions.validators.ActionGroupValidator;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.config.IdentityManager;
 import org.junit.BeforeClass;

test/com/dmdirc/config/prefs/validator/ConditionRuleValidatorTest.java → test/com/dmdirc/actions/validators/ConditionRuleValidatorTest.java

@@ -20,8 +20,10 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.config.prefs.validator;
+package com.dmdirc.actions.validators;
 
+import com.dmdirc.actions.validators.ConditionRuleValidator;
+import com.dmdirc.util.validators.ValidationResponse;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

test/com/dmdirc/config/prefs/PreferencesSettingTest.java

@@ -22,9 +22,9 @@
 package com.dmdirc.config.prefs;
 
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.config.prefs.validator.NotEmptyValidator;
-import com.dmdirc.config.prefs.validator.PermissiveValidator;
-import com.dmdirc.config.prefs.validator.StringLengthValidator;
+import com.dmdirc.util.validators.NotEmptyValidator;
+import com.dmdirc.util.validators.PermissiveValidator;
+import com.dmdirc.util.validators.StringLengthValidator;
 import java.util.HashMap;
 import java.util.Map;
 import org.junit.BeforeClass;

test/com/dmdirc/config/prefs/validator/FileNameValidatorTest.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.config.prefs.validator;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class FileNameValidatorTest {
-
-    @Test
-    public void testValidate() {
-        final FileNameValidator rv = new FileNameValidator();
-        
-        assertTrue(rv.validate("/foo").isFailure());
-        assertFalse(rv.validate("filename").isFailure());
-    }
-
-}

test/com/dmdirc/config/prefs/validator/IdentValidatorTest.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.config.prefs.validator;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class IdentValidatorTest {
-
-    @Test
-    public void testPass() {
-        assertTrue(new IdentValidator().validate("foo bar").isFailure());
-    }
-
-    @Test
-    public void testFail() {
-        assertFalse(new IdentValidator().validate("foo[]bar").isFailure());
-    }
-
-}

test/com/dmdirc/config/prefs/validator/NicknameValidatorTest.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.config.prefs.validator;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class NicknameValidatorTest {
-
-    @Test
-    public void testPass() {
-        assertTrue(new NicknameValidator().validate("foo bar").isFailure());
-    }
-
-    @Test
-    public void testFail() {
-        assertFalse(new NicknameValidator().validate("foo[]bar").isFailure());
-    }
-
-}

test/com/dmdirc/config/prefs/validator/NotEmptyValidatorTest.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.dmdirc.config.prefs.validator;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class NotEmptyValidatorTest {
-
-    @Test
-    public void testValidate() {
-        final NotEmptyValidator nev = new NotEmptyValidator();
-        
-        assertTrue(nev.validate("").isFailure());
-        assertTrue(nev.validate("").getFailureReason().indexOf("empty") > -1);
-        assertFalse(nev.validate("moo").isFailure());
-        assertFalse(nev.validate(" ").isFailure());
-    }
-
-}

test/com/dmdirc/config/prefs/validator/NumericalValidatorTest.java

@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.dmdirc.config.prefs.validator;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class NumericalValidatorTest {
-
-    @Test
-    public void testGetMax() {
-        assertEquals(10, new NumericalValidator(1, 10).getMax());
-        assertEquals(Integer.MAX_VALUE, new NumericalValidator(1, -1).getMax());
-    }
-
-    @Test
-    public void testGetMin() {
-        assertEquals(1, new NumericalValidator(1, 10).getMin());
-        assertEquals(Integer.MIN_VALUE, new NumericalValidator(-1, 10).getMin());
-    }
-
-    @Test
-    public void testNAN() {
-        final ValidationResponse vr = new NumericalValidator(3, 5).validate("foo");
-        
-        assertTrue(vr.isFailure());
-        assertTrue(vr.getFailureReason().indexOf("number") > -1);
-    }
-    
-    @Test
-    public void testMin() {
-        final NumericalValidator nv1 = new NumericalValidator(-1, -1);
-        final NumericalValidator nv2 = new NumericalValidator(-5, -1);
-        
-        assertFalse(nv1.validate("-5").isFailure());
-        assertFalse(nv2.validate("-5").isFailure());
-        assertFalse(nv2.validate("-4").isFailure());
-        assertFalse(nv2.validate("10").isFailure());
-        assertTrue(nv2.validate("-6").isFailure());
-    }
-    
-    @Test
-    public void testMax() {
-        final NumericalValidator nv1 = new NumericalValidator(-1, -1);
-        final NumericalValidator nv2 = new NumericalValidator(-1, 10);
-        
-        assertFalse(nv1.validate("-5").isFailure());
-        assertFalse(nv1.validate("50").isFailure());
-        assertFalse(nv2.validate("-5").isFailure());
-        assertFalse(nv2.validate("-4").isFailure());
-        assertFalse(nv2.validate("10").isFailure());
-        assertTrue(nv2.validate("11").isFailure());
-    }    
-
-}

test/com/dmdirc/config/prefs/validator/OptionalValidatorTest.java

@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.config.prefs.validator;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class OptionalValidatorTest {
-
-    @Test
-    public void testNoSeparator() {
-        final ValidationResponse res = new OptionalValidator(null).validate("foo");
-        assertTrue(res.isFailure());
-        assertTrue(res.getFailureReason().contains("boolean"));
-    }
-
-    @Test
-    public void testIllegalPrefix() {
-        final ValidationResponse res = new OptionalValidator(null).validate("foo:bar");
-        assertTrue(res.isFailure());
-        assertTrue(res.getFailureReason().contains("true"));
-        assertTrue(res.getFailureReason().contains("false"));
-    }
-
-    @Test
-    public void testTrueValidation() {
-        final ValidationResponse res = new OptionalValidator(new StringLengthValidator(0, 3))
-                .validate("true:bar");
-        assertFalse(res.isFailure());
-    }
-
-    @Test
-    public void testFalseValidation() {
-        final ValidationResponse res = new OptionalValidator(new StringLengthValidator(0, 2))
-                .validate("true:bar");
-        assertTrue(res.isFailure());
-        assertTrue(res.getFailureReason().contains("at most 2"));
-    }
-
-}

test/com/dmdirc/config/prefs/validator/PermissiveValidatorTest.java

@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.dmdirc.config.prefs.validator;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class PermissiveValidatorTest {
-
-    @Test
-    public void testValidate() {
-        assertFalse(new PermissiveValidator<String>().validate("abc").isFailure());
-        assertFalse(new PermissiveValidator<String>().validate(null).isFailure());
-    }
-
-}

test/com/dmdirc/config/prefs/validator/PortValidatorTest.java

@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.dmdirc.config.prefs.validator;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class PortValidatorTest {
-
-    @Test
-    public void testBounds() {
-        final PortValidator pv = new PortValidator();
-        
-        assertEquals(1, pv.getMin());
-        assertEquals(65535, pv.getMax());
-    }
-
-}

test/com/dmdirc/config/prefs/validator/RegexStringValidatorTest.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.dmdirc.config.prefs.validator;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class RegexStringValidatorTest {
-
-    @Test
-    public void testValidate() {
-        final String reason = "abc 123";
-        final RegexStringValidator rv = new RegexStringValidator("[0-9]{5}", reason);
-        
-        assertTrue(rv.validate("abc").isFailure());
-        assertEquals(reason, rv.validate("abc").getFailureReason());
-        assertFalse(rv.validate("55555").isFailure());
-    }
-
-}

test/com/dmdirc/config/prefs/validator/RegexValidatorTest.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.config.prefs.validator;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class RegexValidatorTest {
-
-    @Test
-    public void testValidate() {
-        final RegexValidator rv = new RegexValidator();
-        
-        assertTrue(rv.validate("****").isFailure());
-        assertFalse(rv.validate("[a-z]").isFailure());
-    }
-
-}

test/com/dmdirc/config/prefs/validator/StringLengthValidatorTest.java

@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.dmdirc.config.prefs.validator;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class StringLengthValidatorTest {
-
-    @Test
-    public void testUnlimited() {
-        final StringLengthValidator slv = new StringLengthValidator(-1, 10);
-        
-        assertFalse(slv.validate("123").isFailure());
-        assertFalse(slv.validate("").isFailure());
-        assertFalse(slv.validate("123456789").isFailure());
-        
-        final StringLengthValidator slv2 = new StringLengthValidator(0, -1);
-        
-        assertFalse(slv2.validate("123456789").isFailure());
-        assertFalse(slv2.validate("1").isFailure());
-    }
-    
-    @Test
-    public void testMinimum() {
-        final StringLengthValidator slv = new StringLengthValidator(5, 100);
-        
-        assertTrue(slv.validate("").isFailure());
-        assertTrue(slv.validate("123").isFailure());
-        assertTrue(slv.validate("1234").isFailure());
-        assertTrue(slv.validate("1234").getFailureReason().indexOf("at least 5") > -1);
-        assertFalse(slv.validate("12345").isFailure());
-        assertFalse(slv.validate("12345789").isFailure());
-    }
-    
-    @Test
-    public void testMaximum() {
-        final StringLengthValidator slv = new StringLengthValidator(0, 3);
-        
-        assertFalse(slv.validate("").isFailure());
-        assertFalse(slv.validate("12").isFailure());
-        assertFalse(slv.validate("123").isFailure());
-        assertTrue(slv.validate("1234").isFailure());
-        assertTrue(slv.validate("1234").getFailureReason().indexOf("at most 3") > -1);
-        assertTrue(slv.validate("12345").isFailure());
-    }    
-
-}

test/com/dmdirc/config/prefs/validator/ValidatorChainTest.java

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.config.prefs.validator;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class ValidatorChainTest {
-
-    @Test
-    public void testValidate() {
-        @SuppressWarnings("unchecked")
-        final ValidatorChain<String> chain = new ValidatorChain<String>(
-                new NotEmptyValidator(), new RegexStringValidator("[a-z]*", "abc"));
-        
-        assertTrue(chain.validate("").isFailure());
-        assertTrue(chain.validate("__").isFailure());
-        assertFalse(chain.validate("abc").isFailure());
-    }
-
-}

test/com/dmdirc/config/prefs/validator/URLProtocolValidatorTest.java → test/com/dmdirc/config/validators/URLProtocolValidatorTest.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.config.prefs.validator;
+package com.dmdirc.config.validators;
 
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;