frosch95/SmartCSV.fx
1
0
Fork 0
mirror of https://github.com/frosch95/SmartCSV.fx.git synced 2026-04-11 13:38:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed NPE when string has no format

Browse Source
This commit is contained in:
Andreas Billmann
2016-09-22 21:35:40 +02:00
parent a37a84bd09
commit 7e34ff8c59
1 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/ninja/javafx/smartcsv/validation/Validator.java
View File

@@ -133,6 +133,15 @@ public class Validator {
validationMap.put(validation.getType(), validation); validationMap.put(validation.getType(), validation);
} }
private void remove(String column, Validation.Type type) {
Map<Validation.Type, Validation> validationMap = columnValidationMap.get(column);
if (validationMap == null) {
validationMap = new HashMap<>();
columnValidationMap.put(column, validationMap);
}
validationMap.remove(type);
}
private void clear(String column) { private void clear(String column) {
Map<Validation.Type, Validation> validationMap = columnValidationMap.get(column); Map<Validation.Type, Validation> validationMap = columnValidationMap.get(column);
if (validationMap != null) { if (validationMap != null) {
@@ -186,6 +195,10 @@ public class Validator {
add(column.getName(), new DateValidation(format)); add(column.getName(), new DateValidation(format));
} }
if (column.getType() == STRING && column.getFormat() == null) {
remove(column.getName(), Validation.Type.STRING);
} else {
if (column.getType() == STRING && column.getFormat().equalsIgnoreCase(EMAIL.getExternalValue())) { if (column.getType() == STRING && column.getFormat().equalsIgnoreCase(EMAIL.getExternalValue())) {
add(column.getName(), new EmailValidation()); add(column.getName(), new EmailValidation());
} }
@@ -202,8 +215,6 @@ public class Validator {
add(column.getName(), new BinaryValidation()); add(column.getName(), new BinaryValidation());
} }
if (column.getType() == STRING && column.getFormat() == null) {
columnValidationMap.get(column).remove(Validation.Type.STRING);
} }
} }