Merge pull request #26 from greboid/master

Fix some raw types.

test/com/dmdirc/util/validators/DisabledOptionValidatorTest.java

 
     @Test
     public void testValidateNull() {
-        final Validator instance = new DisabledOptionValidator();
+        final Validator<String> instance = new DisabledOptionValidator();
         assertFalse(instance.validate(null).isFailure());
     }
 
     @Test
     public void testValidateFalse() {
-        final Validator instance = new DisabledOptionValidator();
+        final Validator<String> instance = new DisabledOptionValidator();
         assertTrue(instance.validate("false:moo").isFailure());
     }
 
     @Test
     public void testValidateTrue() {
-        final Validator instance = new DisabledOptionValidator();
+        final Validator<String> instance = new DisabledOptionValidator();
         assertFalse(instance.validate("true:moo").isFailure());
     }
 }

test/com/dmdirc/util/validators/FileNameValidatorTest.java

 
     @Test
     public void testValidate() {
-        final Validator rv = new FileNameValidator();
+        final Validator<String> rv = new FileNameValidator();
         
         assertTrue(rv.validate("/foo").isFailure());
         assertFalse(rv.validate("filename").isFailure());

test/com/dmdirc/util/validators/NotEmptyValidatorTest.java

 
     @Test
     public void testValidate() {
-        final Validator nev = new NotEmptyValidator();
+        final Validator<String> nev = new NotEmptyValidator();
         
         assertTrue(nev.validate("").isFailure());
         assertTrue(nev.validate("").getFailureReason().contains("empty"));

test/com/dmdirc/util/validators/NumericalValidatorTest.java

 
     @Test
     public void testMin() {
-        final Validator nv1 = new NumericalValidator(-1, -1);
-        final Validator nv2 = new NumericalValidator(-5, -1);
+        final Validator<String> nv1 = new NumericalValidator(-1, -1);
+        final Validator<String> nv2 = new NumericalValidator(-5, -1);
 
         assertFalse(nv1.validate("-5").isFailure());
         assertFalse(nv2.validate("-5").isFailure());
 
     @Test
     public void testMax() {
-        final Validator nv1 = new NumericalValidator(-1, -1);
-        final Validator nv2 = new NumericalValidator(-1, 10);
+        final Validator<String> nv1 = new NumericalValidator(-1, -1);
+        final Validator<String> nv2 = new NumericalValidator(-1, 10);
 
         assertFalse(nv1.validate("-5").isFailure());
         assertFalse(nv1.validate("50").isFailure());

test/com/dmdirc/util/validators/OptionalValidatorTest.java

     @Test
     public void testNullValue() {
         final Validator<String> validator = new NotEmptyValidator();
-        final Validator instance = new OptionalValidator(validator);
+        final Validator<String> instance = new OptionalValidator(validator);
         assertTrue(instance.validate(null).isFailure());
     }
 

test/com/dmdirc/util/validators/RegexStringValidatorTest.java

     @Test
     public void testValidate() {
         final String reason = "abc 123";
-        final Validator rv = new RegexStringValidator("[0-9]{5}", reason);
+        final Validator<String> rv = new RegexStringValidator("[0-9]{5}", reason);
         
         assertTrue(rv.validate("abc").isFailure());
         assertEquals(reason, rv.validate("abc").getFailureReason());

test/com/dmdirc/util/validators/RegexValidatorTest.java

 
     @Test
     public void testValidate() {
-        final Validator rv = new RegexValidator();
+        final Validator<String> rv = new RegexValidator();
         
         assertTrue(rv.validate("****").isFailure());
         assertFalse(rv.validate("[a-z]").isFailure());

test/com/dmdirc/util/validators/StringLengthValidatorTest.java

 
     @Test
     public void testUnlimited() {
-        final Validator slv = new StringLengthValidator(-1, 10);
+        final Validator<String> slv = new StringLengthValidator(-1, 10);
         
         assertFalse(slv.validate("123").isFailure());
         assertFalse(slv.validate("").isFailure());
         assertFalse(slv.validate("123456789").isFailure());
         
-        final Validator slv2 = new StringLengthValidator(0, -1);
+        final Validator<String> slv2 = new StringLengthValidator(0, -1);
         
         assertFalse(slv2.validate("123456789").isFailure());
         assertFalse(slv2.validate("1").isFailure());
     
     @Test
     public void testMinimum() {
-        final Validator slv = new StringLengthValidator(5, 100);
+        final Validator<String> slv = new StringLengthValidator(5, 100);
         
         assertTrue(slv.validate("").isFailure());
         assertTrue(slv.validate("123").isFailure());
     
     @Test
     public void testMaximum() {
-        final Validator slv = new StringLengthValidator(0, 3);
+        final Validator<String> slv = new StringLengthValidator(0, 3);
         
         assertFalse(slv.validate("").isFailure());
         assertFalse(slv.validate("12").isFailure());

test/com/dmdirc/util/validators/URIValidatorTest.java

 
     @Test
     public void testValidateInvalidURI() {
-        final Validator instance = new URIValidator();
+        final Validator<String> instance = new URIValidator();
         assertTrue(instance.validate("http://^").isFailure());
     }
 
     @Test
     public void testValidateValid() {
-        final Validator instance = new URIValidator();
+        final Validator<String> instance = new URIValidator();
         assertFalse(instance.validate("http://google.com:80").isFailure());
     }
 }