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

unique validation has to work on the model to have the correct snapshot of the data

Browse Source
This commit is contained in:
Andreas Billmann
2016-08-09 20:58:16 +02:00
parent b79a20201e
commit c7873ef0ba
6 changed files with 65 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,8 @@
package ninja.javafx.smartcsv.validation;
import ninja.javafx.smartcsv.fx.table.model.ColumnValueProvider;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -41,6 +43,7 @@ public class Validator {
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
private ValidationConfiguration validationConfig;
private ColumnValueProvider columnValueProvider;
private Map<String, Map<Validation.Type, Validation>> columnValidationMap = new HashMap<>();
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -52,8 +55,9 @@ public class Validator {
*
* @param validationConfig
*/
public Validator(ValidationConfiguration validationConfig) {
public Validator(ValidationConfiguration validationConfig, ColumnValueProvider columnValueProvider) {
this.validationConfig = validationConfig;
this.columnValueProvider = columnValueProvider;
initColumnValidations();
}
@@ -160,7 +164,7 @@ public class Validator {
Boolean uniqueRule = validationConfig.getUniqueRuleFor(column);
if (uniqueRule != null && uniqueRule) {
add(column, new UniqueValidation());
add(column, new UniqueValidation(columnValueProvider, column));
}
String dateRule = validationConfig.getDateRuleFor(column);