diff --git a/src/main/java/ninja/javafx/smartcsv/validation/AlphaNumericValidation.java b/src/main/java/ninja/javafx/smartcsv/validation/AlphaNumericValidation.java index cfcde8e..84650dd 100644 --- a/src/main/java/ninja/javafx/smartcsv/validation/AlphaNumericValidation.java +++ b/src/main/java/ninja/javafx/smartcsv/validation/AlphaNumericValidation.java @@ -30,7 +30,7 @@ import static org.apache.commons.validator.GenericValidator.matchRegexp; /** * Checks if the value is alpha numeric */ -public class AlphaNumericValidation extends EmptyAllowedValidation { +public class AlphaNumericValidation extends EmptyValueIsValid { @Override public void check(int row, String value, ValidationError error) { if (!matchRegexp(value, "[0-9a-zA-Z]*")) { diff --git a/src/main/java/ninja/javafx/smartcsv/validation/DateValidation.java b/src/main/java/ninja/javafx/smartcsv/validation/DateValidation.java index b96739c..eae88e9 100644 --- a/src/main/java/ninja/javafx/smartcsv/validation/DateValidation.java +++ b/src/main/java/ninja/javafx/smartcsv/validation/DateValidation.java @@ -30,7 +30,7 @@ import static org.apache.commons.validator.GenericValidator.isDate; /** * Checks if the date has the right format */ -public class DateValidation extends EmptyAllowedValidation { +public class DateValidation extends EmptyValueIsValid { private String dateformat; diff --git a/src/main/java/ninja/javafx/smartcsv/validation/DoubleValidation.java b/src/main/java/ninja/javafx/smartcsv/validation/DoubleValidation.java index 32d2431..39864b9 100644 --- a/src/main/java/ninja/javafx/smartcsv/validation/DoubleValidation.java +++ b/src/main/java/ninja/javafx/smartcsv/validation/DoubleValidation.java @@ -30,7 +30,7 @@ import static org.apache.commons.validator.GenericValidator.isDouble; /** * Checks if the value is a double */ -public class DoubleValidation extends EmptyAllowedValidation { +public class DoubleValidation extends EmptyValueIsValid { @Override public void check(int row, String value, ValidationError error) { diff --git a/src/main/java/ninja/javafx/smartcsv/validation/EmptyAllowedValidation.java b/src/main/java/ninja/javafx/smartcsv/validation/EmptyValueIsValid.java similarity index 54% rename from src/main/java/ninja/javafx/smartcsv/validation/EmptyAllowedValidation.java rename to src/main/java/ninja/javafx/smartcsv/validation/EmptyValueIsValid.java index f4dcdc0..3757a05 100644 --- a/src/main/java/ninja/javafx/smartcsv/validation/EmptyAllowedValidation.java +++ b/src/main/java/ninja/javafx/smartcsv/validation/EmptyValueIsValid.java @@ -1,9 +1,9 @@ package ninja.javafx.smartcsv.validation; /** - * Created by abi on 09.08.2016. + * validations based on this are not validated when the value is null or empty */ -public abstract class EmptyAllowedValidation implements Validation { +public abstract class EmptyValueIsValid implements Validation { @Override public boolean canBeChecked(String value) { diff --git a/src/main/java/ninja/javafx/smartcsv/validation/GroovyValidation.java b/src/main/java/ninja/javafx/smartcsv/validation/GroovyValidation.java index 8aa2f54..f169f0a 100644 --- a/src/main/java/ninja/javafx/smartcsv/validation/GroovyValidation.java +++ b/src/main/java/ninja/javafx/smartcsv/validation/GroovyValidation.java @@ -33,7 +33,7 @@ import org.codehaus.groovy.control.CompilationFailedException; /** * Executes the given groovy as check */ -public class GroovyValidation extends EmptyAllowedValidation { +public class GroovyValidation extends EmptyValueIsValid { private String groovyScript; private GroovyShell shell = new GroovyShell(); diff --git a/src/main/java/ninja/javafx/smartcsv/validation/IntegerValidation.java b/src/main/java/ninja/javafx/smartcsv/validation/IntegerValidation.java index 46580f9..83ef7f9 100644 --- a/src/main/java/ninja/javafx/smartcsv/validation/IntegerValidation.java +++ b/src/main/java/ninja/javafx/smartcsv/validation/IntegerValidation.java @@ -30,7 +30,7 @@ import static org.apache.commons.validator.GenericValidator.isInt; /** * Checks if the value is an integer */ -public class IntegerValidation extends EmptyAllowedValidation { +public class IntegerValidation extends EmptyValueIsValid { @Override public void check(int row, String value, ValidationError error) { diff --git a/src/main/java/ninja/javafx/smartcsv/validation/MaxLengthValidation.java b/src/main/java/ninja/javafx/smartcsv/validation/MaxLengthValidation.java index 6969209..8e97eb3 100644 --- a/src/main/java/ninja/javafx/smartcsv/validation/MaxLengthValidation.java +++ b/src/main/java/ninja/javafx/smartcsv/validation/MaxLengthValidation.java @@ -30,7 +30,7 @@ import static org.apache.commons.validator.GenericValidator.maxLength; /** * Checks if the value is shorter or exactly as long as the given max length */ -public class MaxLengthValidation extends EmptyAllowedValidation { +public class MaxLengthValidation extends EmptyValueIsValid { private int maxLength; diff --git a/src/main/java/ninja/javafx/smartcsv/validation/MinLengthValidation.java b/src/main/java/ninja/javafx/smartcsv/validation/MinLengthValidation.java index 2b21042..2cbf4b0 100644 --- a/src/main/java/ninja/javafx/smartcsv/validation/MinLengthValidation.java +++ b/src/main/java/ninja/javafx/smartcsv/validation/MinLengthValidation.java @@ -30,7 +30,7 @@ import static org.apache.commons.validator.GenericValidator.minLength; /** * Checks if the value is at minimum long as the given min length */ -public class MinLengthValidation extends EmptyAllowedValidation { +public class MinLengthValidation extends EmptyValueIsValid { private int minLength; diff --git a/src/main/java/ninja/javafx/smartcsv/validation/RegExpValidation.java b/src/main/java/ninja/javafx/smartcsv/validation/RegExpValidation.java index 36bb312..aa9bb27 100644 --- a/src/main/java/ninja/javafx/smartcsv/validation/RegExpValidation.java +++ b/src/main/java/ninja/javafx/smartcsv/validation/RegExpValidation.java @@ -30,7 +30,7 @@ import static org.apache.commons.validator.GenericValidator.matchRegexp; /** * Checks the value against the given reg exp */ -public class RegExpValidation extends EmptyAllowedValidation { +public class RegExpValidation extends EmptyValueIsValid { private String regexp; diff --git a/src/main/java/ninja/javafx/smartcsv/validation/UniqueValidation.java b/src/main/java/ninja/javafx/smartcsv/validation/UniqueValidation.java index ca9d208..3a62d19 100644 --- a/src/main/java/ninja/javafx/smartcsv/validation/UniqueValidation.java +++ b/src/main/java/ninja/javafx/smartcsv/validation/UniqueValidation.java @@ -36,7 +36,7 @@ import static java.util.stream.Collectors.joining; /** * Checks if the value is unique in the column */ -public class UniqueValidation extends EmptyAllowedValidation { +public class UniqueValidation extends EmptyValueIsValid { private ColumnValueProvider columnValueProvider; private String column; @@ -55,7 +55,7 @@ public class UniqueValidation extends EmptyAllowedValidation { for (int currentRowOfIteration = 0; currentRowOfIteration < numberOfRows; currentRowOfIteration++) { String storedValue = columnValueProvider.getValue(currentRowOfIteration, column); - if (storedValue.equals(value) && currentRowOfIteration != row) { + if (value.equals(storedValue) && currentRowOfIteration != row) { lineNumbers.add(currentRowOfIteration + 1); // show not 0 based line numbers to user } } diff --git a/src/main/java/ninja/javafx/smartcsv/validation/ValueOfValidation.java b/src/main/java/ninja/javafx/smartcsv/validation/ValueOfValidation.java index 44032db..cf5edb4 100644 --- a/src/main/java/ninja/javafx/smartcsv/validation/ValueOfValidation.java +++ b/src/main/java/ninja/javafx/smartcsv/validation/ValueOfValidation.java @@ -32,7 +32,7 @@ import static java.util.stream.Collectors.joining; /** * Checks if the value is part of a list of values */ -public class ValueOfValidation extends EmptyAllowedValidation { +public class ValueOfValidation extends EmptyValueIsValid { private List values;