Merge remote-tracking branch 'remotes/origin/json_table_schema'

The editor should handle the new configuration

.gitignore

@@ -74,3 +74,4 @@ crashlytics.properties
 crashlytics-build.properties
 
 
+smartcsv.log

README.md

@@ -1,6 +1,6 @@
 # SmartCSV.fx
 ##Description
-A simple JavaFX application to load, save and edit a CSV file and provide a JSON configuration for columns to check the values in the columns.
+A simple JavaFX application to load, save and edit a CSV file and provide a [JSON Table Schema](http://specs.frictionlessdata.io/json-table-schema/) for columns to check the values in the columns.
 
 ##Motivation
 At work I have the need to fix wrong CSV files from customers. It is hard to find the errors and fix them in a texteditor, 
@@ -14,7 +14,7 @@ even in a "normal" CSV editor. So I decided to write this simple JavaFX applicat
 
 [Wiki & Documentation](https://github.com/frosch95/SmartCSV.fx/wiki)
 
-binary distribution of the [latest release (0.5)](https://drive.google.com/file/d/0BwY9gBUvn5qmejllOTRwbEJYdDA/view?usp=sharing)
+binary distribution of the [latest release (0.8)](https://github.com/frosch95/SmartCSV.fx/releases/download/0.8/SmartCSV.fx-0.8-SNAPSHOT.zip)
 
 ##Talks
 [Introduction](http://javafx.ninja/talks/introduction/)
@@ -23,7 +23,7 @@ binary distribution of the [latest release (0.5)](https://drive.google.com/file/
 ###The MIT License (MIT)
 
 
-Copyright (c) 2015 Andreas Billmann <andreas.billmann@javafx.ninja>
+Copyright (c) 2015-2016 Andreas Billmann <andreas.billmann@javafx.ninja>
 
 
 

build.gradle

@@ -1,5 +1,5 @@
 group 'ninja.javafx'
-version '0.5-SNAPSHOT'
+version '0.8-SNAPSHOT'
 
 apply plugin: 'java'
 apply plugin: 'groovy'

license

@@ -1,7 +1,7 @@
 The MIT License (MIT)
 ------------------------------------------------------------------------------------------------------------------------
 
-Copyright (c) 2015 Andreas Billmann <andreas.billmann@javafx.ninja>
+Copyright (c) 2015-2016 Andreas Billmann <andreas.billmann@javafx.ninja>
 
 
 

src/main/java/ninja/javafx/smartcsv/FileReader.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal

src/main/java/ninja/javafx/smartcsv/FileWriter.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal

src/main/java/ninja/javafx/smartcsv/csv/CSVConfigurable.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal

src/main/java/ninja/javafx/smartcsv/csv/CSVFileReader.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,6 @@ package ninja.javafx.smartcsv.csv;
 import ninja.javafx.smartcsv.FileReader;
 import ninja.javafx.smartcsv.fx.table.model.CSVModel;
 import ninja.javafx.smartcsv.fx.table.model.CSVRow;
-import org.springframework.stereotype.Service;
 import org.supercsv.io.CsvMapReader;
 import org.supercsv.io.ICsvMapReader;
 
@@ -60,7 +59,7 @@ public class CSVFileReader extends CSVConfigurable implements FileReader<CSVMode
             while ((customerMap = mapReader.read(header)) != null) {
                 CSVRow row = model.addRow();
                 for (String column : header) {
-                    row.addValue(column, customerMap.get(column));
+                    model.addValue(row, column, customerMap.get(column));
                 }
             }
 

src/main/java/ninja/javafx/smartcsv/csv/CSVFileWriter.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,6 @@ package ninja.javafx.smartcsv.csv;
 
 import ninja.javafx.smartcsv.fx.table.model.CSVModel;
 import ninja.javafx.smartcsv.fx.table.model.CSVRow;
-import org.springframework.stereotype.Service;
 import org.supercsv.io.CsvMapWriter;
 import org.supercsv.io.ICsvMapWriter;
 

src/main/java/ninja/javafx/smartcsv/export/ErrorExport.java

@@ -0,0 +1,71 @@
+package ninja.javafx.smartcsv.export;
+
+import javafx.concurrent.Service;
+import javafx.concurrent.Task;
+import ninja.javafx.smartcsv.fx.table.model.CSVModel;
+import ninja.javafx.smartcsv.validation.ValidationError;
+
+import java.io.File;
+import java.io.StringWriter;
+import java.nio.file.Files;
+import java.util.ResourceBundle;
+
+import static java.text.MessageFormat.format;
+import static ninja.javafx.smartcsv.fx.util.I18nValidationUtil.getI18nValidatioMessage;
+
+/**
+ * this class exports the error messages into a log file
+ */
+@org.springframework.stereotype.Service
+public class ErrorExport extends Service {
+
+    private CSVModel model;
+    private File file;
+    private ResourceBundle resourceBundle;
+    private String csvFilename;
+
+    public void setCsvFilename(String csvFilename) {
+        this.csvFilename = csvFilename;
+    }
+
+    public void setResourceBundle(ResourceBundle resourceBundle) {
+        this.resourceBundle = resourceBundle;
+    }
+
+    public void setModel(CSVModel model) {
+        this.model = model;
+    }
+
+    public void setFile(File file) {
+        this.file = file;
+    }
+
+    @Override
+    protected Task createTask() {
+        return new Task() {
+            @Override
+            protected Void call() throws Exception {
+                try {
+                    StringWriter log = new StringWriter();
+                    log.append(
+                            format(resourceBundle.getString("log.header.message"),
+                                   csvFilename,
+                                   Integer.toString(model.getValidationError().size()))).append("\n\n");
+                    model.getValidationError().forEach(error ->
+                        log.append(
+                                format(resourceBundle.getString("log.message"),
+                                       error.getLineNumber().toString(),
+                                       error.getColumn(),
+                                       getI18nValidatioMessage(resourceBundle, error))).append("\n")
+                    );
+                    Files.write(file.toPath(), log.toString().getBytes());
+
+                } catch (Throwable ex) {
+                    ex.printStackTrace();
+                }
+                return null;
+            }
+        };
+    }
+
+}

src/main/java/ninja/javafx/smartcsv/fx/FXMLController.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal

src/main/java/ninja/javafx/smartcsv/fx/SmartCSV.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -28,11 +28,9 @@ package ninja.javafx.smartcsv.fx;
 
 import javafx.application.Application;
 import javafx.application.Platform;
-import javafx.event.EventHandler;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
-import javafx.stage.WindowEvent;
 import ninja.javafx.smartcsv.fx.about.AboutController;
 import org.springframework.context.annotation.*;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;

src/main/java/ninja/javafx/smartcsv/fx/SmartCSVController.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -26,10 +26,7 @@
 
 package ninja.javafx.smartcsv.fx;
 
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
+import javafx.beans.binding.Bindings;
 import javafx.collections.ListChangeListener;
 import javafx.collections.WeakListChangeListener;
 import javafx.concurrent.WorkerStateEvent;
@@ -41,9 +38,9 @@ import javafx.scene.control.*;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.FileChooser;
-import javafx.util.converter.NumberStringConverter;
 import ninja.javafx.smartcsv.csv.CSVFileReader;
 import ninja.javafx.smartcsv.csv.CSVFileWriter;
+import ninja.javafx.smartcsv.export.ErrorExport;
 import ninja.javafx.smartcsv.files.FileStorage;
 import ninja.javafx.smartcsv.fx.about.AboutController;
 import ninja.javafx.smartcsv.fx.list.ErrorSideBar;
@@ -59,7 +56,7 @@ import ninja.javafx.smartcsv.fx.util.SaveFileService;
 import ninja.javafx.smartcsv.fx.validation.ValidationEditorController;
 import ninja.javafx.smartcsv.preferences.PreferencesFileReader;
 import ninja.javafx.smartcsv.preferences.PreferencesFileWriter;
-import ninja.javafx.smartcsv.validation.ValidationConfiguration;
+import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
 import ninja.javafx.smartcsv.validation.ValidationError;
 import ninja.javafx.smartcsv.validation.ValidationFileReader;
 import ninja.javafx.smartcsv.validation.ValidationFileWriter;
@@ -71,11 +68,9 @@ import org.supercsv.prefs.CsvPreference;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
-import java.text.MessageFormat;
 import java.util.Optional;
 import java.util.ResourceBundle;
 
-import static java.lang.Integer.parseInt;
 import static java.lang.Math.max;
 import static java.text.MessageFormat.format;
 import static javafx.application.Platform.exit;
@@ -102,6 +97,9 @@ public class SmartCSVController extends FXMLController {
     public static final String CSV_FILTER_EXTENSION = "*.csv";
     public static final String JSON_FILTER_TEXT = "JSON files (*.json)";
     public static final String JSON_FILTER_EXTENSION = "*.json";
+    public static final String EXPORT_LOG_FILTER_TEXT = "Error log files (*.log)";
+    public static final String EXPORT_LOG_FILTER_EXTENSION = "*.log";
+
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // injections
@@ -122,6 +120,9 @@ public class SmartCSVController extends FXMLController {
     @Autowired
     private SaveFileService saveFileService;
 
+    @Autowired
+    private ErrorExport errorExport;
+
     @FXML
     private BorderPane applicationPane;
 
@@ -164,6 +165,9 @@ public class SmartCSVController extends FXMLController {
     @FXML
     private MenuItem gotoLineMenuItem;
 
+    @FXML
+    private MenuItem exportMenuItem;
+
     @FXML
     private Button saveButton;
 
@@ -188,6 +192,9 @@ public class SmartCSVController extends FXMLController {
     @FXML
     private Button addRowButton;
 
+    @FXML
+    private Button exportButton;
+
     @FXML
     private Label currentLineNumber;
 
@@ -200,8 +207,10 @@ public class SmartCSVController extends FXMLController {
     private TableView<CSVRow> tableView;
     private ErrorSideBar errorSideBar;
     private ResourceBundle resourceBundle;
+    private CSVFileReader csvFileReader = new CSVFileReader();
+    private CSVFileWriter csvFileWriter = new CSVFileWriter();
 
-    private FileStorage<CSVModel> currentCsvFile = new FileStorage<>(new CSVFileReader(), new CSVFileWriter());
+    private FileStorage<CSVModel> currentCsvFile = new FileStorage<>(csvFileReader, csvFileWriter);
     private FileStorage<ValidationConfiguration> currentConfigFile = new FileStorage<>(new ValidationFileReader(), new ValidationFileWriter());
     private FileStorage<CsvPreference> csvPreferenceFile = new FileStorage<>(new PreferencesFileReader(), new PreferencesFileWriter());
 
@@ -352,7 +361,7 @@ public class SmartCSVController extends FXMLController {
     public void addRow(ActionEvent actionEvent) {
         CSVRow row = currentCsvFile.getContent().addRow();
         for (String column : currentCsvFile.getContent().getHeader()) {
-            row.addValue(column, "");
+            currentCsvFile.getContent().addValue(row, column, "");
         }
         currentCsvFile.setFileChanged(true);
         resetContent();
@@ -377,6 +386,26 @@ public class SmartCSVController extends FXMLController {
         }
     }
 
+    @FXML
+    public void export(ActionEvent actionEvent) {
+        final FileChooser fileChooser = new FileChooser();
+
+        //Set extension filter
+        final FileChooser.ExtensionFilter extFilter = new FileChooser.ExtensionFilter(EXPORT_LOG_FILTER_TEXT, EXPORT_LOG_FILTER_EXTENSION);
+        fileChooser.getExtensionFilters().add(extFilter);
+        fileChooser.setTitle("Save");
+
+        //Show open file dialog
+        File file = fileChooser.showSaveDialog(applicationPane.getScene().getWindow());
+        if (file != null) {
+            errorExport.setCsvFilename(currentCsvFile.getFile().getName());
+            errorExport.setModel(currentCsvFile.getContent());
+            errorExport.setFile(file);
+            errorExport.setResourceBundle(resourceBundle);
+            errorExport.restart();
+        }
+    }
+
     public boolean canExit() {
         boolean canExit = true;
         if (currentCsvFile.getContent() != null && currentCsvFile.isFileChanged()) {
@@ -396,6 +425,7 @@ public class SmartCSVController extends FXMLController {
 
     public void showValidationEditor(String column) {
         validationEditorController.setSelectedColumn(column);
+        validationEditorController.updateForm();
 
         Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
         alert.setGraphic(null);
@@ -408,7 +438,7 @@ public class SmartCSVController extends FXMLController {
             runLater(() -> {
                 validationEditorController.updateConfiguration();
                 currentCsvFile.setFileChanged(true);
-                currentCsvFile.getContent().revalidate();
+                currentCsvFile.getContent().revalidate(column);
             });
         }
     }
@@ -493,6 +523,9 @@ public class SmartCSVController extends FXMLController {
 
     private void setCsvPreference(CsvPreference csvPreference) {
         preferencesController.setCsvPreference(csvPreference);
+        csvFileReader.setCsvPreference(csvPreference);
+        csvFileWriter.setCsvPreference(csvPreference);
+
     }
 
     private void loadFile(String filterText,
@@ -559,6 +592,8 @@ public class SmartCSVController extends FXMLController {
      * Creates new table view and add the new content
      */
     private void resetContent() {
+        resetExportButtons();
+
         if (currentCsvFile.getContent() != null) {
             currentCsvFile.getContent().getValidationError().addListener(weakErrorListListener);
             currentCsvFile.getContent().setValidationConfiguration(currentConfigFile.getContent());
@@ -582,15 +617,28 @@ public class SmartCSVController extends FXMLController {
             setRightAnchor(tableView, 0.0);
             tableWrapper.getChildren().setAll(tableView);
             errorSideBar.setModel(currentCsvFile.getContent());
+            binExportButtons();
         }
     }
 
+    private void binExportButtons() {
+        exportButton.disableProperty().bind(Bindings.isEmpty(currentCsvFile.getContent().getValidationError()));
+        exportMenuItem.disableProperty().bind(Bindings.isEmpty(currentCsvFile.getContent().getValidationError()));
+    }
+
+    private void resetExportButtons() {
+        exportButton.disableProperty().unbind();
+        exportMenuItem.disableProperty().unbind();
+        exportButton.disableProperty().setValue(true);
+        exportMenuItem.disableProperty().setValue(true);
+    }
+
     /**
      * Adds a column with the given name to the tableview
      * @param header name of the column header
      * @param tableView the tableview
      */
-    private void addColumn(String header, TableView tableView) {
+    private void addColumn(final String header, TableView tableView) {
         TableColumn column = new TableColumn(header);
         column.setCellValueFactory(new ObservableMapValueFactory(header));
         column.setCellFactory(cellFactory);
@@ -607,7 +655,6 @@ public class SmartCSVController extends FXMLController {
                 getColumns().get(header).setValue(event.getNewValue());
                 runLater(() -> {
                     currentCsvFile.setFileChanged(true);
-                    currentCsvFile.getContent().revalidate();
                 });
             }
         });

src/main/java/ninja/javafx/smartcsv/fx/about/AboutController.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal

src/main/java/ninja/javafx/smartcsv/fx/list/ErrorSideBar.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -36,7 +36,6 @@ import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import ninja.javafx.smartcsv.fx.table.model.CSVModel;
-import ninja.javafx.smartcsv.fx.util.ColorConstants;
 import ninja.javafx.smartcsv.validation.ValidationError;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -49,7 +48,7 @@ import java.util.ResourceBundle;
 import static javafx.geometry.Pos.CENTER;
 import static ninja.javafx.smartcsv.fx.util.ColorConstants.ERROR_COLOR;
 import static ninja.javafx.smartcsv.fx.util.ColorConstants.OK_COLOR;
-import static ninja.javafx.smartcsv.fx.util.I18nValidationUtil.getI18nValidatioMessage;
+import static ninja.javafx.smartcsv.fx.util.I18nValidationUtil.getI18nValidatioMessageWithColumn;
 
 /**
  * clickable side bar with error markers
@@ -138,9 +137,7 @@ public class ErrorSideBar extends Region {
 
                 int rows = model.get().getRows().size();
                 double space = (double)heightWithoutStatusBlock() / rows;
-                for (ValidationError error : errorList) {
-                    errorMarkerList.add(generateErrorMarker(space, error));
-                }
+                errorList.forEach(error -> errorMarkerList.add(generateErrorMarker(space, error)));
             }
         }
         getChildren().setAll(errorMarkerList);
@@ -159,7 +156,7 @@ public class ErrorSideBar extends Region {
         errorMarker.setStyle("-fx-background-color: " + ERROR_COLOR);
         errorMarker.setOnMouseClicked(event -> selectedValidationError.setValue(error));
         errorMarker.setOnMouseEntered(event -> {
-            popOver.setContentNode(popupContent(getI18nValidatioMessage(resourceBundle, error)));
+            popOver.setContentNode(popupContent(getI18nValidatioMessageWithColumn(resourceBundle, error)));
             popOver.show(errorMarker, -16);
         });
         return errorMarker;

src/main/java/ninja/javafx/smartcsv/fx/list/GotoLineDialog.java

@@ -1,6 +1,5 @@
 package ninja.javafx.smartcsv.fx.list;
 
-import com.sun.javafx.scene.control.skin.resources.ControlResources;
 import javafx.application.Platform;
 import javafx.geometry.Pos;
 import javafx.scene.control.*;

src/main/java/ninja/javafx/smartcsv/fx/preferences/PreferencesController.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal

src/main/java/ninja/javafx/smartcsv/fx/table/EditableValidationCell.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -33,7 +33,6 @@ import javafx.scene.control.Tooltip;
 import javafx.scene.input.KeyCode;
 import ninja.javafx.smartcsv.fx.table.model.CSVRow;
 import ninja.javafx.smartcsv.fx.table.model.CSVValue;
-import ninja.javafx.smartcsv.fx.util.ColorConstants;
 
 import java.util.ResourceBundle;
 

src/main/java/ninja/javafx/smartcsv/fx/table/ObservableMapValueFactory.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal

src/main/java/ninja/javafx/smartcsv/fx/table/ValidationCellFactory.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -28,22 +28,18 @@ package ninja.javafx.smartcsv.fx.table.model;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import javafx.concurrent.Service;
-import javafx.concurrent.Task;
-import ninja.javafx.smartcsv.validation.ValidationConfiguration;
+import ninja.javafx.smartcsv.validation.RevalidationService;
+import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
 import ninja.javafx.smartcsv.validation.ValidationError;
 import ninja.javafx.smartcsv.validation.Validator;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-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.
  */
-public class CSVModel {
+public final class CSVModel implements ColumnValueProvider {
 
     private static final Logger logger = LogManager.getLogger(CSVModel.class);
 
@@ -55,15 +51,17 @@ public class CSVModel {
 
     /**
      * sets the validator configuration for the data revalidates
+     *
      * @param validationConfiguration the validator configuration for this data
      */
     public void setValidationConfiguration(ValidationConfiguration validationConfiguration) {
-        this.validator = new Validator(validationConfiguration);
+        this.validator = new Validator(validationConfiguration, this);
         revalidate();
     }
 
     /**
      * returns the data as a list of rows of the
+     *
      * @return list of rows
      */
     public ObservableList<CSVRow> getRows() {
@@ -76,18 +74,30 @@ public class CSVModel {
 
     /**
      * adds a new and empty row
+     *
      * @return the new row
      */
     public CSVRow addRow() {
         CSVRow row = new CSVRow();
-        row.setValidator(validator);
         row.setRowNumber(rows.size());
         rows.add(row);
         return row;
     }
 
+    public void addValue(final CSVRow row, final String column, final String value) {
+        final CSVValue csvValue = row.addValue(column, value);
+        csvValue.valueProperty().addListener(observable -> {
+            if (validator.needsColumnValidation(column)) {
+                revalidate();
+            } else {
+                csvValue.setValidationError(validator.isValid(row.getRowNumber(), column, csvValue.getValue()));
+            }
+        });
+    }
+
     /**
      * sets the column headers as string array
+     *
      * @param header the headers of the columns
      */
     public void setHeader(String[] header) {
@@ -97,6 +107,7 @@ public class CSVModel {
 
     /**
      * returns the column headers
+     *
      * @return the column headers
      */
     public String[] getHeader() {
@@ -104,6 +115,12 @@ public class CSVModel {
     }
 
 
+    public void revalidate(String column) {
+        if (!hasValidator()) return;
+        validator.reinitializeColumn(column);
+        revalidate();
+    }
+
     /**
      * walks through the data and validates each value
      */
@@ -113,8 +130,6 @@ public class CSVModel {
         logger.info("revalidate: hasValidator -> {}", hasValidator());
 
         if (!hasValidator()) return;
-
-        validator.clearScriptCache();
         revalidationService.setHeader(header);
         revalidationService.setRows(rows);
         revalidationService.setValidator(validator);
@@ -130,71 +145,19 @@ public class CSVModel {
     public ValidationConfiguration createValidationConfiguration() {
         ValidationConfiguration newValidationConfiguration = new ValidationConfiguration();
         newValidationConfiguration.setHeaderNames(this.header);
-        this.validator = new Validator(newValidationConfiguration);
+        this.validator = new Validator(newValidationConfiguration, this);
         this.revalidate();
         return newValidationConfiguration;
     }
 
-    private static class RevalidationService extends Service<List<ValidationError>> {
 
-        private Validator validator;
-        private List<CSVRow> rows;
-        private String[] header;
-
-        public void setValidator(Validator validator) {
-            this.validator = validator;
-        }
-
-        public void setRows(List<CSVRow> rows) {
-            this.rows = rows;
-        }
-
-        public void setHeader(String[] header) {
-            this.header = header;
+    @Override
+    public String getValue(int row, String column) {
+        return rows.get(row).getColumns().get(column).getValue().getValue();
     }
 
     @Override
-        protected Task<List<ValidationError>> createTask() {
-            return new Task<List<ValidationError>>() {
-                @Override
-                protected List<ValidationError> call() throws Exception {
-                    List<ValidationError> errors = new ArrayList<>();
-                    try {
-                        if (header != null) {
-                            ValidationError headerError = validator.isHeaderValid(header);
-                            if (headerError != null) {
-                                logger.info("revalidate: header error found");
-                                errors.add(headerError);
+    public int getNumberOfRows() {
+        return rows.size();
     }
-                        }
-
-                        for (int lineNumber = 0; lineNumber < rows.size(); lineNumber++) {
-                            CSVRow row = rows.get(lineNumber);
-                            row.setValidator(validator);
-                            for (String column : row.getColumns().keySet()) {
-                                CSVValue value = row.getColumns().get(column).getValue();
-                                value.setValidator(validator);
-                                if (validator != null) {
-                                    ValidationError validationError = validator.isValid(column, value.getValue(), lineNumber);
-                                    if (validationError != null) {
-                                        logger.info("revalidate: {} errors found in line {}", validationError.getMessages().size(), lineNumber);
-                                        errors.add(validationError);
-                                        value.setValidationError(validationError);
-                                    } else {
-                                        value.setValidationError(null);
-                                    }
-                                } else {
-                                    value.setValidationError(null);
-                                }
-                            }
-                        }
-                    } catch (Throwable t) {
-                        logger.error("validation error", t);
-                    }
-                    return errors;
-                }
-            };
-        }
-    }
-
 }

src/main/java/ninja/javafx/smartcsv/fx/table/model/CSVRow.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -30,24 +30,14 @@ import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableMap;
-import ninja.javafx.smartcsv.validation.Validator;
 
 /**
  * This class represents a single row in the csv file.
  */
 public class CSVRow {
-    private Validator validator;
     private ObservableMap<String, ObjectProperty<CSVValue>> columns = FXCollections.observableHashMap();
     private int rowNumber;
 
-    /**
-     * single row
-     * @param validator the reference to the validator
-     */
-    public void setValidator(Validator validator) {
-        this.validator = validator;
-    }
-
     /**
      * sets the row number
      * @param rowNumber
@@ -78,13 +68,11 @@ public class CSVRow {
      * @param column column name
      * @param value the value to store
      */
-    public void addValue(String column, String value) {
+    CSVValue addValue(String column, String value) {
         CSVValue v = new CSVValue();
-        v.setValidator(validator);
-        v.setColumn(column);
-        v.setRowNumber(rowNumber);
         v.setValue(value);
         columns.put(column, new SimpleObjectProperty<>(v));
+        return v;
     }
 
 }

src/main/java/ninja/javafx/smartcsv/fx/table/model/CSVValue.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,6 @@ package ninja.javafx.smartcsv.fx.table.model;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import ninja.javafx.smartcsv.validation.ValidationError;
-import ninja.javafx.smartcsv.validation.Validator;
 
 /**
  * The csv value represents the value of a single cell.
@@ -37,36 +36,9 @@ import ninja.javafx.smartcsv.validation.Validator;
  * and if the value is valid based on the validator.
  */
 public class CSVValue {
-    private Validator validator;
-    private int rowNumber;
-    private String column;
     private StringProperty value = new SimpleStringProperty();
     private ValidationError valid;
 
-    /**
-     * single value of a cell
-     * @param validator the reference to the validator
-     */
-    public void setValidator(Validator validator) {
-        this.validator = validator;
-    }
-
-    /**
-     * the row number this value is stored in
-     * @param row row number
-     */
-    public void setRowNumber(int row) {
-        this.rowNumber = row;
-    }
-
-    /**
-     * the column this value is stored in
-     * @param column header name of the column
-     */
-    public void setColumn(String column) {
-        this.column = column;
-    }
-
     /**
      * returns the real value
      * @return the real value
@@ -88,9 +60,6 @@ public class CSVValue {
      * @param value the real value
      */
     public void setValue(String value) {
-        if (validator != null) {
-            valid = validator.isValid(column, value, rowNumber);
-        }
         this.value.set(value);
     }
 
@@ -106,7 +75,7 @@ public class CSVValue {
      * sets the state if a value is valid or not
      * @param valid the validation state
      */
-    protected void setValidationError(ValidationError valid) {
+    public void setValidationError(ValidationError valid) {
         this.valid = valid;
     }
 }

src/main/java/ninja/javafx/smartcsv/fx/table/model/ColumnValueProvider.java

@@ -0,0 +1,11 @@
+package ninja.javafx.smartcsv.fx.table.model;
+
+/**
+ * interface for easier access to values in a column
+ */
+public interface ColumnValueProvider {
+
+    String getValue(int row, String column);
+    int getNumberOfRows();
+
+}

src/main/java/ninja/javafx/smartcsv/fx/util/ColorConstants.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -31,5 +31,5 @@ package ninja.javafx.smartcsv.fx.util;
  */
 public class ColorConstants {
     public static final String OK_COLOR = "#22aa22";
-    public static final String ERROR_COLOR = "#ff6622";
+    public static final String ERROR_COLOR = "#ff3333";
 }

src/main/java/ninja/javafx/smartcsv/fx/util/I18nValidationUtil.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -43,9 +43,8 @@ public class I18nValidationUtil {
     public static String getI18nValidatioMessage(ResourceBundle resourceBundle, List<ValidationError> errors) {
 
         StringWriter message = new StringWriter();
-        for (ValidationError validationError: errors) {
-            message.append(getI18nValidatioMessage(resourceBundle, validationError)).append("\n");
-        }
+        errors.forEach(error -> message.append(getI18nValidatioMessage(resourceBundle, error)).append("\n"));
+
 
         if (message.toString().length() != 0) {
             return cutOffLastLineBreak(message.toString());
@@ -54,22 +53,31 @@ public class I18nValidationUtil {
         return "";
     }
 
+    public static String getI18nValidatioMessageWithColumn(ResourceBundle resourceBundle, ValidationError error) {
+        return getI18nValidatioMessage(resourceBundle, error, resourceBundle.getString("column") + " " + error.getColumn() + " : ");
+    }
+
     public static String getI18nValidatioMessage(ResourceBundle resourceBundle, ValidationError error) {
+        return getI18nValidatioMessage(resourceBundle, error, "");
+    }
+
+    private static String getI18nValidatioMessage(ResourceBundle resourceBundle, ValidationError error, String prefix) {
 
         List<ValidationMessage> validationMessages = error.getMessages();
         StringWriter message = new StringWriter();
-        for (ValidationMessage validationMessage: validationMessages) {
+        validationMessages.forEach(validationMessage -> {
+            message.append(prefix);
             if (resourceBundle.containsKey(validationMessage.getKey())) {
                 String resourceText = resourceBundle.getString(validationMessage.getKey());
                 if (validationMessage.getParameters().length > 0) {
-                    message.append(format(resourceText, validationMessage.getParameters())).append("\n");
+                    message.append(format(resourceText, (Object[]) validationMessage.getParameters())).append("\n");
                 } else {
                     message.append(resourceText).append("\n");
                 }
             } else {
                 message.append(validationMessage.getKey()).append("\n");
             }
-        }
+        });
 
         if (!validationMessages.isEmpty()) {
             return cutOffLastLineBreak(message.toString());

src/main/java/ninja/javafx/smartcsv/fx/util/LoadFileService.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -28,11 +28,8 @@ package ninja.javafx.smartcsv.fx.util;
 
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;
-import ninja.javafx.smartcsv.FileReader;
 import ninja.javafx.smartcsv.files.FileStorage;
 
-import java.io.File;
-
 /**
  * Service class for async load of a csv file
  */

src/main/java/ninja/javafx/smartcsv/fx/util/SaveFileService.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -28,14 +28,8 @@ package ninja.javafx.smartcsv.fx.util;
 
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;
-import ninja.javafx.smartcsv.FileWriter;
-import ninja.javafx.smartcsv.csv.CSVFileWriter;
 import ninja.javafx.smartcsv.files.FileStorage;
 
-import java.io.File;
-
-import static javafx.application.Platform.runLater;
-
 /**
  * Service class for async load of a csv file
  */

src/main/java/ninja/javafx/smartcsv/fx/validation/StringFormatEditorCellFactory.java

@@ -0,0 +1,61 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+
+package ninja.javafx.smartcsv.fx.validation;
+
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+import javafx.util.Callback;
+import ninja.javafx.smartcsv.validation.configuration.StringFormat;
+
+import java.util.ResourceBundle;
+
+/**
+ * cell factory for string formats
+ */
+public class StringFormatEditorCellFactory implements Callback<ListView<StringFormat>, ListCell<StringFormat>> {
+
+    private ResourceBundle resourceBundle;
+
+    public StringFormatEditorCellFactory(ResourceBundle resourceBundle) {
+        this.resourceBundle = resourceBundle;
+    }
+
+    @Override
+    public ListCell<StringFormat> call(ListView<StringFormat> param) {
+        return new ListCell<StringFormat>(){
+            @Override
+            protected void updateItem(StringFormat item, boolean empty) {
+                super.updateItem(item, empty);
+                if (item == null || empty) {
+                    setGraphic(null);
+                } else {
+                    setText(resourceBundle.getString("format.type."+item));
+                }
+            }
+        } ;
+    }
+}

src/main/java/ninja/javafx/smartcsv/fx/validation/StringFormatStringConverter.java

@@ -0,0 +1,54 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+
+package ninja.javafx.smartcsv.fx.validation;
+
+import javafx.util.StringConverter;
+import ninja.javafx.smartcsv.validation.configuration.StringFormat;
+
+import java.util.ResourceBundle;
+
+/**
+ * converter for string formats
+ */
+public class StringFormatStringConverter extends StringConverter<StringFormat> {
+
+    private ResourceBundle resourceBundle;
+
+    public StringFormatStringConverter(ResourceBundle resourceBundle) {
+        this.resourceBundle = resourceBundle;
+    }
+
+    @Override
+    public String toString(StringFormat item) {
+        return resourceBundle.getString("format.type."+item);
+    }
+
+    @Override
+    public StringFormat fromString(String string) {
+        return StringFormat.fromExternalValue(string);
+    }
+}

src/main/java/ninja/javafx/smartcsv/fx/validation/ValidationEditorController.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -30,8 +30,9 @@ import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
+import javafx.scene.control.SpinnerValueFactory.IntegerSpinnerValueFactory;
 import ninja.javafx.smartcsv.fx.FXMLController;
-import ninja.javafx.smartcsv.validation.ValidationConfiguration;
+import ninja.javafx.smartcsv.validation.configuration.*;
 import org.fxmisc.richtext.CodeArea;
 import org.fxmisc.richtext.LineNumberFactory;
 import org.fxmisc.richtext.StyleSpans;
@@ -47,8 +48,11 @@ import java.util.ResourceBundle;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static java.lang.Boolean.FALSE;
 import static java.util.Arrays.asList;
 import static java.util.stream.Collectors.joining;
+import static javafx.beans.binding.Bindings.when;
+import static ninja.javafx.smartcsv.validation.configuration.Type.STRING;
 
 /**
  * controller for editing column validations
@@ -75,7 +79,7 @@ public class ValidationEditorController extends FXMLController {
             "transient", "true", "try", "void", "volatile", "while"
     };
 
-    private static final String KEYWORD_PATTERN = "\\b(" + String.join("|", KEYWORDS) + ")\\b";
+    private static final String KEYWORD_PATTERN = "\\b(" + String.join("|", (CharSequence[]) KEYWORDS) + ")\\b";
     private static final String PAREN_PATTERN = "\\(|\\)";
     private static final String BRACE_PATTERN = "\\{|\\}";
     private static final String BRACKET_PATTERN = "\\[|\\]";
@@ -96,16 +100,13 @@ public class ValidationEditorController extends FXMLController {
     );
 
     @FXML
-    private CheckBox notEmptyRuleCheckBox;
+    private ComboBox<Type> typeComboBox;
 
     @FXML
-    private CheckBox integerRuleCheckBox;
+    private ComboBox<StringFormat> formatComboBox;
 
     @FXML
-    private CheckBox doublerRuleCheckBox;
-
-    @FXML
-    private CheckBox alphanumericRuleCheckBox;
+    private TextField formatTextField;
 
     @FXML
     private Spinner<Integer> minLengthSpinner;
@@ -113,9 +114,6 @@ public class ValidationEditorController extends FXMLController {
     @FXML
     private Spinner<Integer>  maxLengthSpinner;
 
-    @FXML
-    private TextField dateformatRuleTextField;
-
     @FXML
     private TextField regexpRuleTextField;
 
@@ -128,24 +126,12 @@ public class ValidationEditorController extends FXMLController {
     @FXML
     private CheckBox enableNotEmptyRule;
 
-    @FXML
-    private CheckBox enableIntegerRule;
-
-    @FXML
-    private CheckBox enableDoubleRule;
-
-    @FXML
-    private CheckBox enableAlphanumericRule;
-
     @FXML
     private CheckBox enableMinLengthRule;
 
     @FXML
     private CheckBox enableMaxLengthRule;
 
-    @FXML
-    private CheckBox enableDateRule;
-
     @FXML
     private CheckBox enableRegexpRule;
 
@@ -155,6 +141,9 @@ public class ValidationEditorController extends FXMLController {
     @FXML
     private CheckBox enableGroovyRule;
 
+    @FXML
+    private CheckBox enableUniqueRule;
+
 
     @Value("${fxml.smartcvs.validation.editor.view}")
     @Override
@@ -164,24 +153,13 @@ public class ValidationEditorController extends FXMLController {
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-
-        minLengthSpinner.setValueFactory(new SpinnerValueFactory.IntegerSpinnerValueFactory(0, Integer.MAX_VALUE, 0));
-        maxLengthSpinner.setValueFactory(new SpinnerValueFactory.IntegerSpinnerValueFactory(0, Integer.MAX_VALUE, 0));
-
-        initCheckBox(notEmptyRuleCheckBox, enableNotEmptyRule);
-        initCheckBox(integerRuleCheckBox, enableIntegerRule);
-        initCheckBox(doublerRuleCheckBox, enableDoubleRule);
-        initCheckBox(alphanumericRuleCheckBox, enableAlphanumericRule);
+        initTypeAndFormatInput(resources);
+        initMinMaxSpinner();
         initSpinner(minLengthSpinner, enableMinLengthRule);
         initSpinner(maxLengthSpinner, enableMaxLengthRule);
-        initTextInputControl(dateformatRuleTextField, enableDateRule);
         initTextInputControl(regexpRuleTextField, enableRegexpRule);
         initTextInputControl(valueOfRuleTextField, enableValueOfRule);
         initCodeAreaControl(groovyRuleTextArea, enableGroovyRule);
-
-        selectedColumn.addListener(observable -> {
-            updateForm();
-        });
     }
 
     public String getSelectedColumn() {
@@ -200,138 +178,235 @@ public class ValidationEditorController extends FXMLController {
         this.validationConfiguration = validationConfiguration;
     }
 
+    private void initTypeAndFormatInput(ResourceBundle resources) {
+        typeComboBox.getItems().addAll(STRING,
+                Type.INTEGER,
+                Type.NUMBER,
+                Type.DATE,
+                Type.DATETIME,
+                Type.TIME);
+        formatComboBox.setCellFactory(new StringFormatEditorCellFactory(resources));
+        formatComboBox.setConverter(new StringFormatStringConverter(resources));
+        formatComboBox.getItems().addAll(
+                StringFormat.DEFAULT,
+                StringFormat.EMAIL,
+                StringFormat.URI,
+                StringFormat.BINARY,
+                StringFormat.UUID
+        );
+        typeComboBox.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> changeFormat());
+    }
+
+    private void updateFormatTextField() {
+        switch (typeComboBox.getValue()) {
+            case DATE:
+            case DATETIME:
+            case TIME:
+                    formatTextField.setVisible(true);
+                    formatTextField.setText(getCurrentFieldConfig().getFormat());
+                break;
+            default:
+                formatTextField.setVisible(false);
+                formatTextField.setText(null);
+                break;
+        }
+    }
+
+    private void updateFormatComboBox() {
+        switch (typeComboBox.getValue()) {
+            case STRING:
+                formatComboBox.setVisible(true);
+                formatComboBox.getSelectionModel().select(StringFormat.fromExternalValue(getCurrentFieldConfig().getFormat()));
+                break;
+            default:
+                formatComboBox.setVisible(false);
+                break;
+        }
+    }
+
+    private void initMinMaxSpinner() {
+        IntegerSpinnerValueFactory minValueFactory = new IntegerSpinnerValueFactory(0, Integer.MAX_VALUE, 0);
+        minLengthSpinner.setValueFactory(minValueFactory);
+        IntegerSpinnerValueFactory maxValueFactory = new IntegerSpinnerValueFactory(0, Integer.MAX_VALUE, 0);
+        maxLengthSpinner.setValueFactory(maxValueFactory);
+
+        minValueFactory.maxProperty().bind(
+                when(enableMaxLengthRule.selectedProperty()).
+                        then(maxLengthSpinner.valueProperty()).
+                        otherwise(Integer.MAX_VALUE));
+        maxValueFactory.minProperty().bind(
+                when(enableMinLengthRule.selectedProperty()).
+                        then(minLengthSpinner.valueProperty()).
+                        otherwise(0));
+
+    }
+
+
+    private void changeFormat() {
+        switch (typeComboBox.getValue()) {
+            case STRING:
+                updateFormatComboBox();
+                break;
+            case DATE:
+            case DATETIME:
+            case TIME:
+                updateFormatTextField();
+                break;
+            case INTEGER:
+            case NUMBER:
+            default:
+                // format: no options
+                formatComboBox.setVisible(false);
+                formatTextField.setVisible(false);
+                break;
+        }
+    }
+
     public void updateConfiguration() {
 
-        if (enableIntegerRule.isSelected()) {
-            validationConfiguration.setIntegerRuleFor(selectedColumn.getValue(), integerRuleCheckBox.isSelected());
-        } else {
-            validationConfiguration.setIntegerRuleFor(selectedColumn.getValue(), null);
-        }
+        Field config = getCurrentFieldConfig();
+        config.setType(typeComboBox.getValue());
 
-        if (enableNotEmptyRule.isSelected()) {
-            validationConfiguration.setNotEmptyRuleFor(selectedColumn.getValue(), notEmptyRuleCheckBox.isSelected());
+        switch (typeComboBox.getValue()) {
+            case STRING:
+                config.setFormat(formatComboBox.getValue().getExternalValue());
+                break;
+            case DATE:
+            case DATETIME:
+            case TIME:
+                if (formatTextField.getText().trim().isEmpty()) {
+                    config.setFormat(null);
                 } else {
-            validationConfiguration.setNotEmptyRuleFor(selectedColumn.getValue(), null);
+                    // TODO: validate input
+                    config.setFormat(formatTextField.getText());
                 }
-
-        if (enableDoubleRule.isSelected()) {
-            validationConfiguration.setDoubleRuleFor(selectedColumn.getValue(), doublerRuleCheckBox.isSelected());
-        } else {
-            validationConfiguration.setDoubleRuleFor(selectedColumn.getValue(), null);
-        }
-
-        if (enableAlphanumericRule.isSelected()) {
-            validationConfiguration.setAlphanumericRuleFor(selectedColumn.getValue(), alphanumericRuleCheckBox.isSelected());
-        } else {
-            validationConfiguration.setAlphanumericRuleFor(selectedColumn.getValue(), null);
-        }
-
-        if (enableDateRule.isSelected()) {
-            validationConfiguration.setDateRuleFor(selectedColumn.getValue(), dateformatRuleTextField.getText());
-        } else {
-            validationConfiguration.setDateRuleFor(selectedColumn.getValue(), null);
+                break;
+            case INTEGER:
+            case NUMBER:
+            default:
+                // format: no options
+                config.setFormat(null);
+                break;
         }
 
         if (enableGroovyRule.isSelected()) {
-            validationConfiguration.setGroovyRuleFor(selectedColumn.getValue(), groovyRuleTextArea.getText());
+            config.setGroovy(groovyRuleTextArea.getText());
         } else {
-            validationConfiguration.setGroovyRuleFor(selectedColumn.getValue(), null);
+            config.setGroovy(null);
+        }
+
+        Constraints constraints = config.getConstraints();
+        if (constraints == null) {
+            constraints = new Constraints();
+        }
+
+        if (enableNotEmptyRule.isSelected()) {
+            constraints.setRequired(enableNotEmptyRule.isSelected());
+        } else {
+            constraints.setRequired(null);
+        }
+
+        if (enableUniqueRule.isSelected()) {
+            constraints.setUnique(enableUniqueRule.isSelected());
+        } else {
+            constraints.setUnique(null);
         }
 
         if (enableMinLengthRule.isSelected()) {
-            validationConfiguration.setMinLengthRuleFor(selectedColumn.getValue(), minLengthSpinner.getValue());
+            constraints.setMinLength(minLengthSpinner.getValue());
         } else {
-            validationConfiguration.setMinLengthRuleFor(selectedColumn.getValue(), null);
+            constraints.setMinLength(null);
         }
 
         if (enableMaxLengthRule.isSelected()) {
-            validationConfiguration.setMaxLengthRuleFor(selectedColumn.getValue(), maxLengthSpinner.getValue());
+            constraints.setMaxLength(maxLengthSpinner.getValue());
         } else {
-            validationConfiguration.setMaxLengthRuleFor(selectedColumn.getValue(), null);
+            constraints.setMaxLength(null);
         }
 
         if (enableRegexpRule.isSelected()) {
-            validationConfiguration.setRegexpRuleFor(selectedColumn.getValue(), regexpRuleTextField.getText());
+            constraints.setPattern(regexpRuleTextField.getText());
         } else {
-            validationConfiguration.setRegexpRuleFor(selectedColumn.getValue(), null);
+            constraints.setPattern(null);
         }
 
         if (enableValueOfRule.isSelected()) {
-            validationConfiguration.setValueOfRuleFor(selectedColumn.getValue(), asList(valueOfRuleTextField.getText().split(", ")));
+            constraints.setEnumeration(asList(valueOfRuleTextField.getText().split(", ")));
         } else {
-            validationConfiguration.setValueOfRuleFor(selectedColumn.getValue(), null);
-        }
+            constraints.setEnumeration(null);
         }
 
-    private void updateForm() {
+    }
 
-        updateCheckBox(
-                notEmptyRuleCheckBox,
-                validationConfiguration.getNotEmptyRuleFor(getSelectedColumn()),
-                enableNotEmptyRule
+    private Field getCurrentFieldConfig() {
+        return validationConfiguration.getFieldConfiguration(getSelectedColumn());
+    }
+
+    private void addDependencyListener(CheckBox rule, CheckBox... dependentRules) {
+        rule.selectedProperty().addListener((observable, oldValue, newValue) -> {
+            if (newValue) {
+                for (CheckBox dependentRule: dependentRules) {
+                    dependentRule.selectedProperty().setValue(false);
+                }
+            }
+        });
+    }
+
+    public void updateForm() {
+
+        Field config = getCurrentFieldConfig();
+
+        if (config.getType() != null) {
+            typeComboBox.setValue(config.getType());
+        } else {
+            typeComboBox.setValue(STRING);
+        }
+
+        updateFormatComboBox();
+        updateFormatTextField();
+
+        updateCodeAreaControl(
+                groovyRuleTextArea,
+                config.getGroovy(),
+                enableGroovyRule
         );
 
-        updateCheckBox(
-                integerRuleCheckBox,
-                validationConfiguration.getIntegerRuleFor(getSelectedColumn()),
-                enableIntegerRule
-        );
-
-        updateCheckBox(
-                doublerRuleCheckBox,
-                validationConfiguration.getDoubleRuleFor(getSelectedColumn()),
-                enableDoubleRule
-        );
-
-        updateCheckBox(
-                alphanumericRuleCheckBox,
-                validationConfiguration.getAlphanumericRuleFor(getSelectedColumn()),
-                enableAlphanumericRule
-        );
+        Constraints constraints = config.getConstraints();
+        updateCheckBox(constraints != null ? constraints.getRequired() : FALSE, enableNotEmptyRule);
+        updateCheckBox(constraints != null ? constraints.getUnique() : FALSE, enableUniqueRule);
 
         updateSpinner(
                 minLengthSpinner,
-                validationConfiguration.getMinLengthRuleFor(getSelectedColumn()),
+                constraints != null ? constraints.getMinLength() : null,
                 enableMinLengthRule
         );
 
         updateSpinner(
                 maxLengthSpinner,
-                validationConfiguration.getMaxLengthRuleFor(getSelectedColumn()),
+                constraints != null ? constraints.getMaxLength() : null,
                 enableMaxLengthRule
         );
 
-        updateTextInputControl(
-                dateformatRuleTextField,
-                validationConfiguration.getDateRuleFor(getSelectedColumn()),
-                enableDateRule
-        );
-
         updateTextInputControl(
                 regexpRuleTextField,
-                validationConfiguration.getRegexpRuleFor(getSelectedColumn()),
+                constraints != null ? constraints.getPattern() : null,
                 enableRegexpRule
         );
 
         updateTextInputControl(
                 valueOfRuleTextField,
-                validationConfiguration.getValueOfRuleFor(getSelectedColumn()),
+                constraints != null ? constraints.getEnumeration() : null,
                 enableValueOfRule
         );
 
-        updateCodeAreaControl(
-                groovyRuleTextArea,
-                validationConfiguration.getGroovyRuleFor(getSelectedColumn()),
-                enableGroovyRule
-        );
+
     }
 
-    private void updateCheckBox(CheckBox rule, Boolean value, CheckBox ruleEnabled) {
+    private void updateCheckBox(Boolean value, CheckBox ruleEnabled) {
         if (value == null) {
             ruleEnabled.setSelected(false);
         } else {
-            rule.setSelected(value);
-            ruleEnabled.setSelected(true);
+            ruleEnabled.setSelected(value);
         }
     }
 
@@ -371,15 +446,6 @@ public class ValidationEditorController extends FXMLController {
         }
     }
 
-    private void initCheckBox(CheckBox rule, CheckBox ruleEnabled) {
-        rule.disableProperty().bind(ruleEnabled.selectedProperty().not());
-        ruleEnabled.selectedProperty().addListener((observable, oldValue, newValue) -> {
-            if (!newValue) {
-                rule.setSelected(false);
-            }
-        });
-    }
-
     private void initSpinner(Spinner rule, CheckBox ruleEnabled) {
         rule.disableProperty().bind(ruleEnabled.selectedProperty().not());
         ruleEnabled.selectedProperty().addListener((observable, oldValue, newValue) -> {

src/main/java/ninja/javafx/smartcsv/preferences/PreferencesFileReader.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,6 @@ package ninja.javafx.smartcsv.preferences;
 
 import com.google.gson.GsonBuilder;
 import ninja.javafx.smartcsv.FileReader;
-import org.springframework.stereotype.Service;
 import org.supercsv.prefs.CsvPreference;
 import org.supercsv.quote.AlwaysQuoteMode;
 

src/main/java/ninja/javafx/smartcsv/preferences/PreferencesFileWriter.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,6 @@ package ninja.javafx.smartcsv.preferences;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import ninja.javafx.smartcsv.FileWriter;
-import org.springframework.stereotype.Service;
 import org.supercsv.prefs.CsvPreference;
 
 import java.io.File;

src/main/java/ninja/javafx/smartcsv/preferences/QuoteModeHelper.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal

src/main/java/ninja/javafx/smartcsv/validation/RevalidationService.java

@@ -0,0 +1,110 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+package ninja.javafx.smartcsv.validation;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.concurrent.Service;
+import javafx.concurrent.Task;
+import ninja.javafx.smartcsv.fx.table.model.CSVRow;
+import ninja.javafx.smartcsv.fx.table.model.CSVValue;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Service for running the validation async of the ui thread
+ */
+public class RevalidationService extends Service<List<ValidationError>> {
+
+    private static final Logger logger = LogManager.getLogger(RevalidationService.class);
+
+    private Validator validator;
+    private List<CSVRow> rows;
+    private String[] header;
+
+    public void setValidator(Validator validator) {
+        this.validator = validator;
+    }
+
+    public void setRows(List<CSVRow> rows) {
+        this.rows = rows;
+    }
+
+    public void setHeader(String[] header) {
+        this.header = header;
+    }
+
+    @Override
+    protected Task<List<ValidationError>> createTask() {
+        return new Task<List<ValidationError>>() {
+            @Override
+            protected List<ValidationError> call() throws Exception {
+                List<ValidationError> errors = new ArrayList<>();
+                try {
+                    if (header != null) {
+                        ValidationError headerError = validator.isHeaderValid(header);
+                        if (headerError != null) {
+                            logger.info("revalidate: header error found");
+                            errors.add(headerError);
+                        }
+                    }
+
+                    int maxRows = rows.size();
+                    for (int lineNumber = 0; lineNumber < maxRows; lineNumber++) {
+                        CSVRow row = rows.get(lineNumber);
+
+                        Map<String, ObjectProperty<CSVValue>> table = row.getColumns();
+                        Set<String> columns = table.keySet();
+
+                        for (String column : columns) {
+                            CSVValue value = table.get(column).getValue();
+                            if (validator != null) {
+                                ValidationError validationError = validator.isValid(lineNumber, column, value.getValue());
+                                if (validationError != null) {
+                                    logger.info("revalidate: {} errors found in line {}", validationError.getMessages().size(), lineNumber);
+                                    errors.add(validationError);
+                                    value.setValidationError(validationError);
+                                } else {
+                                    value.setValidationError(null);
+                                }
+                            } else {
+                                value.setValidationError(null);
+                            }
+                        }
+                    }
+
+                } catch (Throwable t) {
+                    logger.error("validation error", t);
+                }
+                return errors;
+            }
+        };
+    }
+}

src/main/java/ninja/javafx/smartcsv/validation/ValidationConfiguration.java

@@ -1,175 +0,0 @@
-/*
-   The MIT License (MIT)
-   -----------------------------------------------------------------------------
-
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
-                                                                                                                    
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-  
-*/
-
-package ninja.javafx.smartcsv.validation;
-
-import com.google.gson.annotations.SerializedName;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * validation configuration
- */
-public class ValidationConfiguration {
-
-    @SerializedName("headers")
-    private HeaderConfiguration headerConfiguration = new HeaderConfiguration();
-
-    @SerializedName("columns")
-    private Map<String, Map<String, Object>> columnConfigurations = new HashMap<>();
-
-    public String[] headerNames() {
-        if (noHeader()) return null;
-        return headerConfiguration.getNames();
-    }
-
-    public void setHeaderNames(String[] headerNames) {
-        headerConfiguration.setNames(headerNames);
-    }
-
-    public Boolean getUniquenessRuleFor(String column) {
-        return (Boolean)getValue(column, "unique");
-    }
-
-    public Boolean getIntegerRuleFor(String column) {
-        return (Boolean)getValue(column, "integer");
-    }
-
-    public Boolean getDoubleRuleFor(String column) {
-        return (Boolean)getValue(column, "double");
-    }
-
-    public Boolean getNotEmptyRuleFor(String column) {
-        return (Boolean)getValue(column, "not empty");
-    }
-
-    public Integer getMinLengthRuleFor(String column) {
-        return doubleToInteger((Double)getValue(column, "minlength"));
-    }
-
-    public Integer getMaxLengthRuleFor(String column) {
-        if (noRulesFor(column)) return null;
-        return doubleToInteger((Double)getValue(column, "maxlength"));
-    }
-
-    public String getDateRuleFor(String column) {
-        if (noRulesFor(column)) return null;
-        return (String)getValue(column, "date");
-    }
-
-    public Boolean getAlphanumericRuleFor(String column) {
-        if (noRulesFor(column)) return null;
-        return (Boolean)getValue(column, "alphanumeric");
-    }
-
-    public String getRegexpRuleFor(String column) {
-        if (noRulesFor(column)) return null;
-        return (String)getValue(column, "regexp");
-    }
-
-    public List<String> getValueOfRuleFor(String column) {
-        if (noRulesFor(column)) return null;
-        return (List<String>)getValue(column, "value of");
-    }
-
-    public String getGroovyRuleFor(String column) {
-        if (noRulesFor(column)) return null;
-        return (String)getValue(column, "groovy");
-    }
-
-    public void setIntegerRuleFor(String column, Boolean value) {
-        setValue(column, value, "integer");
-    }
-
-    public void setDoubleRuleFor(String column, Boolean value) {
-        setValue(column, value, "double");
-    }
-
-    public void setNotEmptyRuleFor(String column, Boolean value) {
-        setValue(column, value, "not empty");
-    }
-
-    public void setMinLengthRuleFor(String column, Integer value) {
-        setValue(column, value == null ? null : value.doubleValue(), "minlength");
-    }
-
-    public void setMaxLengthRuleFor(String column, Integer value) {
-        setValue(column, value == null ? null : value.doubleValue(), "maxlength");
-    }
-
-    public void setDateRuleFor(String column, String value) {
-        setValue(column, value, "date");
-    }
-
-    public void setAlphanumericRuleFor(String column, Boolean value) {
-        setValue(column, value, "alphanumeric");
-    }
-
-    public void setRegexpRuleFor(String column, String value) {
-        setValue(column, value, "regexp");
-    }
-
-    public void setValueOfRuleFor(String column, List<String> value) {
-        setValue(column, value, "value of");
-    }
-
-    public void setGroovyRuleFor(String column, String value) {
-        setValue(column, value, "groovy");
-    }
-
-    private void setValue(String column, Object value, String key) {
-        if (!columnConfigurations.containsKey(column)) {
-            columnConfigurations.put(column, new HashMap<>());
-        }
-
-        if (value == null && columnConfigurations.get(column).containsKey(key)) {
-            columnConfigurations.get(column).remove(key);
-        } else {
-            columnConfigurations.get(column).put(key, value);
-        }
-    }
-
-    private Object getValue(String column, String key) {
-        if (noRulesFor(column)) return null;
-        return columnConfigurations.get(column).get(key);
-    }
-
-    private boolean noHeader() {
-        return headerConfiguration == null;
-    }
-
-    private boolean noRulesFor(String column) {
-        return columnConfigurations == null || columnConfigurations.get(column) == null;
-    }
-
-    private Integer doubleToInteger(Double value) {
-        if (value == null) return null;
-        return (int)Math.round(value);
-    }
-
-}

src/main/java/ninja/javafx/smartcsv/validation/ValidationError.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -38,6 +38,7 @@ public class ValidationError {
 
     private List<ValidationMessage> messages = new ArrayList<>();
     private Integer lineNumber;
+    private String column = "";
 
     private ValidationError(Integer lineNumber) {
         this.lineNumber = lineNumber;
@@ -51,10 +52,19 @@ public class ValidationError {
         return new ValidationError(-1);
     }
 
+    public ValidationError column(String column) {
+        this.column = column;
+        return this;
+    }
+
     public Integer getLineNumber() {
         return lineNumber;
     }
 
+    public String getColumn() {
+        return column;
+    }
+
     public List<ValidationMessage> getMessages() {
         return messages;
     }

src/main/java/ninja/javafx/smartcsv/validation/ValidationFileReader.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -28,11 +28,14 @@ package ninja.javafx.smartcsv.validation;
 
 import com.google.gson.GsonBuilder;
 import ninja.javafx.smartcsv.FileReader;
-import org.springframework.stereotype.Service;
+import ninja.javafx.smartcsv.validation.configuration.Field;
+import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
 
 import java.io.File;
 import java.io.IOException;
 
+import static ninja.javafx.smartcsv.validation.configuration.Type.*;
+
 /**
  * This class loads the constraints as json config
  */
@@ -43,6 +46,30 @@ public class ValidationFileReader implements FileReader<ValidationConfiguration>
     @Override
     public void read(File file) throws IOException {
         config = new GsonBuilder().create().fromJson(new java.io.FileReader(file), ValidationConfiguration.class);
+        setDefaults();
+    }
+
+    private void setDefaults() {
+        for (Field field : config.getFields()) {
+            if (field.getType() == null) {
+                field.setType(STRING);
+            }
+            if (field.getType() == DATE) {
+                if (field.getFormat() == null) {
+                    field.setFormat("yyyy-MM-dd");
+                }
+            }
+            if (field.getType() == DATETIME) {
+                if (field.getFormat() == null) {
+                    field.setFormat("yyyy-MM-ddThh:mm:ssZ");
+                }
+            }
+            if (field.getType() == TIME) {
+                if (field.getFormat() == null) {
+                    field.setFormat("hh:mm:ss");
+                }
+            }
+        }
     }
 
     public ValidationConfiguration getContent() {

src/main/java/ninja/javafx/smartcsv/validation/ValidationFileWriter.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@ package ninja.javafx.smartcsv.validation;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import ninja.javafx.smartcsv.FileWriter;
-import org.springframework.stereotype.Service;
+import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/ninja/javafx/smartcsv/validation/ValidationFormatHelper.java

@@ -0,0 +1,43 @@
+package ninja.javafx.smartcsv.validation;
+
+/**
+ * @author abi
+ */
+public class ValidationFormatHelper {
+
+
+    public static String dateFormat(String format, String defaultFormat) {
+
+        if (format != null && !format.trim().isEmpty()) {
+            format = format.trim();
+            if (format.startsWith("fmt:")) {
+                format = format.substring(4);
+                format = format.replace("%Y", "yyyy");
+                format = format.replace("%y", "yy");
+                format = format.replace("%m", "MM");
+                format = format.replace("%d", "dd");
+                format = format.replace("%a", "E");
+                format = format.replace("%A", "EEEE");
+                format = format.replace("%w", "F");
+                format = format.replace("%b", "MMM");
+                format = format.replace("%B", "MMMMM");
+                format = format.replace("%H", "HH");
+                format = format.replace("%I", "hh");
+                format = format.replace("%p", "a");
+                format = format.replace("%M", "mm");
+                format = format.replace("%S", "ss");
+                format = format.replace("%z", "Z");
+                format = format.replace("%Z", "z");
+                format = format.replace("%j", "DDD");
+                format = format.replace("%U", "ww");
+                return format;
+            }
+        }
+        return defaultFormat;
+    }
+
+    public static Integer doubleToInteger(Double value) {
+        if (value == null) return null;
+        return (int)Math.round(value);
+    }
+}

src/main/java/ninja/javafx/smartcsv/validation/ValidationMessage.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal

src/main/java/ninja/javafx/smartcsv/validation/Validator.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -26,18 +26,19 @@
 
 package ninja.javafx.smartcsv.validation;
 
-import groovy.lang.Binding;
-import groovy.lang.GroovyShell;
-import groovy.lang.Script;
-import org.codehaus.groovy.control.CompilationFailedException;
+import ninja.javafx.smartcsv.fx.table.model.ColumnValueProvider;
+import ninja.javafx.smartcsv.validation.checker.*;
+import ninja.javafx.smartcsv.validation.configuration.Constraints;
+import ninja.javafx.smartcsv.validation.configuration.Field;
+import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
 
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
-import static java.util.stream.Collectors.joining;
-import static org.apache.commons.validator.GenericValidator.*;
+import static ninja.javafx.smartcsv.validation.ValidationFormatHelper.dateFormat;
+import static ninja.javafx.smartcsv.validation.configuration.StringFormat.*;
+import static ninja.javafx.smartcsv.validation.configuration.Type.*;
 
 /**
  * This class checks all the validations defined in the
@@ -50,9 +51,8 @@ public class Validator {
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
     private ValidationConfiguration validationConfig;
-    private GroovyShell shell = new GroovyShell();
-    private Map<String, Script> scriptCache = new HashMap<>();
-    private Map<String, HashMap<String, Integer>> uniquenessLookupTable = new HashMap<>();
+    private ColumnValueProvider columnValueProvider;
+    private Map<String, Map<Validation.Type, Validation>> columnValidationMap = new HashMap<>();
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // constructors
@@ -60,10 +60,13 @@ public class Validator {
 
     /**
      * JSON configuration for this validator
+     *
      * @param validationConfig
      */
-    public Validator(ValidationConfiguration validationConfig) {
+    public Validator(ValidationConfiguration validationConfig, ColumnValueProvider columnValueProvider) {
         this.validationConfig = validationConfig;
+        this.columnValueProvider = columnValueProvider;
+        initColumnValidations();
     }
 
 
@@ -71,31 +74,35 @@ public class Validator {
     // public methods
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+    public boolean needsColumnValidation(String column) {
+        Map<Validation.Type, Validation> validationMap = columnValidationMap.get(column);
+        if (validationMap != null) {
+            return validationMap.containsKey(Validation.Type.UNIQUE);
+        }
+        return false;
+
+    }
+
+
     /**
      * checks if the value is valid for the column configuration
+     *
      * @param column the column name
      * @param value  the value to check
      * @return ValidationError with information if valid and if not which getMessage happened
      */
-    public ValidationError isValid(String column, String value, Integer lineNumber) {
+    public ValidationError isValid(Integer row, String column, String value) {
         ValidationError result = null;
         if (hasConfig()) {
-
-            ValidationError error = ValidationError.withLineNumber(lineNumber);
-            checkBlankOrNull(column, value, error);
-            if (value != null && !value.isEmpty()) {
-                checkRegularExpression(column, value, error);
-                checkAlphaNumeric(column, value, error);
-                checkDate(column, value, error);
-                checkMaxLength(column, value, error);
-                checkMinLength(column, value, error);
-                checkInteger(column, value, error);
-                checkGroovy(column, value, error);
-                checkValueOf(column, value, error);
-                checkDouble(column, value, error);
-                checkUniqueness(column, value, lineNumber, error);
+            ValidationError error = ValidationError.withLineNumber(row).column(column);
+            Map<Validation.Type, Validation> validationMap = columnValidationMap.get(column);
+            if (validationMap != null) {
+                for (Validation validation: validationMap.values()) {
+                    if (validation.canBeChecked(value)) {
+                        validation.check(row, value, error);
+                    }
+                }
             }
-
             if (!error.isEmpty()) {
                 result = error;
             }
@@ -103,151 +110,147 @@ public class Validator {
         return result;
     }
 
+
     public boolean hasConfig() {
         return validationConfig != null;
     }
 
+    public void reinitializeColumn(String column) {
+        clear(column);
+        initializeColumnWithRules(column);
+    }
+
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // private methods
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-    private void checkUniqueness(String column, String value, Integer lineNumber, ValidationError error) {
-        if (validationConfig.getUniquenessRuleFor(column) != null && validationConfig.getUniquenessRuleFor(column)) {
-            HashMap<String, Integer> columnValueMap = uniquenessLookupTable.get(column);
-            columnValueMap = getColumnValueMap(column, columnValueMap);
-            Integer valueInLineNumber = columnValueMap.get(value);
-            if (valueInLineNumber != null) {
-                if (!valueInLineNumber.equals(lineNumber)) {
-                    error.add("validation.message.uniqueness", value, valueInLineNumber.toString());
+    private void add(String column, Validation validation) {
+        Map<Validation.Type, Validation> validationMap = columnValidationMap.get(column);
+        if (validationMap == null) {
+            validationMap = new HashMap<>();
+            columnValidationMap.put(column, validationMap);
         }
-            } else {
-                columnValueMap.put(value, lineNumber);
+        validationMap.put(validation.getType(), validation);
+    }
+
+    private void clear(String column) {
+        Map<Validation.Type, Validation> validationMap = columnValidationMap.get(column);
+        if (validationMap != null) {
+            validationMap.clear();
+        }
+    }
+
+    private void initColumnValidations() {
+        if (hasConfig()) {
+            for (Field column : validationConfig.getFields()) {
+                initializeColumnWithRules(column);
             }
         }
     }
 
-    private HashMap<String, Integer> getColumnValueMap(String column, HashMap<String, Integer> valueLineNumber) {
-        if (valueLineNumber == null) {
-            valueLineNumber = new HashMap<>();
-            uniquenessLookupTable.put(column, valueLineNumber);
-        }
-        return valueLineNumber;
-    }
-
-    private void checkGroovy(String column, String value, ValidationError error) {
-        String groovyScript = validationConfig.getGroovyRuleFor(column);
-        if (groovyScript != null) {
-
-            Script script = scriptCache.get(column);
-            if (script == null) {
-                script = shell.parse(groovyScript);
-                scriptCache.put(column, script);
-            }
-
-            Binding binding = new Binding();
-            binding.setVariable("value", value);
-            script.setBinding(binding);
-
-            Object groovyResult = null;
-            try {
-                groovyResult = script.run();
-            } catch (CompilationFailedException e) {
-                error.add("validation.message.groovy.exception", groovyScript, e.getMessage());
-                e.printStackTrace();
-            }
-            if (groovyResult == null) {
-                error.add("validation.message.groovy.return.null", groovyScript);
-            }
-
-            if (!isScriptResultTrue(groovyResult)) {
-                error.add(groovyResult.toString());
-            }
-
-        }
-    }
-
-    private boolean isScriptResultTrue(Object groovyResult) {
-        return groovyResult.equals(true) || groovyResult.toString().trim().toLowerCase().equals("true");
-    }
-
-    private void checkValueOf(String column, String value, ValidationError error) {
-        List<String> values = validationConfig.getValueOfRuleFor(column);
-        if (values != null) {
-            if (!values.contains(value)) {
-                String commaSeparated = values.stream().collect(joining(", "));
-                error.add("validation.message.value.of", value, commaSeparated);
+    private void initializeColumnWithRules(String columnName) {
+        if (hasConfig()) {
+            for (Field column : validationConfig.getFields()) {
+                if (column.getName().equals(columnName)) {
+                    initializeColumnWithRules(column);
+                    break;
                 }
             }
         }
 
-    private void checkBlankOrNull(String column, String value, ValidationError error) {
-        if (validationConfig.getNotEmptyRuleFor(column) != null && validationConfig.getNotEmptyRuleFor(column)) {
-            if (isBlankOrNull(value)) {
-                error.add("validation.message.not.empty");
     }
+
+    private void initializeColumnWithRules(Field column) {
+
+        if (column.getType() != null) {
+            if (column.getType() == NUMBER) {
+                add(column.getName(), new DoubleValidation());
+            }
+
+            if (column.getType() == INTEGER) {
+                add(column.getName(), new IntegerValidation());
+            }
+
+            if (column.getType() == DATE) {
+                String format = dateFormat(column.getFormat(), "YYYY-MM-DD");
+                add(column.getName(), new DateValidation(format));
+            }
+
+            if (column.getType() == DATETIME) {
+                String format = dateFormat(column.getFormat(), "YYYY-MM-DDThh:mm:ssZ");
+                add(column.getName(), new DateValidation(format));
+            }
+
+            if (column.getType() == TIME) {
+                String format = dateFormat(column.getFormat(), "hh:mm:ss");
+                add(column.getName(), new DateValidation(format));
+            }
+
+            if (column.getType() == STRING && column.getFormat().equalsIgnoreCase(EMAIL.getExternalValue())) {
+                add(column.getName(), new EmailValidation());
+            }
+
+            if (column.getType() == STRING && column.getFormat().equalsIgnoreCase(URI.getExternalValue())) {
+                add(column.getName(), new UriValidation());
+            }
+
+            if (column.getType() == STRING && column.getFormat().equalsIgnoreCase(UUID.getExternalValue())) {
+                add(column.getName(), new UuidValidation());
+            }
+
+            if (column.getType() == STRING && column.getFormat().equalsIgnoreCase(BINARY.getExternalValue())) {
+                add(column.getName(), new BinaryValidation());
+            }
+
+            if (column.getType() == STRING && column.getFormat() == null) {
+                columnValidationMap.get(column).remove(Validation.Type.STRING);
             }
         }
 
-    private void checkInteger(String column, String value, ValidationError error) {
-        if (validationConfig.getIntegerRuleFor(column) != null && validationConfig.getIntegerRuleFor(column)) {
-            if (!isInt(value)) {
-                error.add("validation.message.integer");
-            }
-        }
+        String groovy = column.getGroovy();
+        if (groovy != null && !groovy.trim().isEmpty()) {
+            add(column.getName(), new GroovyValidation(groovy));
         }
 
-    private void checkDouble(String column, String value, ValidationError error) {
-        if (validationConfig.getDoubleRuleFor(column) != null && validationConfig.getDoubleRuleFor(column)) {
-            if (!isDouble(value)) {
-                error.add("validation.message.double");
-            }
-        }
+        Constraints constraints = column.getConstraints();
+        if (constraints != null) {
+            Boolean notEmptyRule = constraints.getRequired();
+            if (notEmptyRule != null && notEmptyRule) {
+                add(column.getName(), new NotEmptyValidation());
             }
 
-    private void checkMinLength(String column, String value, ValidationError error) {
-        Integer minLength = validationConfig.getMinLengthRuleFor(column);
+            Boolean uniqueRule = constraints.getUnique();
+            if (uniqueRule != null && uniqueRule) {
+                add(column.getName(), new UniqueValidation(columnValueProvider, column.getName()));
+            }
+
+            Integer minLength = constraints.getMinLength();
             if (minLength != null) {
-            if (!minLength(value, minLength)) {
-                error.add("validation.message.min.length", minLength.toString());
-            }
-        }
+                add(column.getName(), new MinLengthValidation(minLength));
             }
 
-    private void checkMaxLength(String column, String value, ValidationError error) {
-        Integer maxLength = validationConfig.getMaxLengthRuleFor(column);
+            Integer maxLength = constraints.getMaxLength();
             if (maxLength != null) {
-            if (!maxLength(value, maxLength)) {
-                error.add("validation.message.max.length", maxLength.toString());
-            }
-        }
+                add(column.getName(), new MaxLengthValidation(maxLength));
             }
 
-    private void checkDate(String column, String value, ValidationError error) {
-        String dateformat = validationConfig.getDateRuleFor(column);
-        if (dateformat != null && !dateformat.trim().isEmpty()) {
-            if (!isDate(value, dateformat, true)) {
-                error.add("validation.message.date.format", dateformat);
-            }
-        }
-    }
-
-    private void checkAlphaNumeric(String column, String value, ValidationError error) {
-        if (validationConfig.getAlphanumericRuleFor(column) != null && validationConfig.getAlphanumericRuleFor(column)) {
-            if (!matchRegexp(value, "[0-9a-zA-Z]*")) {
-                error.add("validation.message.alphanumeric");
-            }
-        }
-    }
-
-    private void checkRegularExpression(String column, String value, ValidationError error) {
-        String regexp = validationConfig.getRegexpRuleFor(column);
+            String regexp = constraints.getPattern();
             if (regexp != null && !regexp.trim().isEmpty()) {
-            if (!matchRegexp(value, regexp)) {
-                error.add("validation.message.regexp", regexp);
+                add(column.getName(), new RegExpValidation(regexp));
+            }
+
+
+
+            List<String> valueOfRule =  constraints.getEnumeration();
+            if (valueOfRule != null && !valueOfRule.isEmpty()) {
+                add(column.getName(), new ValueOfValidation(valueOfRule));
             }
         }
     }
 
+
+
+
     public ValidationError isHeaderValid(String[] headerNames) {
         ValidationError result = null;
         if (validationConfig != null) {
@@ -262,7 +265,7 @@ public class Validator {
 
                 ValidationError error = ValidationError.withoutLineNumber();
 
-                for(int i=0; i<headerNamesConfig.length; i++) {
+                for (int i = 0; i < headerNamesConfig.length; i++) {
                     if (!headerNamesConfig[i].equals(headerNames[i])) {
                         error.add("validation.message.header.match",
                                 Integer.toString(i),
@@ -278,7 +281,5 @@ public class Validator {
         return result;
     }
 
-    public void clearScriptCache() {
-        scriptCache.clear();
-    }
+
 }

src/main/java/ninja/javafx/smartcsv/validation/checker/BinaryValidation.java

@@ -0,0 +1,50 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
+
+import java.util.Base64;
+
+/**
+ * checks if the value is a base64 encoded string representing binary data
+ */
+public class BinaryValidation extends EmptyValueIsValid {
+
+    @Override
+    public void check(int row, String value, ValidationError error) {
+        try {
+            Base64.getDecoder().decode(value);
+        } catch (IllegalArgumentException e) {
+            error.add("validation.message.binary");
+        }
+    }
+
+    @Override
+    public Type getType() {
+        return Type.STRING;
+    }
+}

src/main/java/ninja/javafx/smartcsv/validation/checker/DateValidation.java

@@ -0,0 +1,55 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
+
+import static org.apache.commons.validator.GenericValidator.isDate;
+
+/**
+ * Checks if the date has the right format
+ */
+public class DateValidation extends EmptyValueIsValid {
+
+    private String dateformat;
+
+    public DateValidation(String dateformat) {
+        assert dateformat != null && !dateformat.trim().isEmpty() : "empty date format for date validation";
+        this.dateformat = dateformat;
+    }
+
+    @Override
+    public void check(int row, String value, ValidationError error) {
+        if (!isDate(value, dateformat, true)) {
+            error.add("validation.message.date.format", dateformat);
+        }
+    }
+
+    @Override
+    public Type getType() {
+        return Type.DATE;
+    }
+}

src/main/java/ninja/javafx/smartcsv/validation/checker/DoubleValidation.java

@@ -0,0 +1,48 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
+
+import static org.apache.commons.validator.GenericValidator.isDouble;
+
+/**
+ * Checks if the value is a double
+ */
+public class DoubleValidation extends EmptyValueIsValid {
+
+    @Override
+    public void check(int row, String value, ValidationError error) {
+        if (!isDouble(value)) {
+            error.add("validation.message.double");
+        }
+    }
+
+    @Override
+    public Type getType() {
+        return Type.DOUBLE;
+    }
+}

src/main/java/ninja/javafx/smartcsv/validation/checker/EmailValidation.java

@@ -0,0 +1,47 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
+import org.apache.commons.validator.routines.EmailValidator;
+
+/**
+ * checks if the value is a valid email address
+ */
+public class EmailValidation extends EmptyValueIsValid {
+
+    @Override
+    public void check(int row, String value, ValidationError error) {
+        if (!EmailValidator.getInstance().isValid(value)) {
+            error.add("validation.message.email");
+        }
+    }
+
+    @Override
+    public Type getType() {
+        return Type.STRING;
+    }
+}

src/main/java/ninja/javafx/smartcsv/validation/checker/EmptyValueIsValid.java

@@ -0,0 +1,12 @@
+package ninja.javafx.smartcsv.validation.checker;
+
+/**
+ * validations based on this are not validated when the value is null or empty
+ */
+public abstract class EmptyValueIsValid implements Validation {
+
+    @Override
+    public boolean canBeChecked(String value) {
+        return value != null && !value.isEmpty();
+    }
+}

src/main/java/ninja/javafx/smartcsv/validation/checker/GroovyValidation.java

@@ -0,0 +1,79 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+package ninja.javafx.smartcsv.validation.checker;
+
+import groovy.lang.Binding;
+import groovy.lang.GroovyShell;
+import groovy.lang.Script;
+import ninja.javafx.smartcsv.validation.ValidationError;
+import org.codehaus.groovy.control.CompilationFailedException;
+
+/**
+ * Executes the given groovy as check
+ */
+public class GroovyValidation extends EmptyValueIsValid {
+
+    private String groovyScript;
+    private GroovyShell shell = new GroovyShell();
+    private Script script;
+
+    public GroovyValidation(String groovyScript) {
+        this.groovyScript = groovyScript;
+        script = shell.parse(groovyScript);
+    }
+
+
+    @Override
+    public void check(int row, String value, ValidationError error) {
+        Binding binding = new Binding();
+        binding.setVariable("value", value);
+        script.setBinding(binding);
+
+        Object groovyResult = null;
+        try {
+            groovyResult = script.run();
+        } catch (CompilationFailedException e) {
+            error.add("validation.message.groovy.exception", groovyScript, e.getMessage());
+            e.printStackTrace();
+        }
+        if (groovyResult == null) {
+            error.add("validation.message.groovy.return.null", groovyScript);
+        }
+
+        if (!isScriptResultTrue(groovyResult)) {
+            error.add(groovyResult.toString());
+        }
+    }
+
+    @Override
+    public Type getType() {
+        return Type.GROOVY;
+    }
+
+    private boolean isScriptResultTrue(Object groovyResult) {
+        return groovyResult.equals(true) || groovyResult.toString().trim().toLowerCase().equals("true");
+    }
+}

src/main/java/ninja/javafx/smartcsv/validation/checker/IntegerValidation.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -23,24 +23,26 @@
    THE SOFTWARE.
 
 */
+package ninja.javafx.smartcsv.validation.checker;
 
-package ninja.javafx.smartcsv.validation;
+import ninja.javafx.smartcsv.validation.ValidationError;
 
-import com.google.gson.annotations.SerializedName;
+import static org.apache.commons.validator.GenericValidator.isInt;
 
 /**
- * header configuration for the validation
+ * Checks if the value is an integer
  */
-public class HeaderConfiguration {
+public class IntegerValidation extends EmptyValueIsValid {
 
-    @SerializedName("list")
-    private String[] names ;
-
-    public String[] getNames() {
-        return names;
+    @Override
+    public void check(int row, String value, ValidationError error) {
+        if (!isInt(value)) {
+            error.add("validation.message.integer");
+        }
     }
 
-    public void setNames(String[] names) {
-        this.names = names;
+    @Override
+    public Type getType() {
+        return Type.INTEGER;
     }
 }

src/main/java/ninja/javafx/smartcsv/validation/checker/MaxLengthValidation.java

@@ -0,0 +1,54 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
+
+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 EmptyValueIsValid {
+
+    private int maxLength;
+
+    public MaxLengthValidation(int maxLength) {
+        this.maxLength = maxLength;
+    }
+
+    @Override
+    public void check(int row, String value, ValidationError error) {
+        if (!maxLength(value, maxLength)) {
+            error.add("validation.message.max.length", Integer.toString(maxLength));
+        }
+    }
+
+    @Override
+    public Type getType() {
+        return Type.MAX_LENGTH;
+    }
+}

src/main/java/ninja/javafx/smartcsv/validation/checker/MinLengthValidation.java

@@ -0,0 +1,54 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
+
+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 EmptyValueIsValid {
+
+    private int minLength;
+
+    public MinLengthValidation(int minLength) {
+        this.minLength = minLength;
+    }
+
+    @Override
+    public void check(int row, String value, ValidationError error) {
+        if (!minLength(value, minLength)) {
+            error.add("validation.message.min.length", Integer.toString(minLength));
+        }
+    }
+
+    @Override
+    public Type getType() {
+        return Type.MIN_LENGTH;
+    }
+}

src/main/java/ninja/javafx/smartcsv/validation/checker/NotEmptyValidation.java

@@ -0,0 +1,53 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
+
+import static org.apache.commons.validator.GenericValidator.isBlankOrNull;
+
+/**
+ * Checks if the value is not empty
+ */
+public class NotEmptyValidation implements Validation {
+
+    @Override
+    public void check(int row, String value, ValidationError error) {
+        if (isBlankOrNull(value)) {
+            error.add("validation.message.not.empty");
+        }
+    }
+
+    @Override
+    public Type getType() {
+        return Type.NOT_EMPTY;
+    }
+
+    @Override
+    public boolean canBeChecked(String value) {
+        return true;
+    }
+}

src/main/java/ninja/javafx/smartcsv/validation/checker/RegExpValidation.java

@@ -0,0 +1,54 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
+
+import static org.apache.commons.validator.GenericValidator.matchRegexp;
+
+/**
+ * Checks the value against the given reg exp
+ */
+public class RegExpValidation extends EmptyValueIsValid {
+
+    private String regexp;
+
+    public RegExpValidation(String regexp) {
+        this.regexp = regexp;
+    }
+
+    @Override
+    public void check(int row, String value, ValidationError error) {
+        if (!matchRegexp(value, regexp)) {
+            error.add("validation.message.regexp", regexp);
+        }
+    }
+
+    @Override
+    public Type getType() {
+        return Type.REGEXP;
+    }
+}

src/main/java/ninja/javafx/smartcsv/validation/checker/UniqueValidation.java

@@ -0,0 +1,79 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.fx.table.model.ColumnValueProvider;
+import ninja.javafx.smartcsv.validation.ValidationError;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static java.util.Collections.sort;
+import static java.util.stream.Collectors.joining;
+
+/**
+ * Checks if the value is unique in the column
+ */
+public class UniqueValidation extends EmptyValueIsValid {
+
+    private ColumnValueProvider columnValueProvider;
+    private String column;
+
+    public UniqueValidation(ColumnValueProvider columnValueProvider, String column) {
+        this.columnValueProvider = columnValueProvider;
+        this.column = column;
+    }
+
+    @Override
+    public void check(int row, String value, ValidationError error) {
+
+        List<Integer> lineNumbers = new ArrayList<>();
+
+        int numberOfRows = columnValueProvider.getNumberOfRows();
+        for (int currentRowOfIteration = 0; currentRowOfIteration < numberOfRows; currentRowOfIteration++) {
+            String storedValue = columnValueProvider.getValue(currentRowOfIteration, column);
+
+            if (value.equals(storedValue) && currentRowOfIteration != row) {
+                lineNumbers.add(currentRowOfIteration + 1); // show not 0 based line numbers to user
+            }
+        }
+
+        if (!lineNumbers.isEmpty()) {
+            if (lineNumbers.size() > 1) {
+                sort(lineNumbers);
+                error.add("validation.message.uniqueness.multiple", value, lineNumbers.stream().map(Object::toString).collect(joining(", ")));
+            } else {
+                error.add("validation.message.uniqueness.single", value, lineNumbers.get(0).toString());
+            }
+        }
+
+    }
+
+    @Override
+    public Type getType() {
+        return Type.UNIQUE;
+    }
+}

src/main/java/ninja/javafx/smartcsv/validation/checker/UriValidation.java

@@ -0,0 +1,51 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+/**
+ * checks if the value is a valid uri address
+ */
+public class UriValidation extends EmptyValueIsValid {
+
+    @Override
+    public void check(int row, String value, ValidationError error) {
+        try {
+            new URI(value);
+        } catch (URISyntaxException e) {
+            error.add("validation.message.uri");
+        }
+    }
+
+    @Override
+    public Type getType() {
+        return Type.STRING;
+    }
+}

src/main/java/ninja/javafx/smartcsv/validation/checker/UuidValidation.java

@@ -0,0 +1,50 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
+
+import java.util.UUID;
+
+/**
+ * checks if the value is a valid uuid
+ */
+public class UuidValidation extends EmptyValueIsValid {
+
+    @Override
+    public void check(int row, String value, ValidationError error) {
+        try {
+            UUID.fromString(value);
+        } catch (IllegalArgumentException e) {
+            error.add("validation.message.uuid");
+        }
+    }
+
+    @Override
+    public Type getType() {
+        return Type.STRING;
+    }
+}

src/main/java/ninja/javafx/smartcsv/validation/checker/Validation.java

@@ -0,0 +1,39 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
+
+/**
+ * Interface for all validations
+ */
+public interface Validation {
+
+    enum Type { NOT_EMPTY, UNIQUE, DOUBLE, INTEGER, MIN_LENGTH, MAX_LENGTH, DATE, REGEXP, VALUE_OF, STRING, GROOVY }
+    void check(int row, String value, ValidationError error);
+    Type getType();
+    boolean canBeChecked(String value);
+}

src/main/java/ninja/javafx/smartcsv/validation/checker/ValueOfValidation.java

@@ -0,0 +1,57 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
+
+import java.util.List;
+
+import static java.util.stream.Collectors.joining;
+
+/**
+ * Checks if the value is part of a list of values
+ */
+public class ValueOfValidation extends EmptyValueIsValid {
+
+    private List<String> values;
+
+    public ValueOfValidation(List<String> values) {
+        this.values = values;
+    }
+
+    @Override
+    public void check(int row, String value, ValidationError error) {
+        if (!values.contains(value)) {
+            String commaSeparated = values.stream().collect(joining(", "));
+            error.add("validation.message.value.of", value, commaSeparated);
+        }
+    }
+
+    @Override
+    public Type getType() {
+        return Type.VALUE_OF;
+    }
+}

src/main/java/ninja/javafx/smartcsv/validation/configuration/Constraints.java

@@ -0,0 +1,96 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+
+package ninja.javafx.smartcsv.validation.configuration;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+/**
+ * contraints defined in JSON Table Schema
+ * @see <a href="http://specs.frictionlessdata.io/json-table-schema/">JSON Table Schema</a>
+ */
+public class Constraints {
+    private Boolean required;
+    private Boolean unique;
+    private Integer minLength;
+    private Integer maxLength;
+
+    private String pattern;
+
+    @SerializedName("enum")
+    private List<String> enumeration;
+
+    public Boolean getRequired() {
+        return required;
+    }
+
+    public void setRequired(Boolean required) {
+        this.required = required;
+    }
+
+    public Boolean getUnique() {
+        return unique;
+    }
+
+    public void setUnique(Boolean unique) {
+        this.unique = unique;
+    }
+
+    public Integer getMinLength() {
+        return minLength;
+    }
+
+    public void setMinLength(Integer minLength) {
+        this.minLength = minLength;
+    }
+
+    public Integer getMaxLength() {
+        return maxLength;
+    }
+
+    public void setMaxLength(Integer maxLength) {
+        this.maxLength = maxLength;
+    }
+
+    public String getPattern() {
+        return pattern;
+    }
+
+    public void setPattern(String pattern) {
+        this.pattern = pattern;
+    }
+
+    public List<String> getEnumeration() {
+        return enumeration;
+    }
+
+    public void setEnumeration(List<String> enumeration) {
+        this.enumeration = enumeration;
+    }
+
+}

src/main/java/ninja/javafx/smartcsv/validation/configuration/Field.java

@@ -0,0 +1,109 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+
+package ninja.javafx.smartcsv.validation.configuration;
+
+/**
+ * this class represents a field in the configuration
+ * @see <a href="http://specs.frictionlessdata.io/json-table-schema/">JSON Table Schema</a>
+ */
+public class Field {
+
+    private String name;
+    private String title;
+    private Type type;
+    private String description;
+    private String format;
+    private Object missingValue;
+    private Constraints constraints;
+    private String groovy;
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    public void setType(Type type) {
+        this.type = type;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getFormat() {
+        return format;
+    }
+
+    public void setFormat(String format) {
+        this.format = format;
+    }
+
+    public Object getMissingValue() {
+        return missingValue;
+    }
+
+    public void setMissingValue(Object missingValue) {
+        this.missingValue = missingValue;
+    }
+
+    public Constraints getConstraints() {
+        return constraints;
+    }
+
+    public void setConstraints(Constraints constraints) {
+        this.constraints = constraints;
+    }
+
+    public String getGroovy() {
+        return groovy;
+    }
+
+    public void setGroovy(String groovy) {
+        this.groovy = groovy;
+    }
+
+}

src/main/java/ninja/javafx/smartcsv/validation/configuration/StringFormat.java

@@ -0,0 +1,60 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+
+package ninja.javafx.smartcsv.validation.configuration;
+
+/**
+ * Enumeration for format values for type string in JSON Table Schema
+ * @see <a href="http://specs.frictionlessdata.io/json-table-schema/">JSON Table Schema</a>
+ */
+public enum StringFormat {
+    DEFAULT(null),
+    EMAIL("email"),
+    URI("uri"),
+    BINARY("binary"),
+    UUID("uuid");
+
+    private String externalValue;
+
+    StringFormat(String externalValue) {
+        this.externalValue = externalValue;
+    }
+
+    public String getExternalValue() {
+        return externalValue;
+    }
+
+    public static StringFormat fromExternalValue(String externalValue) {
+        if (externalValue != null) {
+            for (StringFormat value : StringFormat.values()) {
+                if (externalValue.equals(value.getExternalValue())) {
+                    return value;
+                }
+            }
+        }
+        return DEFAULT;
+    }
+}

src/main/java/ninja/javafx/smartcsv/validation/configuration/Type.java

@@ -0,0 +1,48 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+
+package ninja.javafx.smartcsv.validation.configuration;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * Types of JSON Table Schema
+ * @see <a href="http://specs.frictionlessdata.io/json-table-schema/">JSON Table Schema</a>
+ */
+public enum Type {
+    @SerializedName("string")STRING,
+    @SerializedName("integer")INTEGER,
+    @SerializedName("number")NUMBER,
+    @SerializedName("date")DATE,
+    @SerializedName("datetime")DATETIME,
+    @SerializedName("time")TIME
+// TODO: currently not supported
+//        @SerializedName("object") OBJECT,
+//        @SerializedName("array") ARRAY,
+//        @SerializedName("duration") DURATION,
+//        @SerializedName("geopoint") GEOPOINT,
+//        @SerializedName("geojson") GEOJSON
+}

src/main/java/ninja/javafx/smartcsv/validation/configuration/ValidationConfiguration.java

@@ -0,0 +1,81 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+                                                                                                                    
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+  
+*/
+
+package ninja.javafx.smartcsv.validation.configuration;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Configuration based on JSON Table Schema
+ * @see <a href="http://specs.frictionlessdata.io/json-table-schema/">JSON Table Schema</a>
+ */
+public class ValidationConfiguration {
+
+    @SerializedName("fields")
+    private Field[] fields;
+
+    public Field[] getFields() {
+        return fields;
+    }
+
+    public void setFields(Field[] fields) {
+        this.fields = fields;
+    }
+
+    public Field getFieldConfiguration(String column) {
+        for (Field field : fields) {
+            if (field.getName().equals(column)) {
+                return field;
+            }
+        }
+        return null;
+    }
+
+    public String[] headerNames() {
+        if (fields != null) {
+            List<String> headerNames = new ArrayList<>();
+            for (Field field : fields) {
+                headerNames.add(field.getName());
+            }
+            return headerNames.toArray(new String[headerNames.size()]);
+        }
+
+        return null;
+    }
+
+    public void setHeaderNames(String[] header) {
+        fields = new Field[header.length];
+        int i = 0;
+        for (String headerName: header) {
+            fields[i] = new Field();
+            fields[i].setName(headerName);
+            i++;
+        }
+    }
+}

src/main/resources/ninja/javafx/smartcsv/fx/about/about.fxml

@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Hyperlink?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.TextArea?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
-
 <VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="600.0" spacing="4.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <Label text="SmartCSV.fx">
@@ -98,7 +91,7 @@
             <Font size="18.0" />
          </font>
       </Label>
-      <TextArea editable="false" prefHeight="200.0" prefWidth="200.0" text="Copyright (c) 2015 Andreas Billmann &lt;andreas.billmann@javafx.ninja&gt;&#10;&#10;Permission is hereby granted, free of charge, to any person obtaining a copy&#10;of this software and associated documentation files (the &quot;Software&quot;), to deal&#10;in the Software without restriction, including without limitation the rights&#10;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#10;copies of the Software, and to permit persons to whom the Software is&#10;furnished to do so, subject to the following conditions:&#10;&#10;The above copyright notice and this permission notice shall be included in&#10;all copies or substantial portions of the Software.&#10;&#10;&#10;&#10;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#10;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#10;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE&#10;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#10;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#10;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN&#10;THE SOFTWARE." wrapText="true" />
+      <TextArea editable="false" prefHeight="200.0" prefWidth="200.0" text="Copyright (c) 2015-2016 Andreas Billmann &lt;andreas.billmann@javafx.ninja&gt;&#10;&#10;Permission is hereby granted, free of charge, to any person obtaining a copy&#10;of this software and associated documentation files (the &quot;Software&quot;), to deal&#10;in the Software without restriction, including without limitation the rights&#10;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#10;copies of the Software, and to permit persons to whom the Software is&#10;furnished to do so, subject to the following conditions:&#10;&#10;The above copyright notice and this permission notice shall be included in&#10;all copies or substantial portions of the Software.&#10;&#10;&#10;&#10;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#10;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#10;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE&#10;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#10;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#10;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN&#10;THE SOFTWARE." wrapText="true" />
    </children>
    <opaqueInsets>
       <Insets />

src/main/resources/ninja/javafx/smartcsv/fx/application.properties

@@ -1,5 +1,5 @@
 application.name = SmartCSV.fx
-application.version = 0.5
+application.version = 0.8
 
 # fxml views
 fxml.smartcvs.view = /ninja/javafx/smartcsv/fx/smartcsv.fxml

src/main/resources/ninja/javafx/smartcsv/fx/preferences/preferences.fxml

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
-<?import java.lang.*?>
 <?import javafx.scene.layout.*?>
-
 <GridPane hgap="8.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" vgap="8.0" xmlns="http://javafx.com/javafx/8.0.66" xmlns:fx="http://javafx.com/fxml/1">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />

src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.css

@@ -1,16 +1,16 @@
-.list-view {
+.table-view .list-view {
     -fx-background-color: -fx-background;
     -fx-padding: 1;
 }
 
-.list-cell {
+.table-view .list-cell {
     -fx-padding: 1.0em 1.0em 1.0em 1.0em;
 }
-.list-cell:odd {
+.table-view .list-cell:odd {
     -fx-background: -fx-control-inner-background-alt;
 }
 
-.list-cell:even {
+.table-view .list-cell:even {
     -fx-background: -fx-control-inner-background;
 }
 
@@ -82,9 +82,14 @@
 .goto-icon {
     -glyph-name: "SUBDIRECTORY_ARROW_RIGHT";
     -glyph-size: 16px;
-
 }
 
+.export-icon {
+    -glyph-name: "BUG";
+    -glyph-size: 16px;
+}
+
+
 /* toolbar customization based on http://fxexperience.com/2012/02/customized-segmented-toolbar-buttons/ */
 
 #background {
@@ -149,6 +154,11 @@
     -fx-fill: white;
 }
 
+.tool-bar .export-icon {
+    -glyph-size: 16px;
+    -fx-fill: white;
+}
+
 .segmented-button-bar .button {
     -fx-background-color:
             -darkest-black,

src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.fxml

@@ -1,27 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import de.jensd.fx.glyphs.GlyphsStack?>
-<?import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView?>
-<?import java.net.URL?>
+<?import de.jensd.fx.glyphs.*?>
+<?import de.jensd.fx.glyphs.materialdesignicons.*?>
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Menu?>
-<?import javafx.scene.control.MenuBar?>
-<?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.SeparatorMenuItem?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.control.ToolBar?>
-<?import javafx.scene.control.Tooltip?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Region?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
-
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import java.net.URL?>
 <BorderPane fx:id="applicationPane" maxHeight="-Infinity" maxWidth="1000.0" minHeight="700.0" minWidth="-Infinity" prefHeight="700.0" prefWidth="1000.0" xmlns="http://javafx.com/javafx/8.0.101" xmlns:fx="http://javafx.com/fxml/1">
     <top>
         <VBox id="background" prefWidth="100.0" BorderPane.alignment="CENTER">
@@ -94,6 +78,11 @@
                                         <MaterialDesignIconView styleClass="preferences-icon" />
                                     </graphic>
                                 </MenuItem>
+                                <MenuItem fx:id="exportMenuItem" disable="true" mnemonicParsing="false" onAction="#export" text="%menu.export">
+                                    <graphic>
+                                        <MaterialDesignIconView styleClass="export-icon" />
+                                    </graphic>
+                                </MenuItem>
                                 <SeparatorMenuItem mnemonicParsing="false" />
                                 <MenuItem mnemonicParsing="false" onAction="#close" text="%menu.close">
                                     <graphic>
@@ -245,6 +234,14 @@
                             <MaterialDesignIconView styleClass="preferences-icon" />
                         </graphic>
                     </Button>
+                    <Button fx:id="exportButton" disable="true" mnemonicParsing="false" onAction="#export">
+                        <tooltip>
+                            <Tooltip text="%menu.export" />
+                        </tooltip>
+                        <graphic>
+                            <MaterialDesignIconView styleClass="export-icon" />
+                        </graphic>
+                    </Button>
                     <Button mnemonicParsing="false" onAction="#close" styleClass="last">
                         <tooltip>
                             <Tooltip text="%menu.close" />

src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.properties

@@ -14,6 +14,7 @@ menu.preferences = Preferences
 menu.delete.row = Delete row
 menu.add.row = Add row
 menu.goto.line = Goto line
+menu.export = Export error log
 
 title.validation.errors = Validation Errors:
 
@@ -45,6 +46,7 @@ preferences.quoteMode = Quote mode:
 validation.message.not.empty = should not be empty
 validation.message.integer = should be an integer
 validation.message.double = should be a double
+validation.message.email = should be an email address
 validation.message.alphanumeric = should be alphanumeric
 validation.message.groovy.exception = groovy script '{0}' throws exception: {1}
 validation.message.groovy.return.null = groovy script '{0}' returns null
@@ -52,28 +54,46 @@ validation.message.min.length = has not min length of {0}
 validation.message.max.length = has not max length of {0}
 validation.message.date.format = is not a date of format {0}
 validation.message.regexp = does not match {0}
-validation.message.uniqueness = value {0} is not unique (found in line {1})
+validation.message.uniqueness.multiple = value {0} is not unique (found in rows {1})
+validation.message.uniqueness.single = value {0} is not unique (found in row {1})
+validation.message.uri = should be an uri
+validation.message.uuid = should be an uuid
+validation.message.binary = should be a base64 encoded string representing binary data
 
 validation.message.header.length = number of headers is not correct! there are {0} but there should be {1}
 validation.message.header.match = header number {0} does not match "{1}" should be "{2}"
 validation.message.value.of = Value {0} is not part of this list {1}
 
-validation.rule.label.not_empty = not empty:
-validation.rule.label.integer = integer:
-validation.rule.label.double = double:
+validation.rule.label.not_empty = not empty
+validation.rule.label.integer = integer
+validation.rule.label.double = double
 validation.rule.label.minlength = minimum length:
 validation.rule.label.maxlength = maximum length:
 validation.rule.label.dateformat = date format:
-validation.rule.label.alphanumeric = alphanumeric:
+validation.rule.label.alphanumeric = alphanumeric
 validation.rule.label.regexp = regular expression:
 validation.rule.label.value_of = value in list:
 validation.rule.label.groovy = groovy:
 validation.rules.active = active
 validation.rules.name = rule
 validation.rules.value = value
+validation.rule.label.unique = Unique in column
+validation.rule.format = Format:
+validation.rule.type = Type:
 
 dialog.validation.rules.title = Validation rules
 dialog.validation.rules.header = Validation rules of column "{0}"
 context.menu.edit.column.rules = Edit rules
 
 lineNumber = Selected line:
+
+log.header.message = {0} has {1} errors
+log.message = row {0} column {1} : {2}
+
+column = column
+
+format.type.DEFAULT = default
+format.type.EMAIL = email
+format.type.URI = uri
+format.type.BINARY = binary
+format.type.UUID = uuid

src/main/resources/ninja/javafx/smartcsv/fx/smartcsv_de.properties

@@ -23,6 +23,7 @@ menu.preferences = Einstellungen
 menu.delete.row = Zeile l\u00f6schen
 menu.add.row = Zeile hinzuf\u00fcgen
 menu.goto.line = Springe zur Zeile
+menu.export = Export Fehlerdatei
 
 title.validation.errors = Fehler in der Datei:
 
@@ -54,6 +55,7 @@ preferences.quoteMode = Einfassungsmodus:
 validation.message.not.empty = Darf nicht leer sein.
 validation.message.integer = Muss eine Zahl sein.
 validation.message.double = Muss eine Gleitkommazahl sein
+validation.message.email = Muss eine Email-Adresse sein
 validation.message.alphanumeric = Darf nur Zahlen und Buchstaben enthalten.
 validation.message.groovy.exception = groovy script '{0}' wirft folgenden Fehler: {1}
 validation.message.groovy.return.null = groovy script '{0}' meldet "null"
@@ -61,15 +63,19 @@ validation.message.min.length = Hat nicht die minimale L\u00e4nge von {0}
 validation.message.max.length = Hat nicht die maximale L\u00e4nge von {0}
 validation.message.date.format = Das Datumsformat entspricht nicht {0}
 validation.message.regexp = entspricht nicht dem regul\u00e4ren Ausdruck {0}
-validation.message.uniqueness = Wert {0} ist nicht einmalig (gefunden in Zeile {1})
+validation.message.uniqueness.multiple = Wert {0} ist nicht einmalig (gefunden in den Zeilen {1})
+validation.message.uniqueness.single = Wert {0} ist nicht einmalig (gefunden in Zeile {1})
+validation.message.uri = Muss eine URI sein
+validation.message.uuid = Muss eine UUID sein
+validation.message.binary = Muss ein base64 encoded Text sein, der bin\u00e4re Daten enth\u00e4lt
 
 validation.message.header.length = Anzahl der \u00dcberschriften ist nicht korrekt! Es sind {0} aber es sollten {1} sein
 validation.message.header.match = \u00dcberschrift in Spalte {0} stimmt nicht. "{1}" sollte "{3}" sein
 validation.message.value.of = Der Wert {0} ist nicht in der Liste {1} enthalten
 
-validation.rule.label.not_empty = Nicht leer:
-validation.rule.label.integer = Zahl:
-validation.rule.label.double = Gleitkommazahl:
+validation.rule.label.not_empty = Nicht leer
+validation.rule.label.integer = Zahl
+validation.rule.label.double = Gleitkommazahl
 validation.rule.label.minlength = Minimale L\u00e4nge:
 validation.rule.label.maxlength = Maximale L\u00e4nge:
 validation.rule.label.dateformat = Datumsformat:
@@ -80,6 +86,9 @@ validation.rule.label.groovy = groovy:
 validation.rules.active = Aktiv
 validation.rules.name = Regel
 validation.rules.value = Wert
+validation.rule.label.unique = Einmalig in Spalte
+validation.rule.format = Format:
+validation.rule.type = Typ:
 
 dialog.validation.rules.title = Pr\u00fcfregeln
 dialog.validation.rules.header = Pr\u00fcfregeln f\u00fcr die Spalte "{0}"
@@ -87,3 +96,14 @@ dialog.validation.rules.header = Pr\u00fcfregeln f\u00fcr die Spalte "{0}"
 context.menu.edit.column.rules = Pr\u00fcfregeln bearbeiten
 
 lineNumber = Ausgew\u00e4hlte Zeile:
+
+log.header.message = {0} hat {1} Fehler
+log.message = Zeile {0} Spalte {1} : {2}
+
+column = Spalte
+
+format.type.DEFAULT = Standard
+format.type.EMAIL = Email
+format.type.URI = URI
+format.type.BINARY = Bin\u00e4r
+format.type.UUID = UUID

src/main/resources/ninja/javafx/smartcsv/fx/validation/validationEditor.fxml

@@ -1,71 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.net.URL?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.Spinner?>
-<?import javafx.scene.control.TextArea?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
-
 <?import org.fxmisc.richtext.CodeArea?>
-<?import java.net.URL?>
-<GridPane hgap="10.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="600.0" vgap="10.0" xmlns="http://javafx.com/javafx/8.0.101" xmlns:fx="http://javafx.com/fxml/1">
+
+<GridPane hgap="20.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="800.0" vgap="6.0" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1">
     <columnConstraints>
-      <ColumnConstraints halignment="CENTER" hgrow="NEVER" maxWidth="50.0" prefWidth="50.0" />
-    <ColumnConstraints hgrow="NEVER" />
-    <ColumnConstraints hgrow="ALWAYS" />
+        <ColumnConstraints halignment="LEFT" hgrow="NEVER" />
+        <ColumnConstraints halignment="LEFT" hgrow="ALWAYS" />
+        <ColumnConstraints halignment="LEFT" hgrow="NEVER" />
+        <ColumnConstraints halignment="LEFT" hgrow="ALWAYS" />
     </columnConstraints>
     <rowConstraints>
         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+        <RowConstraints minHeight="10.0" prefHeight="30.0" valignment="CENTER" vgrow="SOMETIMES" />
+        <RowConstraints minHeight="10.0" prefHeight="30.0" valignment="CENTER" vgrow="SOMETIMES" />
+        <RowConstraints minHeight="10.0" prefHeight="30.0" valignment="CENTER" vgrow="SOMETIMES" />
         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+        <RowConstraints minHeight="10.0" valignment="TOP" vgrow="ALWAYS" />
+        <RowConstraints />
     </rowConstraints>
     <children>
-      <Label text="%validation.rule.label.not_empty" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-      <Label text="%validation.rule.label.integer" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-      <Label text="%validation.rule.label.double" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-      <Label text="%validation.rule.label.minlength" GridPane.columnIndex="1" GridPane.rowIndex="5" />
-      <Label text="%validation.rule.label.maxlength" GridPane.columnIndex="1" GridPane.rowIndex="6" />
-      <Label text="%validation.rule.label.dateformat" GridPane.columnIndex="1" GridPane.rowIndex="7" />
-      <Label text="%validation.rule.label.alphanumeric" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-      <Label text="%validation.rule.label.regexp" GridPane.columnIndex="1" GridPane.rowIndex="8" />
-      <Label text="%validation.rule.label.value_of" GridPane.columnIndex="1" GridPane.rowIndex="9" />
-      <Label text="%validation.rule.label.groovy" GridPane.columnIndex="1" GridPane.rowIndex="10" />
-      <CheckBox fx:id="notEmptyRuleCheckBox" mnemonicParsing="false" GridPane.columnIndex="2" GridPane.rowIndex="1" />
-      <CheckBox fx:id="integerRuleCheckBox" mnemonicParsing="false" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-      <CheckBox fx:id="doublerRuleCheckBox" mnemonicParsing="false" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-      <CheckBox fx:id="alphanumericRuleCheckBox" mnemonicParsing="false" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-      <Spinner fx:id="minLengthSpinner" GridPane.columnIndex="2" GridPane.rowIndex="5" />
-      <Spinner fx:id="maxLengthSpinner" GridPane.columnIndex="2" GridPane.rowIndex="6" />
-      <TextField fx:id="dateformatRuleTextField" GridPane.columnIndex="2" GridPane.rowIndex="7" />
-      <TextField fx:id="regexpRuleTextField" GridPane.columnIndex="2" GridPane.rowIndex="8" />
-      <TextField fx:id="valueOfRuleTextField" GridPane.columnIndex="2" GridPane.rowIndex="9" />
-      <CodeArea fx:id="groovyRuleTextArea" prefHeight="300.0" prefWidth="200.0" GridPane.columnIndex="2" GridPane.rowIndex="10" GridPane.rowSpan="2" />
-      <CheckBox fx:id="enableNotEmptyRule" mnemonicParsing="false" GridPane.rowIndex="1" />
-      <CheckBox fx:id="enableIntegerRule" mnemonicParsing="false" GridPane.rowIndex="2" />
-      <CheckBox fx:id="enableDoubleRule" mnemonicParsing="false" GridPane.rowIndex="3" />
-      <CheckBox fx:id="enableAlphanumericRule" mnemonicParsing="false" GridPane.rowIndex="4" />
-      <CheckBox fx:id="enableMinLengthRule" mnemonicParsing="false" GridPane.rowIndex="5" />
-      <CheckBox fx:id="enableMaxLengthRule" mnemonicParsing="false" GridPane.rowIndex="6" />
-      <CheckBox fx:id="enableDateRule" mnemonicParsing="false" GridPane.rowIndex="7" />
-      <CheckBox fx:id="enableRegexpRule" mnemonicParsing="false" GridPane.rowIndex="8" />
-      <CheckBox fx:id="enableValueOfRule" mnemonicParsing="false" GridPane.rowIndex="9" />
-      <CheckBox fx:id="enableGroovyRule" mnemonicParsing="false" GridPane.rowIndex="10" />
-      <Label style="-fx-font-weight: bold;" text="%validation.rules.active" />
-      <Label style="-fx-font-weight: bold;" text="%validation.rules.name" GridPane.columnIndex="1" />
-      <Label style="-fx-font-weight: bold;" text="%validation.rules.value" GridPane.columnIndex="2" />
+        <Label text="%validation.rule.type" GridPane.columnSpan="2" GridPane.halignment="LEFT" GridPane.hgrow="ALWAYS" />
+        <Label text="%validation.rule.format" GridPane.columnSpan="2" GridPane.halignment="LEFT" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" />
+        <ComboBox fx:id="typeComboBox" maxWidth="1.7976931348623157E308" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.halignment="LEFT" GridPane.hgrow="ALWAYS" />
+        <ComboBox fx:id="formatComboBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="1" visible="false" />
+        <TextField fx:id="formatTextField" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="1" visible="false" />
+        <CheckBox fx:id="enableNotEmptyRule" mnemonicParsing="false" text="%validation.rule.label.not_empty" GridPane.rowIndex="3" />
+        <CheckBox fx:id="enableUniqueRule" mnemonicParsing="false" text="%validation.rule.label.unique" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+        <CheckBox fx:id="enableMinLengthRule" mnemonicParsing="false" text="%validation.rule.label.minlength" GridPane.rowIndex="4" />
+        <Spinner fx:id="minLengthSpinner" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+        <CheckBox fx:id="enableMaxLengthRule" mnemonicParsing="false" text="%validation.rule.label.maxlength" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+        <Spinner fx:id="maxLengthSpinner" GridPane.columnIndex="3" GridPane.rowIndex="4" />
+        <CheckBox fx:id="enableRegexpRule" mnemonicParsing="false" text="%validation.rule.label.regexp" GridPane.rowIndex="5" />
+        <TextField fx:id="regexpRuleTextField" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="5" />
+        <CheckBox fx:id="enableValueOfRule" mnemonicParsing="false" text="%validation.rule.label.value_of" GridPane.rowIndex="6" />
+        <TextField fx:id="valueOfRuleTextField" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="6" />
+        <CheckBox fx:id="enableGroovyRule" mnemonicParsing="false" text="%validation.rule.label.groovy" GridPane.rowIndex="7">
+            <GridPane.margin>
+                <Insets top="8.0" />
+            </GridPane.margin>
+        </CheckBox>
+        <CodeArea fx:id="groovyRuleTextArea" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="7">
+            <GridPane.margin>
+                <Insets top="8.0" />
+            </GridPane.margin>
+        </CodeArea>
+        <Separator prefWidth="200.0" GridPane.columnSpan="4" GridPane.rowIndex="2" />
+
     </children>
     <padding>
         <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />

src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVModelTest.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -26,13 +26,10 @@
 
 package ninja.javafx.smartcsv.fx.table.model;
 
-import ninja.javafx.smartcsv.validation.ValidationConfiguration;
-import ninja.javafx.smartcsv.validation.Validator;
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertThat;
 
 /**
  * unit test for the csv model

src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVRowTest.java

@@ -1,13 +1,10 @@
 package ninja.javafx.smartcsv.fx.table.model;
 
-import ninja.javafx.smartcsv.validation.Validator;
-import org.hamcrest.Matchers;
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
+import static org.junit.Assert.assertThat;
 
 /**
  * unit test for row class

src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVValueTest.java

@@ -1,60 +0,0 @@
-package ninja.javafx.smartcsv.fx.table.model;
-
-import ninja.javafx.smartcsv.validation.Validator;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-/**
- * unit test for the value class
- */
-public class CSVValueTest {
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // constants
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    static final String COLUMN = "COLUMN";
-    static final String VALUE = "VALUE";
-
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // mocks
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    Validator validator = mock(Validator.class);
-
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // subject under test
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    CSVValue sut;
-
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // init
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    @Before
-    public void initialize() {
-        sut = new CSVValue();
-        sut.setValidator(validator);
-    }
-
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // tests
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    @Test
-    public void set_value_calls_validation() {
-        //setup
-        sut.setColumn(COLUMN);
-
-        // execution
-        sut.setValue(VALUE);
-
-        // assertion
-        verify(validator).isValid(eq(COLUMN), eq(VALUE), anyInt());
-    }
-}

src/test/java/ninja/javafx/smartcsv/validation/HeaderValidationTest.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -28,6 +28,7 @@ package ninja.javafx.smartcsv.validation;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

src/test/java/ninja/javafx/smartcsv/validation/ValidatorTest.java

@@ -2,6 +2,7 @@ package ninja.javafx.smartcsv.validation;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -70,8 +71,10 @@ public class ValidatorTest {
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     @Test
     public void validation() {
+        System.out.println(column + "  " + value + "  " + expectedResult + "  " + expectedError);
+
         // execution
-        ValidationError result = sut.isValid(column, value, 0);
+        ValidationError result = sut.isValid(0, column, value);
 
         // assertion
         assertThat(result == null, is(expectedResult));
@@ -112,7 +115,7 @@ public class ValidatorTest {
     }
 
     public static String json(String column, String rule, Object value) {
-        String json = "{\"columns\":{\"" + column + "\":{\"" + rule + "\":";
+        String json = "{\"headers\": { \"list\": [\""+column+"\"]},\"columns\":{\"" + column + "\":{\"" + rule + "\":";
         if (value instanceof String) {
             json += "\""+ value + "\"";
         } else if (value instanceof List) {