version 1.0.0

logo for the app

.gitignore

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

.travis.yml

@@ -0,0 +1 @@
+language: java

LICENSE.md

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

README.md

@@ -1,29 +1,30 @@
 # SmartCSV.fx
-##Description
+[![Build Status](https://travis-ci.org/frosch95/SmartCSV.fx.svg?branch=master)](https://travis-ci.org/frosch95/SmartCSV.fx) ![GitHub All Releases](https://img.shields.io/github/downloads/frosch95/SmartCSV.fx/total) ![GitHub](https://img.shields.io/github/license/frosch95/SmartCSV.fx) ![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/frosch95/SmartCSV.fx?label=version) ![GitHub Release Date](https://img.shields.io/github/release-date/frosch95/SmartCSV.fx)
-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.
+## Description
+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
+## 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, 
 even in a "normal" CSV editor. So I decided to write this simple JavaFX application.
 
-##Video
+## Video
 [![short video about the application](http://img.youtube.com/vi/eUh_WLx1OwI/0.jpg)](https://youtu.be/eUh_WLx1OwI)
 
-##Links
+## Links
 [GitHub Page](http://frosch95.github.io/SmartCSV.fx/)
 
 [Wiki & Documentation](https://github.com/frosch95/SmartCSV.fx/wiki)
 
-binary distribution of the [latest release (0.6)](https://github.com/frosch95/SmartCSV.fx/releases/download/0.6/SmartCSV.fx-0.6-SNAPSHOT.zip)
+binary distribution of the [latest release (1.0.0)](https://github.com/frosch95/SmartCSV.fx/releases/download/1.0.0/SmartCSV.fx-1.0.0.zip)
 
-##Talks
+## Talks
 [Introduction](http://javafx.ninja/talks/introduction/)
 
-##License
+## License
-###The MIT License (MIT)
+### The MIT License (MIT)
 
 
-Copyright (c) 2015 Andreas Billmann <andreas.billmann@javafx.ninja>
+Copyright (c) 2015-2019 Andreas Billmann <andreas.billmann@javafx.ninja>
 
 
 

build.gradle

@@ -1,38 +1,45 @@
-group 'ninja.javafx'
+plugins {
-version '0.7-SNAPSHOT'
+    id 'idea'
-
+    id 'java'
-apply plugin: 'java'
+    id 'groovy'
-apply plugin: 'groovy'
+    id 'application'
-apply plugin:'application'
+    id 'org.openjfx.javafxplugin' version '0.0.8'
-apply plugin: 'idea'
+}
-
-sourceCompatibility = 1.8
-mainClassName = 'ninja.javafx.smartcsv.fx.SmartCSV'
 
 repositories {
     mavenCentral()
     jcenter()
 }
 
-dependencies {
+javafx {
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    modules = [ 'javafx.controls', 'javafx.fxml' ]
-    testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3'
-    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
-    compile group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.4.7'
-    compile group: 'org.springframework', name:'spring-context', version: '4.3.1.RELEASE'
-    compile group: 'net.sf.supercsv', name: 'super-csv', version: '2.4.0'
-    compile group: 'commons-validator', name: 'commons-validator', version: '1.5.1'
-    compile group: 'de.jensd', name: 'fontawesomefx-commons', version: '8.12'
-    compile group: 'de.jensd', name: 'fontawesomefx-fontawesome', version: '4.6.3'
-    compile group: 'de.jensd', name: 'fontawesomefx-materialdesignfont', version: '1.6.50'
-    compile group: 'de.jensd', name: 'fontawesomefx-materialicons', version: '2.2.0'
-    compile group: 'org.controlsfx', name: 'controlsfx', version: '8.40.11'
-    compile group: 'com.google.code.gson', name: 'gson', version: '2.7'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.6.2'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.6.2'
-    compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.6.10'
 }
 
-task wrapper(type: Wrapper) {
+dependencies {
-    gradleVersion = '2.14.1' //version required
+    // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
+    testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.2'
+    testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.5.2'
+    testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '2.2'
+    testCompile group: 'org.mockito', name: 'mockito-core', version:'3.1.0'
+    compile group: 'org.codehaus.groovy', name: 'groovy-all', version: '3.0.0-beta-3'
+    compile group: 'org.springframework', name:'spring-context', version: '5.2.0.RELEASE'
+    compile group: 'net.sf.supercsv', name: 'super-csv', version: '2.4.0'
+    compile group: 'commons-validator', name: 'commons-validator', version: '1.6'
+    compile group: 'de.jensd', name: 'fontawesomefx-commons', version: '11.0'
+    compile group: 'de.jensd', name: 'fontawesomefx-fontawesome', version: '4.7.0-11'
+    compile group: 'de.jensd', name: 'fontawesomefx-materialdesignfont', version: '1.7.22-11'
+    compile group: 'de.jensd', name: 'fontawesomefx-materialicons', version: '2.2.0-11'
+    compile group: 'org.controlsfx', name: 'controlsfx', version: '11.0.0'
+    compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
+    compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.10.2'
 }
+
+test {
+    useJUnitPlatform()
+}
+
+group 'ninja.javafx'
+version '1.0.0'
+mainClassName = 'ninja.javafx.smartcsv.Main'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sat Jul 23 09:35:51 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,42 +6,6 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -60,6 +24,46 @@ cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
 cd "$SAVED" >/dev/null
 
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+# Escape application args
-function splitJvmOpts() {
+save () {
-    JVM_OPTS=("$@")
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+APP_ARGS=$(save "$@")
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

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-2019 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-2019 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/Main.java

@@ -0,0 +1,36 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 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;
+
+import ninja.javafx.smartcsv.fx.SmartCSV;
+
+public class Main {
+    public static void main(String[] args) {
+        // workaround for module problem
+        SmartCSV.main(args);
+    }
+}

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-2019 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
@@ -35,6 +35,8 @@ public class CSVConfigurable {
 
     protected CsvPreference csvPreference;
 
+    protected String fileEncoding;
+
     public CSVConfigurable() {
         csvPreference = CsvPreference.EXCEL_NORTH_EUROPE_PREFERENCE;
     }
@@ -42,4 +44,9 @@ public class CSVConfigurable {
     public void setCsvPreference(CsvPreference csvPreference) {
         this.csvPreference = csvPreference;
     }
+
+    public void setFileEncoding(String fileEncoding) {
+        this.fileEncoding = fileEncoding;
+    }
+
 }

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-2019 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
@@ -34,6 +34,7 @@ import org.supercsv.io.ICsvMapReader;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.Map;
 
 /**
@@ -48,7 +49,8 @@ public class CSVFileReader extends CSVConfigurable implements FileReader<CSVMode
 
         ICsvMapReader mapReader = null;
         try {
-            mapReader = new CsvMapReader(new java.io.FileReader(file.getAbsoluteFile()), csvPreference);
+            mapReader = new CsvMapReader(new java.io.FileReader(file.getAbsoluteFile(), Charset.forName(fileEncoding)),
+                    csvPreference);
             model = new CSVModel();
 
             // the header columns are used as the keys to the Map

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-2019 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
@@ -34,6 +34,7 @@ import org.supercsv.io.ICsvMapWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.Map;
 
 import static java.util.stream.Collectors.toMap;
@@ -53,7 +54,8 @@ public class CSVFileWriter extends CSVConfigurable implements ninja.javafx.smart
     public void write(File filename) throws IOException {
         ICsvMapWriter mapWriter = null;
         try {
-            mapWriter = new CsvMapWriter(new FileWriter(filename.getAbsolutePath()), csvPreference);
+            mapWriter = new CsvMapWriter(new FileWriter(filename.getAbsolutePath(), Charset.forName(fileEncoding)),
+                    csvPreference);
             mapWriter.writeHeader(model.getHeader());
 
             for(CSVRow row: model.getRows()) {

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

@@ -1,9 +1,34 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 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.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;
@@ -51,13 +76,13 @@ public class ErrorExport extends Service {
                             format(resourceBundle.getString("log.header.message"),
                                    csvFilename,
                                    Integer.toString(model.getValidationError().size()))).append("\n\n");
-                    for (ValidationError error:model.getValidationError()) {
+                    model.getValidationError().forEach(error ->
                         log.append(
                                 format(resourceBundle.getString("log.message"),
                                        error.getLineNumber().toString(),
                                        error.getColumn(),
-                                       getI18nValidatioMessage(resourceBundle, error))).append("\n");
+                                       getI18nValidatioMessage(resourceBundle, error))).append("\n")
-                    }
+                    );
                     Files.write(file.toPath(), log.toString().getBytes());
 
                 } catch (Throwable ex) {

src/main/java/ninja/javafx/smartcsv/files/FileStorage.java

@@ -1,3 +1,29 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 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.files;
 
 import javafx.beans.property.BooleanProperty;
@@ -11,7 +37,7 @@ import java.io.File;
 import java.io.IOException;
 
 /**
- * This class stores files and there state
+ * This class stores files and their state
  * @author abi
  */
 public class FileStorage<E> {
@@ -26,7 +52,7 @@ public class FileStorage<E> {
 
     private BooleanProperty fileChanged = new SimpleBooleanProperty(true);
     private ObjectProperty<File> file = new SimpleObjectProperty<>();
-    private ObjectProperty<E> content = new SimpleObjectProperty<E>();
+    private ObjectProperty<E> content = new SimpleObjectProperty<>();
 
     public boolean isFileChanged() {
         return fileChanged.get();

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-2019 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-2019 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,6 +30,7 @@ import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
+import javafx.scene.image.Image;
 import javafx.stage.Stage;
 import ninja.javafx.smartcsv.fx.about.AboutController;
 import org.springframework.context.annotation.*;
@@ -87,6 +88,7 @@ public class SmartCSV extends Application {
 
         primaryStage.setScene(scene);
         primaryStage.setTitle(String.format("%s %s", name, version));
+        primaryStage.getIcons().add(new Image(SmartCSV.class.getResourceAsStream("/ninja/javafx/smartcsv/icon/logo.png")));
         primaryStage.show();
         primaryStage.setMaximized(true);
 

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-2019 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,6 +26,7 @@
 
 package ninja.javafx.smartcsv.fx;
 
+import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
 import javafx.collections.ListChangeListener;
 import javafx.collections.WeakListChangeListener;
@@ -54,12 +55,11 @@ import ninja.javafx.smartcsv.fx.table.model.CSVValue;
 import ninja.javafx.smartcsv.fx.util.LoadFileService;
 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.*;
-import ninja.javafx.smartcsv.preferences.PreferencesFileWriter;
-import ninja.javafx.smartcsv.validation.ValidationConfiguration;
 import ninja.javafx.smartcsv.validation.ValidationError;
 import ninja.javafx.smartcsv.validation.ValidationFileReader;
 import ninja.javafx.smartcsv.validation.ValidationFileWriter;
+import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -68,6 +68,7 @@ import org.supercsv.prefs.CsvPreference;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.nio.charset.Charset;
 import java.util.Optional;
 import java.util.ResourceBundle;
 
@@ -93,6 +94,13 @@ public class SmartCSVController extends FXMLController {
             ".SmartCSV.fx" +
             File.separator + "" +
             "preferences.json");
+
+    private static final File ENCODING_FILE = new File(System.getProperty("user.home") +
+            File.separator +
+            ".SmartCSV.fx" +
+            File.separator +
+            "encoding.json");
+
     public static final String CSV_FILTER_TEXT = "CSV files (*.csv)";
     public static final String CSV_FILTER_EXTENSION = "*.csv";
     public static final String JSON_FILTER_TEXT = "JSON files (*.json)";
@@ -207,10 +215,13 @@ 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());
+    private FileStorage<String> fileEncodingFile = new FileStorage<>(new EncodingFileReader(), new EncodingFileWriter());
 
     private ListChangeListener<ValidationError> errorListListener = c -> tableView.refresh();
     private WeakListChangeListener<ValidationError> weakErrorListListener = new WeakListChangeListener<>(errorListListener);
@@ -236,10 +247,25 @@ public class SmartCSVController extends FXMLController {
         bindConfigFileName();
 
         csvPreferenceFile.setFile(PREFERENCES_FILE);
+        fileEncodingFile.setFile(ENCODING_FILE);
 
         loadCsvPreferencesFromFile();
     }
 
+    private void loadEncodingFromFile() {
+        if (fileEncodingFile.getFile().exists()) {
+            useLoadFileService(fileEncodingFile, event -> setFileEncoding(fileEncodingFile.getContent()));
+        } else {
+            setFileEncoding(Charset.defaultCharset().name());
+        }
+    }
+
+    private void setFileEncoding(String content) {
+        preferencesController.setFileEncoding(content);
+        csvFileReader.setFileEncoding(content);
+        csvFileWriter.setFileEncoding(content);
+    }
+
     private void setupErrorSideBar(ResourceBundle resourceBundle) {
         errorSideBar = new ErrorSideBar(resourceBundle);
         errorSideBar.selectedValidationErrorProperty().addListener((observable, oldValue, newValue) -> {
@@ -343,8 +369,29 @@ public class SmartCSVController extends FXMLController {
             CsvPreference csvPreference = preferencesController.getCsvPreference();
             setCsvPreference(csvPreference);
             saveCsvPreferences(csvPreference);
+            String fileEncoding = CharsetHelper.getCharsetName(preferencesController.getFileEncoding());
+            setFileEncoding(fileEncoding);
+            saveFileEncoding(fileEncoding);
         } else {
             preferencesController.setCsvPreference(csvPreferenceFile.getContent());
+            preferencesController.setFileEncoding(fileEncodingFile.getContent());
+        }
+    }
+
+    private void saveFileEncoding(String fileEncoding) {
+        try {
+            createFileEncodingFile();
+            fileEncodingFile.setContent(fileEncoding);
+            useSaveFileService(fileEncodingFile);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void createFileEncodingFile() throws IOException {
+        if (!fileEncodingFile.getFile().exists()) {
+            createPreferencesFileFolder();
+            fileEncodingFile.getFile().createNewFile();
         }
     }
 
@@ -423,6 +470,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);
@@ -489,9 +537,13 @@ public class SmartCSVController extends FXMLController {
 
     private void loadCsvPreferencesFromFile() {
         if (csvPreferenceFile.getFile().exists()) {
-            useLoadFileService(csvPreferenceFile, event -> setCsvPreference(csvPreferenceFile.getContent()));
+            useLoadFileService(csvPreferenceFile, event -> {
+                setCsvPreference(csvPreferenceFile.getContent());
+                loadEncodingFromFile();
+            });
         } else {
             setCsvPreference(CsvPreference.EXCEL_NORTH_EUROPE_PREFERENCE);
+            loadEncodingFromFile();
         }
     }
 
@@ -520,6 +572,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,
@@ -602,6 +657,10 @@ public class SmartCSVController extends FXMLController {
                 addColumn(column, tableView);
             }
 
+            tableView.getColumns().addListener(
+                    (InvalidationListener) observable -> currentCsvFile.getContent().setHeader(
+                            tableView.getColumns().stream().map((x) -> x.getText()).toArray(String[]::new)));
+
             tableView.getItems().setAll(currentCsvFile.getContent().getRows());
             tableView.setEditable(true);
 

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-2019 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-2019 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
@@ -137,9 +137,7 @@ public class ErrorSideBar extends Region {
 
                 int rows = model.get().getRows().size();
                 double space = (double)heightWithoutStatusBlock() / rows;
-                for (ValidationError error : errorList) {
+                errorList.forEach(error -> errorMarkerList.add(generateErrorMarker(space, error)));
-                    errorMarkerList.add(generateErrorMarker(space, error));
-                }
             }
         }
         getChildren().setAll(errorMarkerList);

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

@@ -1,3 +1,29 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 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.list;
 
 import javafx.application.Platform;
@@ -9,9 +35,6 @@ import javafx.scene.layout.Region;
 
 import java.util.function.UnaryOperator;
 
-/**
- * Created by abi on 05.08.2016.
- */
 public class GotoLineDialog extends Dialog<Integer> {
 
     private final GridPane grid;

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-2019 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
@@ -39,6 +39,7 @@ import org.springframework.stereotype.Component;
 import org.supercsv.prefs.CsvPreference;
 
 import java.net.URL;
+import java.nio.charset.Charset;
 import java.util.ResourceBundle;
 import java.util.function.UnaryOperator;
 
@@ -66,6 +67,9 @@ public class PreferencesController extends FXMLController {
     @FXML
     private ComboBox<String> quoteMode;
 
+    @FXML
+    private ComboBox<String> fileEncoding;
+
     private String endOfLineSymbols;
 
     private BooleanProperty valid = new SimpleBooleanProperty(true);
@@ -80,6 +84,7 @@ public class PreferencesController extends FXMLController {
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         quoteMode.getItems().addAll("normal", "always", "column");
+        fileEncoding.getItems().addAll(Charset.availableCharsets().keySet());
 
         UnaryOperator<TextFormatter.Change> allowOnlyOneCharacter = change -> {
             if (change.isContentChange()) {
@@ -117,6 +122,14 @@ public class PreferencesController extends FXMLController {
                 .build();
     }
 
+    public void setFileEncoding(String fileEncoding) {
+        this.fileEncoding.setValue(fileEncoding);
+    }
+
+    public String getFileEncoding() {
+        return fileEncoding.getValue();
+    }
+
     public boolean getValid() {
         return valid.get();
     }

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-2019 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
@@ -125,7 +125,7 @@ public class EditableValidationCell extends TableCell<CSVRow, CSVValue> {
         });
     }
 
-    private class ValueTextField extends TextField {
+    private static class ValueTextField extends TextField {
         private CSVValue value;
 
         public ValueTextField(CSVValue value) {

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-2019 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
@@ -47,7 +47,6 @@ public class ObservableMapValueFactory implements
     @Override
     public ObjectProperty<CSVValue> call(TableColumn.CellDataFeatures<CSVRow, CSVValue> features) {
         CSVRow row = features.getValue();
-        ObjectProperty<CSVValue> value = row.getColumns().get(key);
+        return row.getColumns().get(key);
-        return value;
     }
 }

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-2019 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-2019 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.fx.table.model;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import ninja.javafx.smartcsv.validation.RevalidationService;
-import ninja.javafx.smartcsv.validation.ValidationConfiguration;
+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;

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-2019 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/CSVValue.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 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/ColumnValueProvider.java

@@ -1,3 +1,29 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 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.table.model;
 
 /**

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-2019 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/util/I18nValidationUtil.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2019 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) {
+        errors.forEach(error -> message.append(getI18nValidatioMessage(resourceBundle, error)).append("\n"));
-            message.append(getI18nValidatioMessage(resourceBundle, validationError)).append("\n");
+
-        }
 
         if (message.toString().length() != 0) {
             return cutOffLastLineBreak(message.toString());
@@ -66,7 +65,7 @@ public class I18nValidationUtil {
 
         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());
@@ -78,7 +77,7 @@ public class I18nValidationUtil {
             } 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-2019 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/util/SaveFileService.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2019 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/validation/StringFormatEditorCellFactory.java

@@ -0,0 +1,61 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 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-2019 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-2019 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,12 +30,13 @@ 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;
+import org.fxmisc.richtext.model.StyleSpans;
-import org.fxmisc.richtext.StyleSpansBuilder;
+import org.fxmisc.richtext.model.StyleSpansBuilder;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -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,19 +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;
+    private TextField formatTextField;
-
-    @FXML
-    private CheckBox alphanumericRuleCheckBox;
-
-    @FXML
-    private CheckBox uniqueRuleCheckBox;
 
     @FXML
     private Spinner<Integer> minLengthSpinner;
@@ -116,9 +114,6 @@ public class ValidationEditorController extends FXMLController {
     @FXML
     private Spinner<Integer>  maxLengthSpinner;
 
-    @FXML
-    private TextField dateformatRuleTextField;
-
     @FXML
     private TextField regexpRuleTextField;
 
@@ -131,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;
 
@@ -170,25 +153,13 @@ public class ValidationEditorController extends FXMLController {
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-
+        initTypeAndFormatInput(resources);
-        minLengthSpinner.setValueFactory(new SpinnerValueFactory.IntegerSpinnerValueFactory(0, Integer.MAX_VALUE, 0));
+        initMinMaxSpinner();
-        maxLengthSpinner.setValueFactory(new SpinnerValueFactory.IntegerSpinnerValueFactory(0, Integer.MAX_VALUE, 0));
-
-        initCheckBox(notEmptyRuleCheckBox, enableNotEmptyRule);
-        initCheckBox(integerRuleCheckBox, enableIntegerRule);
-        initCheckBox(doublerRuleCheckBox, enableDoubleRule);
-        initCheckBox(alphanumericRuleCheckBox, enableAlphanumericRule);
-        initCheckBox(uniqueRuleCheckBox, enableUniqueRule);
         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() {
@@ -207,152 +178,236 @@ 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()) {
+        Field config = getCurrentFieldConfig();
-            validationConfiguration.setIntegerRuleFor(selectedColumn.getValue(), integerRuleCheckBox.isSelected());
+        config.setType(typeComboBox.getValue());
-        } else {
-            validationConfiguration.setIntegerRuleFor(selectedColumn.getValue(), null);
-        }
 
-        if (enableNotEmptyRule.isSelected()) {
+        switch (typeComboBox.getValue()) {
-            validationConfiguration.setNotEmptyRuleFor(selectedColumn.getValue(), notEmptyRuleCheckBox.isSelected());
+            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());
                 }
-
+                break;
-        if (enableUniqueRule.isSelected()) {
+            case INTEGER:
-            validationConfiguration.setUniqueRuleFor(selectedColumn.getValue(), uniqueRuleCheckBox.isSelected());
+            case NUMBER:
-        } else {
+            default:
-            validationConfiguration.setUniqueRuleFor(selectedColumn.getValue(), null);
+                // format: no options
-        }
+                config.setFormat(null);
-
+                break;
-        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);
         }
 
         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();
+            config.setConstraints(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() {
+    private Field getCurrentFieldConfig() {
+        return validationConfiguration.getFieldConfiguration(getSelectedColumn());
+    }
 
-        updateCheckBox(
+    private void addDependencyListener(CheckBox rule, CheckBox... dependentRules) {
-                notEmptyRuleCheckBox,
+        rule.selectedProperty().addListener((observable, oldValue, newValue) -> {
-                validationConfiguration.getNotEmptyRuleFor(getSelectedColumn()),
+            if (newValue) {
-                enableNotEmptyRule
+                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(
+        Constraints constraints = config.getConstraints();
-                integerRuleCheckBox,
+        updateCheckBox(constraints != null ? constraints.getRequired() : FALSE, enableNotEmptyRule);
-                validationConfiguration.getIntegerRuleFor(getSelectedColumn()),
+        updateCheckBox(constraints != null ? constraints.getUnique() : FALSE, enableUniqueRule);
-                enableIntegerRule
-        );
-
-        updateCheckBox(
-                doublerRuleCheckBox,
-                validationConfiguration.getDoubleRuleFor(getSelectedColumn()),
-                enableDoubleRule
-        );
-
-        updateCheckBox(
-                alphanumericRuleCheckBox,
-                validationConfiguration.getAlphanumericRuleFor(getSelectedColumn()),
-                enableAlphanumericRule
-        );
-
-        updateCheckBox(
-                uniqueRuleCheckBox,
-                validationConfiguration.getUniqueRuleFor(getSelectedColumn()),
-                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(value);
-            ruleEnabled.setSelected(true);
         }
     }
 
@@ -388,19 +443,10 @@ public class ValidationEditorController extends FXMLController {
             ruleEnabled.setSelected(false);
         } else {
             ruleEnabled.setSelected(true);
-            rule.replaceText(0, 0, value);
+            rule.replaceText(0, rule.getLength(), value);
         }
     }
 
-    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/CharsetHelper.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2019 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
@@ -24,23 +24,21 @@
 
 */
 
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.preferences;
 
-import com.google.gson.annotations.SerializedName;
+import java.nio.charset.Charset;
 
 /**
- * header configuration for the validation
+ * Helper class for getting charset's name
  */
-public class HeaderConfiguration {
+public class CharsetHelper {
 
-    @SerializedName("list")
+    public static String getCharsetName(String name) {
-    private String[] names ;
+        try {
-
+            return Charset.forName(name).name();
-    public String[] getNames() {
+        } catch (Exception e) {
-        return names;
+            return Charset.defaultCharset().name();
+        }
     }
 
-    public void setNames(String[] names) {
-        this.names = names;
-    }
 }

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

@@ -0,0 +1,62 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 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.preferences;
+
+import com.google.gson.GsonBuilder;
+import ninja.javafx.smartcsv.FileReader;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * file reader for the file encoding
+ */
+public class EncodingFileReader implements FileReader<String> {
+
+    private String fileEncoding;
+
+    public EncodingFileReader() {
+        fileEncoding = Charset.defaultCharset().name();
+    }
+
+    @Override
+    public String getContent() {
+        return fileEncoding;
+    }
+
+    @Override
+    public void read(File filename) throws IOException {
+        Map settings = new GsonBuilder().create().fromJson(new java.io.FileReader(filename), HashMap.class);
+        if (settings != null) {
+            fileEncoding = CharsetHelper.getCharsetName(settings.get("fileEncoding").toString());
+        }
+    }
+
+}

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

@@ -0,0 +1,59 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 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.preferences;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import ninja.javafx.smartcsv.FileWriter;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Save the file encoding to configuration file
+ */
+public class EncodingFileWriter implements FileWriter<String> {
+
+    private String fileEncoding;
+
+    @Override
+    public void setContent(String fileEncoding) {
+        this.fileEncoding = fileEncoding;
+    }
+
+    @Override
+    public void write(File filename) throws IOException {
+        Map<String, String> encodings = new HashMap<>();
+        encodings.put("fileEncoding", CharsetHelper.getCharsetName(fileEncoding));
+        Gson gson = new GsonBuilder().setPrettyPrinting().create();
+        Files.write(filename.toPath(), gson.toJson(encodings).getBytes());
+    }
+
+}

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-2019 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,7 +43,6 @@ import static ninja.javafx.smartcsv.preferences.QuoteModeHelper.getQuoteMode;
  */
 public class PreferencesFileReader implements FileReader<CsvPreference> {
 
-    private Map config;
     private CsvPreference csvPreference;
 
     public PreferencesFileReader() {
@@ -54,14 +53,14 @@ public class PreferencesFileReader implements FileReader<CsvPreference> {
 
     @Override
     public void read(File filename) throws IOException {
-        config = new GsonBuilder().create().fromJson(new java.io.FileReader(filename), HashMap.class);
+        Map config = new GsonBuilder().create().fromJson(new java.io.FileReader(filename), HashMap.class);
 
         if (config != null) {
             char quoteChar = config.get("quoteChar").toString().charAt(0);
             char delimiterChar = config.get("delimiterChar").toString().charAt(0);
             String endOfLineSymbols = config.get("endOfLineSymbols").toString();
-            boolean surroundingSpacesNeedQuotes = (Boolean)config.get("surroundingSpacesNeedQuotes");
+            boolean surroundingSpacesNeedQuotes = (Boolean) config.get("surroundingSpacesNeedQuotes");
-            boolean ignoreEmptyLines = (Boolean)config.get("ignoreEmptyLines");
+            boolean ignoreEmptyLines = (Boolean) config.get("ignoreEmptyLines");
             String quoteMode = config.get("quoteMode").toString();
 
             csvPreference = new CsvPreference.Builder(quoteChar, delimiterChar, endOfLineSymbols)

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-2019 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/preferences/QuoteModeHelper.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2019 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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 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/ValidationConfiguration.java

@@ -1,176 +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 getUniqueRuleFor(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) {
-        Double value = (Double)getValue(column, "maxlength");
-        return value != null ? doubleToInteger(value) : null;
-    }
-
-    public String getDateRuleFor(String column) {
-        return (String)getValue(column, "date");
-    }
-
-    public Boolean getAlphanumericRuleFor(String column) {
-        return (Boolean)getValue(column, "alphanumeric");
-    }
-
-    public String getRegexpRuleFor(String column) {
-        return (String)getValue(column, "regexp");
-    }
-
-    public List<String> getValueOfRuleFor(String column) {
-        return (List<String>)getValue(column, "value of");
-    }
-
-    public String getGroovyRuleFor(String column) {
-        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 setUniqueRuleFor(String column, Boolean value) {
-        setValue(column, value, "unique");
-    }
-
-
-    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 (columnConfigurations != null) {
-            Map rulesForColumn = columnConfigurations.get(column);
-            if (rulesForColumn != null) {
-                return columnConfigurations.get(column).get(key);
-            }
-        }
-        return null;
-    }
-
-    private boolean noHeader() {
-        return headerConfiguration == 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-2019 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/ValidationFileReader.java

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 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,10 +28,14 @@ package ninja.javafx.smartcsv.validation;
 
 import com.google.gson.GsonBuilder;
 import ninja.javafx.smartcsv.FileReader;
+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
  */
@@ -42,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-2019 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,6 +29,7 @@ package ninja.javafx.smartcsv.validation;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import ninja.javafx.smartcsv.FileWriter;
+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,52 @@
+package ninja.javafx.smartcsv.validation;
+
+import java.text.SimpleDateFormat;
+
+/**
+ * @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;
+            } else {
+                try {
+                    new SimpleDateFormat(format);
+                    return format;
+                } catch (IllegalArgumentException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        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-2019 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-2019 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
@@ -27,11 +27,19 @@
 package ninja.javafx.smartcsv.validation;
 
 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.List;
 import java.util.Map;
 
+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
  * Config against a given value
@@ -125,6 +133,15 @@ public class Validator {
         validationMap.put(validation.getType(), validation);
     }
 
+    private void remove(String column, Validation.Type type) {
+        Map<Validation.Type, Validation> validationMap = columnValidationMap.get(column);
+        if (validationMap == null) {
+            validationMap = new HashMap<>();
+            columnValidationMap.put(column, validationMap);
+        }
+        validationMap.remove(type);
+    }
+
     private void clear(String column) {
         Map<Validation.Type, Validation> validationMap = columnValidationMap.get(column);
         if (validationMap != null) {
@@ -134,68 +151,115 @@ public class Validator {
 
     private void initColumnValidations() {
         if (hasConfig()) {
-            String[] columns = validationConfig.headerNames();
+            for (Field column : validationConfig.getFields()) {
-            for (String column : columns) {
                 initializeColumnWithRules(column);
             }
         }
     }
 
-    private void initializeColumnWithRules(String column) {
+    private void initializeColumnWithRules(String columnName) {
-        Boolean alphaNumeric = validationConfig.getAlphanumericRuleFor(column);
+        if (hasConfig()) {
-        if (alphaNumeric != null && alphaNumeric) {
+            for (Field column : validationConfig.getFields()) {
-            add(column, new AlphaNumericValidation());
+                if (column.getName().equals(columnName)) {
+                    initializeColumnWithRules(column);
+                    break;
+                }
+            }
         }
 
-        Boolean doubleRule = validationConfig.getDoubleRuleFor(column);
-        if (doubleRule != null && doubleRule) {
-            add(column, new DoubleValidation());
     }
 
-        Boolean integerRule = validationConfig.getIntegerRuleFor(column);
+    private void initializeColumnWithRules(Field column) {
-        if (integerRule != null && integerRule) {
+
-            add(column, new IntegerValidation());
+        if (column.getType() != null) {
+            if (column.getType() == NUMBER) {
+                add(column.getName(), new DoubleValidation());
             }
 
-        Boolean notEmptyRule = validationConfig.getNotEmptyRuleFor(column);
+            if (column.getType() == INTEGER) {
-        if (notEmptyRule != null && notEmptyRule) {
+                add(column.getName(), new IntegerValidation());
-            add(column, new NotEmptyValidation());
             }
 
-        Boolean uniqueRule = validationConfig.getUniqueRuleFor(column);
+            if (column.getType() == DATE) {
-        if (uniqueRule != null && uniqueRule) {
+                String format = dateFormat(column.getFormat(), "yyyy-MM-dd");
-            add(column, new UniqueValidation(columnValueProvider, column));
+                add(column.getName(), new DateValidation(format));
             }
 
-        String dateRule = validationConfig.getDateRuleFor(column);
+            if (column.getType() == DATETIME) {
-        if (dateRule != null && !dateRule.trim().isEmpty()) {
+                String format = dateFormat(column.getFormat(), "yyyy-MM-ddThh:mm:ssZ");
-            add(column, new DateValidation(dateRule));
+                add(column.getName(), new DateValidation(format));
             }
 
-        Integer minLength = validationConfig.getMinLengthRuleFor(column);
+            if (column.getType() == TIME) {
-        if (minLength != null) {
+                String format = dateFormat(column.getFormat(), "hh:mm:ss");
-            add(column, new MinLengthValidation(minLength));
+                add(column.getName(), new DateValidation(format));
             }
 
-        Integer maxLength = validationConfig.getMaxLengthRuleFor(column);
+            if (column.getType() == STRING && column.getFormat() == null) {
-        if (maxLength != null) {
+                remove(column.getName(), Validation.Type.STRING);
-            add(column, new MaxLengthValidation(maxLength));
+            } else {
+
+                if (column.getType() == STRING && column.getFormat().equalsIgnoreCase(EMAIL.getExternalValue())) {
+                    add(column.getName(), new EmailValidation());
                 }
 
-        String regexp = validationConfig.getRegexpRuleFor(column);
+                if (column.getType() == STRING && column.getFormat().equalsIgnoreCase(URI.getExternalValue())) {
-        if (regexp != null && !regexp.trim().isEmpty()) {
+                    add(column.getName(), new UriValidation());
-            add(column, new RegExpValidation(regexp));
                 }
 
-        String groovy = validationConfig.getGroovyRuleFor(column);
+                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());
+                }
+
+            }
+        }
+
+        String groovy = column.getGroovy();
         if (groovy != null && !groovy.trim().isEmpty()) {
-            add(column, new GroovyValidation(groovy));
+            add(column.getName(), new GroovyValidation(groovy));
         }
-        List<String> valueOfRule = validationConfig.getValueOfRuleFor(column);
+
+        Constraints constraints = column.getConstraints();
+        if (constraints != null) {
+            Boolean notEmptyRule = constraints.getRequired();
+            if (notEmptyRule != null && notEmptyRule) {
+                add(column.getName(), new NotEmptyValidation());
+            }
+
+            Boolean uniqueRule = constraints.getUnique();
+            if (uniqueRule != null && uniqueRule) {
+                add(column.getName(), new UniqueValidation(columnValueProvider, column.getName()));
+            }
+
+            Integer minLength = constraints.getMinLength();
+            if (minLength != null) {
+                add(column.getName(), new MinLengthValidation(minLength));
+            }
+
+            Integer maxLength = constraints.getMaxLength();
+            if (maxLength != null) {
+                add(column.getName(), new MaxLengthValidation(maxLength));
+            }
+
+            String regexp = constraints.getPattern();
+            if (regexp != null && !regexp.trim().isEmpty()) {
+                add(column.getName(), new RegExpValidation(regexp));
+            }
+
+
+
+            List<String> valueOfRule =  constraints.getEnumeration();
             if (valueOfRule != null && !valueOfRule.isEmpty()) {
-            add(column, new ValueOfValidation(valueOfRule));
+                add(column.getName(), new ValueOfValidation(valueOfRule));
             }
         }
+    }
+
+
 
 
     public ValidationError isHeaderValid(String[] headerNames) {
@@ -227,4 +291,6 @@ public class Validator {
         }
         return result;
     }
+
+
 }

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

@@ -0,0 +1,50 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 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,7 +23,9 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
 
 import static org.apache.commons.validator.GenericValidator.isDate;
 

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 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,7 +23,9 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
 
 import static org.apache.commons.validator.GenericValidator.isDouble;
 

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 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,25 +23,25 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
 
-import static org.apache.commons.validator.GenericValidator.matchRegexp;
+import ninja.javafx.smartcsv.validation.ValidationError;
+import org.apache.commons.validator.routines.EmailValidator;
 
 /**
- * Checks if the value is alpha numeric
+ * checks if the value is a valid email address
  */
-public class AlphaNumericValidation extends EmptyValueIsValid {
+public class EmailValidation extends EmptyValueIsValid {
+
     @Override
     public void check(int row, String value, ValidationError error) {
-        if (!matchRegexp(value, "[0-9a-zA-Z]*")) {
+        if (!EmailValidator.getInstance().isValid(value)) {
-            error.add("validation.message.alphanumeric");
+            error.add("validation.message.email");
         }
     }
 
     @Override
     public Type getType() {
-        return Type.ALPHANUMERIC;
+        return Type.STRING;
     }
-
-
 }

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

@@ -1,4 +1,4 @@
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
 
 /**
  * validations based on this are not validated when the value is null or empty

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 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,11 +23,12 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+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;
 
 /**
@@ -36,11 +37,11 @@ import org.codehaus.groovy.control.CompilationFailedException;
 public class GroovyValidation extends EmptyValueIsValid {
 
     private String groovyScript;
-    private GroovyShell shell = new GroovyShell();
     private Script script;
 
     public GroovyValidation(String groovyScript) {
         this.groovyScript = groovyScript;
+        GroovyShell shell = new GroovyShell();
         script = shell.parse(groovyScript);
     }
 

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-2019 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,7 +23,9 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
 
 import static org.apache.commons.validator.GenericValidator.isInt;
 

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 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,7 +23,9 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
 
 import static org.apache.commons.validator.GenericValidator.maxLength;
 

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 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,7 +23,9 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
 
 import static org.apache.commons.validator.GenericValidator.minLength;
 

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 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,7 +23,9 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
 
 import static org.apache.commons.validator.GenericValidator.isBlankOrNull;
 

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 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,7 +23,9 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
 
 import static org.apache.commons.validator.GenericValidator.matchRegexp;
 

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 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,9 +23,10 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+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;

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

@@ -0,0 +1,51 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 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,51 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 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 {
+
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    @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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 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,14 +23,16 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+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, ALPHANUMERIC, REGEXP, VALUE_OF, GROOVY }
+    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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 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,7 +23,9 @@
    THE SOFTWARE.
 
 */
-package ninja.javafx.smartcsv.validation;
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
 
 import java.util.List;
 

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

@@ -0,0 +1,96 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 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-2019 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-2019 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-2019 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-2019 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,21 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
+<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.*?>
+<?import javafx.scene.control.Hyperlink?>
-<?import javafx.scene.layout.*?>
+<?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.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">
+
+<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.76-ea" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-      <Label text="SmartCSV.fx">
-         <font>
-            <Font size="18.0" />
-         </font>
-         <VBox.margin>
-            <Insets top="8.0" />
-         </VBox.margin>
-      </Label>
-      <Label text="A simple JavaFX application to load, save and edit a CSV file and provide a JSON configuration for columns " wrapText="true" />
-      <Label text="to check the values in the columns." />
       <Label text="Thanks for contributions:">
          <font>
             <Font size="18.0" />
@@ -25,6 +22,7 @@
          </VBox.margin>
       </Label>
       <Label text="AOE Takashi (https://github.com/aoetk)" />
+      <Label text="Hasan Kara (https://github.com/haisi)" />
       <Label text="3rd party software">
          <VBox.margin>
             <Insets top="8.0" />
@@ -41,17 +39,17 @@
                 <ColumnConstraints hgrow="ALWAYS" minWidth="10.0" />
               </columnConstraints>
               <rowConstraints>
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                  <RowConstraints minHeight="10.0" prefHeight="20.0" vgrow="SOMETIMES" />
               </rowConstraints>
                <children>
                   <Label text="junit" />
@@ -91,7 +89,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-2019 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.7
+application.version = 1.0.0
 
 # fxml views
 fxml.smartcvs.view = /ninja/javafx/smartcsv/fx/smartcsv.fxml

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

@@ -14,6 +14,7 @@
     <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER" />
       <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER" />
       <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER" />
+      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="NEVER" />
   </rowConstraints>
    <children>
       <Label text="%preferences.quoteChar" />
@@ -26,6 +27,8 @@
       <CheckBox fx:id="ignoreEmptyLines" mnemonicParsing="false" text="" GridPane.columnIndex="1" GridPane.rowIndex="3" />
       <Label text="%preferences.quoteMode" GridPane.rowIndex="4" />
       <ComboBox fx:id="quoteMode" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+      <Label text="%preferences.fileEncoding" GridPane.rowIndex="5" />
+      <ComboBox fx:id="fileEncoding" editable="true" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="5" />
    </children>
    <padding>
       <Insets bottom="8.0" left="8.0" right="8.0" top="8.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;
 }
 

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

@@ -41,11 +41,13 @@ preferences.delimiterChar = Delimiter character:
 preferences.ignoreEmptyLines = Ignore empty lines:
 preferences.surroundingSpacesNeedQuotes = Surrounding spaces need quotes:
 preferences.quoteMode = Quote mode:
+preferences.fileEncoding = File encoding:
 
 # validaton messages
 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
@@ -55,25 +57,30 @@ validation.message.date.format = is not a date of format {0}
 validation.message.regexp = does not match {0}
 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.not_empty = not empty
-validation.rule.label.integer = integer:
+validation.rule.label.integer = integer
-validation.rule.label.double = double:
+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.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}"
@@ -85,3 +92,9 @@ 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

@@ -50,11 +50,13 @@ preferences.delimiterChar = Trennzeichen:
 preferences.ignoreEmptyLines = Leere Zeilen ignorieren:
 preferences.surroundingSpacesNeedQuotes = Leerzeichen einfassen:
 preferences.quoteMode = Einfassungsmodus:
+preferences.fileEncoding = Dateicodierung:
 
 # validaton messages
 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"
@@ -64,14 +66,17 @@ validation.message.date.format = Das Datumsformat entspricht nicht {0}
 validation.message.regexp = entspricht nicht dem regul\u00e4ren Ausdruck {0}
 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.not_empty = Nicht leer
-validation.rule.label.integer = Zahl:
+validation.rule.label.integer = Zahl
-validation.rule.label.double = Gleitkommazahl:
+validation.rule.label.double = Gleitkommazahl
 validation.rule.label.minlength = Minimale L\u00e4nge:
 validation.rule.label.maxlength = Maximale L\u00e4nge:
 validation.rule.label.dateformat = Datumsformat:
@@ -82,7 +87,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.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}"
@@ -95,3 +102,9 @@ 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,68 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?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">
+<?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.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import org.fxmisc.richtext.CodeArea?>
+
+<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 halignment="LEFT" hgrow="NEVER" />
-    <ColumnConstraints hgrow="NEVER" />
+        <ColumnConstraints halignment="LEFT" hgrow="ALWAYS" />
-    <ColumnConstraints 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" valignment="TOP" vgrow="ALWAYS" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+        <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" 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>
     <children>
-      <Label text="%validation.rule.label.not_empty" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+        <Label text="%validation.rule.type" GridPane.columnSpan="2" GridPane.halignment="LEFT" GridPane.hgrow="ALWAYS" />
-      <Label text="%validation.rule.label.integer" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+        <Label text="%validation.rule.format" GridPane.columnSpan="2" GridPane.halignment="LEFT" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" />
-      <Label text="%validation.rule.label.double" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+        <ComboBox fx:id="typeComboBox" maxWidth="1.7976931348623157E308" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.halignment="LEFT" GridPane.hgrow="ALWAYS" />
-      <Label text="%validation.rule.label.minlength" GridPane.columnIndex="1" GridPane.rowIndex="6" />
+        <ComboBox fx:id="formatComboBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="1" visible="false" />
-      <Label text="%validation.rule.label.maxlength" GridPane.columnIndex="1" GridPane.rowIndex="7" />
+        <TextField fx:id="formatTextField" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="1" visible="false" />
-      <Label text="%validation.rule.label.dateformat" GridPane.columnIndex="1" GridPane.rowIndex="8" />
+        <CheckBox fx:id="enableNotEmptyRule" mnemonicParsing="false" text="%validation.rule.label.not_empty" GridPane.rowIndex="3" />
-      <Label text="%validation.rule.label.alphanumeric" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+        <CheckBox fx:id="enableUniqueRule" mnemonicParsing="false" text="%validation.rule.label.unique" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-      <Label text="%validation.rule.label.regexp" GridPane.columnIndex="1" GridPane.rowIndex="9" />
+        <CheckBox fx:id="enableMinLengthRule" mnemonicParsing="false" text="%validation.rule.label.minlength" GridPane.rowIndex="4" />
-      <Label text="%validation.rule.label.value_of" GridPane.columnIndex="1" GridPane.rowIndex="10" />
+        <Spinner fx:id="minLengthSpinner" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-      <Label text="%validation.rule.label.groovy" GridPane.columnIndex="1" GridPane.rowIndex="11" />
+        <CheckBox fx:id="enableMaxLengthRule" mnemonicParsing="false" text="%validation.rule.label.maxlength" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-      <Label text="%validation.rule.label.unique" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+        <Spinner fx:id="maxLengthSpinner" GridPane.columnIndex="3" GridPane.rowIndex="4" />
-       <CheckBox fx:id="enableNotEmptyRule" mnemonicParsing="false" GridPane.rowIndex="1" />
+        <CheckBox fx:id="enableRegexpRule" mnemonicParsing="false" text="%validation.rule.label.regexp" GridPane.rowIndex="5" />
-      <CheckBox fx:id="notEmptyRuleCheckBox" mnemonicParsing="false" GridPane.columnIndex="2" GridPane.rowIndex="1" />
+        <TextField fx:id="regexpRuleTextField" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="5" />
-       <CheckBox fx:id="enableIntegerRule" mnemonicParsing="false" GridPane.rowIndex="2" />
+        <CheckBox fx:id="enableValueOfRule" mnemonicParsing="false" text="%validation.rule.label.value_of" GridPane.rowIndex="6" />
-      <CheckBox fx:id="integerRuleCheckBox" mnemonicParsing="false" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+        <TextField fx:id="valueOfRuleTextField" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="6" />
-       <CheckBox fx:id="enableDoubleRule" mnemonicParsing="false" GridPane.rowIndex="3" />
+        <CheckBox fx:id="enableGroovyRule" mnemonicParsing="false" text="%validation.rule.label.groovy" GridPane.rowIndex="7">
-      <CheckBox fx:id="doublerRuleCheckBox" mnemonicParsing="false" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+            <GridPane.margin>
-       <CheckBox fx:id="enableAlphanumericRule" mnemonicParsing="false" GridPane.rowIndex="4" />
+                <Insets top="8.0" />
-      <CheckBox fx:id="alphanumericRuleCheckBox" mnemonicParsing="false" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+            </GridPane.margin>
-       <CheckBox fx:id="enableUniqueRule" mnemonicParsing="false" GridPane.rowIndex="5" />
+        </CheckBox>
-      <CheckBox fx:id="uniqueRuleCheckBox" mnemonicParsing="false" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+        <CodeArea fx:id="groovyRuleTextArea" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="7">
-       <CheckBox fx:id="enableMinLengthRule" mnemonicParsing="false" GridPane.rowIndex="6" />
+            <GridPane.margin>
-      <Spinner fx:id="minLengthSpinner" GridPane.columnIndex="2" GridPane.rowIndex="6" />
+                <Insets top="8.0" />
-       <CheckBox fx:id="enableMaxLengthRule" mnemonicParsing="false" GridPane.rowIndex="7" />
+            </GridPane.margin>
-      <Spinner fx:id="maxLengthSpinner" GridPane.columnIndex="2" GridPane.rowIndex="7" />
+        </CodeArea>
-       <CheckBox fx:id="enableDateRule" mnemonicParsing="false" GridPane.rowIndex="8" />
+        <Separator prefWidth="200.0" GridPane.columnSpan="4" GridPane.rowIndex="2" />
-      <TextField fx:id="dateformatRuleTextField" GridPane.columnIndex="2" GridPane.rowIndex="8" />
-       <CheckBox fx:id="enableRegexpRule" mnemonicParsing="false" GridPane.rowIndex="9" />
-      <TextField fx:id="regexpRuleTextField" GridPane.columnIndex="2" GridPane.rowIndex="9" />
-       <CheckBox fx:id="enableValueOfRule" mnemonicParsing="false" GridPane.rowIndex="10" />
-      <TextField fx:id="valueOfRuleTextField" GridPane.columnIndex="2" GridPane.rowIndex="10" />
-       <CheckBox fx:id="enableGroovyRule" mnemonicParsing="false" GridPane.rowIndex="11" />
-      <CodeArea fx:id="groovyRuleTextArea" prefHeight="300.0" prefWidth="200.0" GridPane.columnIndex="2" GridPane.rowIndex="11" GridPane.rowSpan="2" />
-      <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" />
 
     </children>
     <padding>

src/test/java/ninja/javafx/smartcsv/files/FileStorageTest.java

@@ -0,0 +1,109 @@
+package ninja.javafx.smartcsv.files;
+
+import ninja.javafx.smartcsv.FileReader;
+import ninja.javafx.smartcsv.FileWriter;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.*;
+import static org.mockito.Mockito.*;
+
+public class FileStorageTest {
+
+    private FileReader<String> reader;
+    private FileWriter<String> writer;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // subject under test
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    private FileStorage<String> sut;
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // init
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    @BeforeEach
+    public void initialize() {
+        reader = mock(FileReader.class);
+        writer = mock(FileWriter.class);
+        sut = new FileStorage<>(reader, writer);
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    // tests
+    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    @Test
+    public void setFile_ShouldStoreFile() {
+
+        // pre execution assertion
+        assertThat("get file returns null",  sut.getFile(), nullValue());
+        assertThat("property is null", sut.fileProperty().isNull().get(), equalTo(true));
+
+        // execution
+        final File file = new File("file");
+        sut.setFile(file);
+
+        // assertion
+        assertThat("get file returns the file", sut.getFile(), sameInstance(file));
+        assertThat("property is not null", sut.fileProperty().isNull().get(), equalTo(false));
+    }
+
+    @Test
+    public void load_ShouldReadContentFromReader() throws Exception {
+        // setup
+        final File file = new File("file");
+        sut.setFile(file);
+        when(reader.getContent()).thenReturn("CONTENT");
+
+        // execution
+        sut.load();
+
+        // assertion
+        verify(reader).read(file);
+        assertThat("content is set", sut.getContent(), equalTo("CONTENT"));
+    }
+
+    @Test
+    public void load_ShouldResetFileChangedProperty() throws Exception {
+        // setup
+        sut.setFileChanged(true);
+        when(reader.getContent()).thenReturn("CONTENT");
+
+        // execution
+        sut.load();
+
+        // assertion
+        assertThat("file changed is reset", sut.isFileChanged(), equalTo(false));
+    }
+
+    @Test
+    public void save_ShouldWriteContentToWriter() throws Exception {
+        // setup
+        final String content = "CONTENT";
+        sut.setContent(content);
+        final File file = new File("file");
+        sut.setFile(file);
+
+        // execution
+        sut.save();
+
+        // assertion
+        verify(writer).setContent(content);
+        verify(writer).write(file);
+    }
+
+    @Test
+    public void save_ShouldResetFileChangedProperty() throws Exception {
+        // setup
+        sut.setFileChanged(true);
+
+        // execution
+        sut.save();
+
+        // assertion
+        assertThat("file changed is reset", sut.isFileChanged(), equalTo(false));
+    }
+
+}

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-2019 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,7 +26,7 @@
 
 package ninja.javafx.smartcsv.fx.table.model;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertThat;
@@ -39,14 +39,13 @@ public class CSVModelTest {
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // constants
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    static final String TESTHEADER = "TESTHEADER";
+    private static final String TESTHEADER = "TESTHEADER";
-    static final String TESTVALUE = "TESTVALUE";
+    private static final String TESTVALUE = "TESTVALUE";
-    static final String FILEPATH = "filepath";
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // subject under test
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    CSVModel sut = new CSVModel();
+    private CSVModel sut = new CSVModel();
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // tests

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

@@ -1,6 +1,6 @@
 package ninja.javafx.smartcsv.fx.table.model;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.is;
@@ -14,13 +14,13 @@ public class CSVRowTest {
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // constants
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    static final String COLUMN = "COLUMN";
+    private static final String COLUMN = "COLUMN";
-    static final String VALUE = "VALUE";
+    private static final String VALUE = "VALUE";
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // subject under test
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    CSVRow sut = new CSVRow();
+    private CSVRow sut = new CSVRow();
 
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

src/test/java/ninja/javafx/smartcsv/preferences/CharsetHelperTest.java

@@ -0,0 +1,57 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 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.preferences;
+
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class CharsetHelperTest {
+
+    @Test
+    public void getCharsetName_known_charset() {
+        String result = CharsetHelper.getCharsetName("UTF-16");
+        assertEquals(StandardCharsets.UTF_16.name(), result);
+        assertNotEquals(StandardCharsets.UTF_16.name(), Charset.defaultCharset());
+    }
+
+    @Test
+    public void getCharsetName_unknown_charset() {
+        String result = CharsetHelper.getCharsetName("foobar");
+        assertEquals(Charset.defaultCharset().name(), result);
+    }
+
+    @Test
+    public void getCharsetName_null_charset() {
+        String result = CharsetHelper.getCharsetName(null);
+        assertEquals(Charset.defaultCharset().name(), result);
+    }
+
+}

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-2019 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,17 +28,16 @@ package ninja.javafx.smartcsv.validation;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import org.junit.Before;
+import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
-import org.junit.Test;
+import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.params.provider.Arguments;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.provider.MethodSource;
 
-import java.util.Collection;
 import java.util.List;
+import java.util.stream.Stream;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
-import static java.util.stream.Collectors.joining;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
@@ -46,50 +45,22 @@ import static org.junit.Assert.assertTrue;
 /**
  * unit test for header validator
  */
-@RunWith(Parameterized.class)
 public class HeaderValidationTest {
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // parameters
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    private ValidationConfiguration config;
-    private Boolean expectedResult;
-    private List<ValidationMessage> expectedErrors;
-    private String[] headerNames;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // subject under test
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    private Validator sut;
-
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // parameterized constructor
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    public HeaderValidationTest(String configHeaderNames,
-                                String[] headerNames,
-                                Boolean expectedResult,
-                                List<ValidationMessage> expectedErrors) {
-        Gson gson = new GsonBuilder().create();
-        this.config = gson.fromJson(configHeaderNames, ValidationConfiguration.class);
-        this.headerNames = headerNames;
-        this.expectedResult = expectedResult;
-        this.expectedErrors = expectedErrors;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // init
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    @Before
-    public void initialize() {
-        sut = new Validator(config);
-    }
-
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // tests
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    @Test
+    @ParameterizedTest
-    public void validation() {
+    @MethodSource("validationConfigurations")
+    public void validation(String configHeaderNames,
+                           String[] headerNames,
+                           Boolean expectedResult,
+                           List<ValidationMessage> expectedErrors) {
+        // setup
+        Gson gson = new GsonBuilder().create();
+        ValidationConfiguration config = gson.fromJson(configHeaderNames, ValidationConfiguration.class);
+        Validator sut = new Validator(config, new TestColumnValueProvider());
+
         // execution
         ValidationError result = sut.isHeaderValid(headerNames);
 
@@ -103,19 +74,33 @@ public class HeaderValidationTest {
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // parameters for tests
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    @Parameterized.Parameters
+    public static Stream<Arguments> validationConfigurations() {
-    public static Collection validationConfigurations() {
+        return Stream.of(
-        return asList(new Object[][] {
+                Arguments.of( json(), new String[] {}, true, null ),
-                { json(), new String[] {}, true, null },
+                Arguments.of( json("a"), new String[] {"a"}, true, null ),
-                { json("a"), new String[] {"a"}, true, null },
+                Arguments.of( json("a"), new String[] {"b"}, false, singletonList(new ValidationMessage("validation.message.header.match", "0", "a", "b"))),
-                { json("a"), new String[] {"b"}, false, singletonList(new ValidationMessage("validation.message.header.match", "0", "a", "b"))},
+                Arguments.of( json("a"), new String[] {"a","b"}, false, singletonList(new ValidationMessage("validation.message.header.length", "2", "1"))),
-                { json("a"), new String[] {"a","b"}, false, singletonList(new ValidationMessage("validation.message.header.length", "2", "1"))},
+                Arguments.of( json("a", "b"), new String[] {"b", "a"}, false, asList(new ValidationMessage("validation.message.header.match", "0", "a", "b"), new ValidationMessage("validation.message.header.match", "1", "b", "a")) )
-                { json("a", "b"), new String[] {"b", "a"}, false, asList(new ValidationMessage("validation.message.header.match", "0", "a", "b"), new ValidationMessage("validation.message.header.match", "1", "b", "a")) }
+        );
-        });
     }
 
+    @SuppressWarnings("StringConcatenationInLoop")
     public static String json(String... headerNames) {
-        return "{\"headers\":{\"list\":[" + asList(headerNames).stream().collect(joining(", ")) + "]}}";
+
+        String json = "{ \"fields\": [";
+
+        for (String headerName: headerNames) {
+            json += "{\"name\" : \""+headerName+"\" },";
+        }
+
+        if (headerNames != null && headerNames.length > 0) {
+            json = json.substring(0, json.length() - 1);
+        }
+
+        json += "]}";
+
+
+        return  json;
     }
 
 }

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

@@ -0,0 +1,18 @@
+package ninja.javafx.smartcsv.validation;
+
+import ninja.javafx.smartcsv.fx.table.model.ColumnValueProvider;
+
+/**
+ * @author abi
+ */
+public class TestColumnValueProvider implements ColumnValueProvider {
+    @Override
+    public String getValue(int row, String column) {
+        return null;
+    }
+
+    @Override
+    public int getNumberOfRows() {
+        return 0;
+    }
+}

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

@@ -2,13 +2,13 @@ package ninja.javafx.smartcsv.validation;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import org.junit.Before;
+import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
-import org.junit.Test;
+import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.params.provider.Arguments;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.provider.MethodSource;
 
-import java.util.Collection;
 import java.util.List;
+import java.util.stream.Stream;
 
 import static java.util.Arrays.asList;
 import static java.util.stream.Collectors.joining;
@@ -19,61 +19,24 @@ import static org.junit.Assert.assertThat;
 /**
  * unit test for validator
  */
-@RunWith(Parameterized.class)
 public class ValidatorTest {
 
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // parameters
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    private ValidationConfiguration config;
-    private String column;
-    private String value;
-    private Boolean expectedResult;
-    private ValidationMessage expectedError;
-
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // subject under test
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    private Validator sut;
-
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // parameterized constructor
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    public ValidatorTest(String config,
-                         String column,
-                         String value,
-                         Boolean expectedResult,
-                         ValidationMessage expectedError) {
-        System.out.println(config);
-        Gson gson = new GsonBuilder().create();
-        this.config = gson.fromJson(config, ValidationConfiguration.class);
-        this.column = column;
-        this.value = value;
-        this.expectedResult = expectedResult;
-        this.expectedError = expectedError;
-    }
-
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // init
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    @Before
-    public void initialize() {
-       sut = new Validator(config);
-    }
-
-
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // tests
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    @Test
+    @ParameterizedTest
-    public void validation() {
+    @MethodSource("validationConfigurations")
-        System.out.println(column + "  " + value + "  " + expectedResult + "  " + expectedError);
+    public void validation(String config,
+                           String value,
+                           Boolean expectedResult,
+                           ValidationMessage expectedError) {
+        // setup
+        Gson gson = new GsonBuilder().create();
+        ValidationConfiguration validationConfiguration = gson.fromJson(config, ValidationConfiguration.class);
+        Validator sut = new Validator(validationConfiguration, new TestColumnValueProvider());
 
         // execution
-        ValidationError result = sut.isValid(0, column, value);
+        ValidationError result = sut.isValid(0, "column", value);
 
         // assertion
         assertThat(result == null, is(expectedResult));
@@ -85,45 +48,80 @@ public class ValidatorTest {
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // parameters for tests
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    @Parameterized.Parameters
+    public static Stream<Arguments> validationConfigurations() {
-    public static Collection validationConfigurations() {
+        return Stream.of(
-        return asList(new Object[][] {
+                Arguments.of( constraintsJSON("string", "required", true),  "value", true, null ),
-                { json("column", "not empty", true), "column", "value", true, null },
+                Arguments.of( constraintsJSON("string", "required", true),  "", false, new ValidationMessage("validation.message.not.empty") ),
-                { json("column", "not empty", true), "column", "", false, new ValidationMessage("validation.message.not.empty") },
+                Arguments.of( constraintsJSON("string", "required", true),  null, false, new ValidationMessage("validation.message.not.empty") ),
-                { json("column", "not empty", true), "column", null, false, new ValidationMessage("validation.message.not.empty") },
+                Arguments.of( constraintsJSON("integer", null, true),  "999", true, null ),
-                { json("column", "integer", true), "column", "999", true, null },
+                Arguments.of( constraintsJSON("integer", null, true),  "a", false, new ValidationMessage("validation.message.integer") ),
-                { json("column", "integer", true), "column", "a", false, new ValidationMessage("validation.message.integer") },
+                Arguments.of( constraintsJSON("number", null, true),  "999", true, null ),
-                { json("column", "double", true), "column", "999", true, null },
+                Arguments.of( constraintsJSON("number", null, true),  "999.000", true, null ),
-                { json("column", "double", true), "column", "999.000", true, null },
+                Arguments.of( constraintsJSON("number", null, true),  "a", false, new ValidationMessage("validation.message.double") ),
-                { json("column", "double", true), "column", "a", false, new ValidationMessage("validation.message.double") },
+                Arguments.of( constraintsJSON("string", "minLength", 2),  "12", true, null ),
-                { json("column", "minlength", 2), "column", "12", true, null },
+                Arguments.of( constraintsJSON("string", "minLength", 2),  "1", false, new ValidationMessage("validation.message.min.length", "2") ),
-                { json("column", "minlength", 2), "column", "1", false, new ValidationMessage("validation.message.min.length", "2") },
+                Arguments.of( constraintsJSON("string", "maxLength", 2),  "12", true, null ),
-                { json("column", "maxlength", 2), "column", "12", true, null },
+                Arguments.of( constraintsJSON("string", "maxLength", 2),  "123", false, new ValidationMessage("validation.message.max.length", "2") ),
-                { json("column", "maxlength", 2), "column", "123", false, new ValidationMessage("validation.message.max.length", "2") },
+                Arguments.of( constraintsJSON("string", "pattern", "[a-z]*"),  "abc", true, null ),
-                { json("column", "date", "yyyyMMdd"), "column", "20151127", true, null },
+                Arguments.of( constraintsJSON("string", "pattern", "[a-z]*"),  "abcA", false, new ValidationMessage("validation.message.regexp", "[a-z]*") ),
-                { json("column", "date", "yyyyMMdd"), "column", "27.11.2015", false, new ValidationMessage("validation.message.date.format", "yyyyMMdd") },
+                Arguments.of( constraintsJSON("string", "enum", asList("a","b","c","d","e")),  "c", true, null ),
-                { json("column", "alphanumeric", true), "column", "abcABC123", true, null },
+                Arguments.of( constraintsJSON("string", "enum", asList("a","b","c","d","e")),  "f", false, new ValidationMessage("validation.message.value.of", "f", "a, b, c, d, e") ),
-                { json("column", "alphanumeric", true), "column", "-abcABC123", false, new ValidationMessage("validation.message.alphanumeric") },
+
-                { json("column", "regexp", "[a-z]*"), "column", "abc", true, null },
+                Arguments.of( formatJSON("string", null), "some string", true, null ),
-                { json("column", "regexp", "[a-z]*"), "column", "abcA", false, new ValidationMessage("validation.message.regexp", "[a-z]*") },
+                Arguments.of( formatJSON("string", "email"), "test@javafx.ninja", true, null ),
-                { json("column", "groovy", "value.contains('a')? 'true' : 'no a inside'"), "column", "abcdef", true, null },
+                Arguments.of( formatJSON("string", "email"), "wrong email", false, new ValidationMessage("validation.message.email") ),
-                { json("column", "groovy", "value.contains('a')? 'true' : 'no a inside'"), "column", "bcdefg", false, new ValidationMessage("no a inside") },
+                Arguments.of( formatJSON("string", "uri"), "http://www.javafx.ninja", true, null ),
-                { json("column", "value of", asList("a","b","c","d","e")), "column", "c", true, null },
+                Arguments.of( formatJSON("string", "uri"), "!$%&/()", false, new ValidationMessage("validation.message.uri") ),
-                { json("column", "value of", asList("a","b","c","d","e")), "column", "f", false, new ValidationMessage("validation.message.value.of", "f", "a, b, c, d, e") },
+                Arguments.of( formatJSON("string", "binary"), "dGVzdA==", true, null ),
-        });
+                Arguments.of( formatJSON("string", "binary"), "no binary", false, new ValidationMessage("validation.message.binary") ),
+                Arguments.of( formatJSON("string", "uuid"), "6ba7b810-9dad-11d1-80b4-00c04fd430c8", true, null ),
+                Arguments.of( formatJSON("string", "uuid"), "no uuid", false, new ValidationMessage("validation.message.uuid") ),
+                Arguments.of( formatJSON("date", null),  "2015-11-27", true, null ),
+                Arguments.of( formatJSON("date", null),  "27.11.2015", false, new ValidationMessage("validation.message.date.format", "yyyy-MM-dd") ),
+                Arguments.of( formatJSON("date", "yyyyMMdd"),  "20151127", true, null ),
+                Arguments.of( formatJSON("date", "yyyyMMdd"),  "27.11.2015", false, new ValidationMessage("validation.message.date.format", "yyyyMMdd") ),
+
+                Arguments.of( customAttributeJSON( "groovy", "value.contains('a')? 'true' : 'no a inside'"),  "abcdef", true, null ),
+                Arguments.of( customAttributeJSON( "groovy", "value.contains('a')? 'true' : 'no a inside'"),  "bcdefg", false, new ValidationMessage("no a inside") )
+        );
     }
 
-    public static String json(String column, String rule, Object value) {
+    public static String constraintsJSON(String type, String constraint, Object value) {
-        String json = "{\"headers\": { \"list\": [\""+column+"\"]},\"columns\":{\"" + column + "\":{\"" + rule + "\":";
+        String json = "{\"fields\": [ { \"name\": \"column\", \"type\" : \"" + type +"\"";
+
+        if (constraint != null) {
+            json += ", \"constraints\": { \"" + constraint + "\":";
             if (value instanceof String) {
-            json += "\""+ value + "\"";
+                json += "\"" + value + "\"";
             } else if (value instanceof List) {
-            List<String> list = (List<String>)value;
+                List<String> list = (List<String>) value;
                 json += "[" + list.stream().collect(joining(", ")) + "]";
             } else {
                 json += value;
             }
-        json += "}}}";
+            json += "}";
+        }
+        json += "}]}";
+        return json;
+    }
+
+    public static String formatJSON(String type, String format) {
+        String json = "{\"fields\": [ { \"name\": \"column\", \"type\" : \"" + type +"\"";
+
+        if (format != null) {
+            json += ", \"format\": \"" + format + "\"";
+        }
+        json += "}]}";
+        return json;
+    }
+
+    public static String customAttributeJSON(String attribute, String value) {
+        String json = "{\"fields\": [ { \"name\": \"column\", \"type\" : \"string\"";
+
+        if (attribute != null) {
+            json += ", \""+attribute+"\": \"" + value + "\"";
+        }
+        json += "}]}";
         return json;
     }
 }