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

reorganized storage of models

Browse Source
This commit is contained in:
Andreas Billmann
2016-07-22 20:45:26 +02:00
parent 6e7c3226ab
commit 64d5000b62
14 changed files with 191 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/ninja/javafx/smartcsv/fx/table/model/CSVModel.java
View File

@@ -32,6 +32,9 @@ import ninja.javafx.smartcsv.validation.ValidationConfiguration;
import ninja.javafx.smartcsv.validation.ValidationError;
import ninja.javafx.smartcsv.validation.Validator;
import java.util.ArrayList;
import java.util.List;
/**
* The CSVModel is the client representation for the csv filepath.
* It holds the data in rows, stores the header and manages the validator.
@@ -100,8 +103,15 @@ public class CSVModel {
public void revalidate() {
validationError.clear();
if (header != null && validator != null) {
addValidationError(validator.isHeaderValid(header));
if (!hasValidator()) return;
List<ValidationError> errors = new ArrayList<>();
if (header != null) {
ValidationError headerError = validator.isHeaderValid(header);
if (headerError != null) {
errors.add(headerError);
}
}
for (int lineNumber = 0; lineNumber < rows.size(); lineNumber++) {
@@ -113,7 +123,7 @@ public class CSVModel {
if (validator != null) {
ValidationError validationError = validator.isValid(column, value.getValue(), lineNumber);
if (validationError != null) {
addValidationError(validationError);
errors.add(validationError);
value.setValidationError(validationError);
} else {
value.setValidationError(null);
@@ -123,12 +133,12 @@ public class CSVModel {
}
}
}
validationError.setAll(errors);
}
private void addValidationError(ValidationError validationError) {
if (validationError != null) {
this.validationError.add(validationError);
}
private boolean hasValidator() {
return validator != null && validator.hasConfig();
}
}