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

.gitignore

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

README.md

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

build.gradle

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

license

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

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

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

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

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

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

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

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

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

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

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

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

@@ -51,13 +51,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/fx/FXMLController.java

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

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

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

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -56,7 +56,7 @@ import ninja.javafx.smartcsv.fx.util.SaveFileService;
 import ninja.javafx.smartcsv.fx.validation.ValidationEditorController;
 import ninja.javafx.smartcsv.preferences.PreferencesFileReader;
 import ninja.javafx.smartcsv.preferences.PreferencesFileWriter;
-import ninja.javafx.smartcsv.validation.ValidationConfiguration;
+import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
 import ninja.javafx.smartcsv.validation.ValidationError;
 import ninja.javafx.smartcsv.validation.ValidationFileReader;
 import ninja.javafx.smartcsv.validation.ValidationFileWriter;
@@ -425,6 +425,7 @@ public class SmartCSVController extends FXMLController {
 
     public void showValidationEditor(String column) {
         validationEditorController.setSelectedColumn(column);
+        validationEditorController.updateForm();
 
         Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
         alert.setGraphic(null);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -43,9 +43,8 @@ public class I18nValidationUtil {
     public static String getI18nValidatioMessage(ResourceBundle resourceBundle, List<ValidationError> errors) {
 
         StringWriter message = new StringWriter();
-        for (ValidationError validationError: errors) {
+        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-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>                                              
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -26,16 +26,13 @@
 
 package ninja.javafx.smartcsv.fx.validation;
 
-import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 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;
@@ -51,9 +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
@@ -80,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 = "\\[|\\]";
@@ -100,20 +99,14 @@ public class ValidationEditorController extends FXMLController {
                     + "|(?<COMMENT>" + COMMENT_PATTERN + ")"
     );
 
-//    @FXML
+    @FXML
-//    private CheckBox notEmptyRuleCheckBox;
+    private ComboBox<Type> typeComboBox;
-//
+
-//    @FXML
+    @FXML
-//    private CheckBox integerRuleCheckBox;
+    private ComboBox<StringFormat> formatComboBox;
-//
+
-//    @FXML
+    @FXML
-//    private CheckBox doublerRuleCheckBox;
+    private TextField formatTextField;
-//
-//    @FXML
-//    private CheckBox alphanumericRuleCheckBox;
-//
-//    @FXML
-//    private CheckBox uniqueRuleCheckBox;
 
     @FXML
     private Spinner<Integer> minLengthSpinner;
@@ -121,9 +114,6 @@ public class ValidationEditorController extends FXMLController {
     @FXML
     private Spinner<Integer>  maxLengthSpinner;
 
-    @FXML
-    private TextField dateformatRuleTextField;
-
     @FXML
     private TextField regexpRuleTextField;
 
@@ -136,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;
 
@@ -175,21 +153,75 @@ public class ValidationEditorController extends FXMLController {
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-
+        initTypeAndFormatInput(resources);
         initMinMaxSpinner();
-
         initSpinner(minLengthSpinner, enableMinLengthRule);
         initSpinner(maxLengthSpinner, enableMaxLengthRule);
-        initTextInputControl(dateformatRuleTextField, enableDateRule);
         initTextInputControl(regexpRuleTextField, enableRegexpRule);
         initTextInputControl(valueOfRuleTextField, enableValueOfRule);
         initCodeAreaControl(groovyRuleTextArea, enableGroovyRule);
+    }
 
-        listenToExcludingRuleCombinations();
+    public String getSelectedColumn() {
+        return selectedColumn.get();
+    }
 
-        selectedColumn.addListener(observable -> {
+    public StringProperty selectedColumnProperty() {
-            updateForm();
+        return selectedColumn;
-        });
+    }
+
+    public void setSelectedColumn(String selectedColumn) {
+        this.selectedColumn.set(selectedColumn);
+    }
+
+    public void setValidationConfiguration(ValidationConfiguration validationConfiguration) {
+        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() {
@@ -210,97 +242,104 @@ public class ValidationEditorController extends FXMLController {
     }
 
 
-    public String getSelectedColumn() {
+    private void changeFormat() {
-        return selectedColumn.get();
+        switch (typeComboBox.getValue()) {
-    }
+            case STRING:
-
+                updateFormatComboBox();
-    public StringProperty selectedColumnProperty() {
+                break;
-        return selectedColumn;
+            case DATE:
-    }
+            case DATETIME:
-
+            case TIME:
-    public void setSelectedColumn(String selectedColumn) {
+                updateFormatTextField();
-        this.selectedColumn.set(selectedColumn);
+                break;
-    }
+            case INTEGER:
-
+            case NUMBER:
-    public void setValidationConfiguration(ValidationConfiguration validationConfiguration) {
+            default:
-        this.validationConfiguration = validationConfiguration;
+                // format: no options
+                formatComboBox.setVisible(false);
+                formatTextField.setVisible(false);
+                break;
+        }
     }
 
     public void updateConfiguration() {
 
-        if (enableIntegerRule.isSelected()) {
+        Field config = getCurrentFieldConfig();
-            validationConfiguration.setIntegerRuleFor(selectedColumn.getValue(), enableIntegerRule.isSelected());
+        config.setType(typeComboBox.getValue());
-        } else {
-            validationConfiguration.setIntegerRuleFor(selectedColumn.getValue(), null);
-        }
 
-        if (enableNotEmptyRule.isSelected()) {
+        switch (typeComboBox.getValue()) {
-            validationConfiguration.setNotEmptyRuleFor(selectedColumn.getValue(), enableNotEmptyRule.isSelected());
+            case STRING:
-        } else {
+                config.setFormat(formatComboBox.getValue().getExternalValue());
-            validationConfiguration.setNotEmptyRuleFor(selectedColumn.getValue(), null);
+                break;
-        }
+            case DATE:
-
+            case DATETIME:
-        if (enableUniqueRule.isSelected()) {
+            case TIME:
-            validationConfiguration.setUniqueRuleFor(selectedColumn.getValue(), enableUniqueRule.isSelected());
+                if (formatTextField.getText().trim().isEmpty()) {
-        } else {
+                    config.setFormat(null);
-            validationConfiguration.setUniqueRuleFor(selectedColumn.getValue(), null);
+                } else {
-        }
+                    // TODO: validate input
-
+                    config.setFormat(formatTextField.getText());
-        if (enableDoubleRule.isSelected()) {
+                }
-            validationConfiguration.setDoubleRuleFor(selectedColumn.getValue(), enableDoubleRule.isSelected());
+                break;
-        } else {
+            case INTEGER:
-            validationConfiguration.setDoubleRuleFor(selectedColumn.getValue(), null);
+            case NUMBER:
-        }
+            default:
-
+                // format: no options
-        if (enableAlphanumericRule.isSelected()) {
+                config.setFormat(null);
-            validationConfiguration.setAlphanumericRuleFor(selectedColumn.getValue(), enableAlphanumericRule.isSelected());
+                break;
-        } 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();
+        }
+
+        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 listenToExcludingRuleCombinations() {
+    private Field getCurrentFieldConfig() {
-        addDependencyListener(enableIntegerRule, enableDoubleRule, enableAlphanumericRule, enableDateRule);
+        return validationConfiguration.getFieldConfiguration(getSelectedColumn());
-        addDependencyListener(enableDoubleRule, enableIntegerRule, enableAlphanumericRule, enableDateRule);
-        addDependencyListener(enableAlphanumericRule, enableIntegerRule, enableDoubleRule, enableDateRule);
-        addDependencyListener(enableDateRule, enableIntegerRule, enableDoubleRule, enableAlphanumericRule);
     }
 
     private void addDependencyListener(CheckBox rule, CheckBox... dependentRules) {
@@ -313,68 +352,54 @@ public class ValidationEditorController extends FXMLController {
         });
     }
 
-    private void updateForm() {
+    public void updateForm() {
 
-        updateCheckBox(
+        Field config = getCurrentFieldConfig();
-                validationConfiguration.getNotEmptyRuleFor(getSelectedColumn()),
+
-                enableNotEmptyRule
+        if (config.getType() != null) {
+            typeComboBox.setValue(config.getType());
+        } else {
+            typeComboBox.setValue(STRING);
+        }
+
+        updateFormatComboBox();
+        updateFormatTextField();
+
+        updateCodeAreaControl(
+                groovyRuleTextArea,
+                config.getGroovy(),
+                enableGroovyRule
         );
 
-        updateCheckBox(
+        Constraints constraints = config.getConstraints();
-                validationConfiguration.getIntegerRuleFor(getSelectedColumn()),
+        updateCheckBox(constraints != null ? constraints.getRequired() : FALSE, enableNotEmptyRule);
-                enableIntegerRule
+        updateCheckBox(constraints != null ? constraints.getUnique() : FALSE, enableUniqueRule);
-        );
-
-        updateCheckBox(
-                validationConfiguration.getDoubleRuleFor(getSelectedColumn()),
-                enableDoubleRule
-        );
-
-        updateCheckBox(
-                validationConfiguration.getAlphanumericRuleFor(getSelectedColumn()),
-                enableAlphanumericRule
-        );
-
-        updateCheckBox(
-                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(Boolean value, CheckBox ruleEnabled) {

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

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

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

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

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

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

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

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

src/main/java/ninja/javafx/smartcsv/validation/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-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -28,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-2016 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -29,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,43 @@
+package ninja.javafx.smartcsv.validation;
+
+/**
+ * @author abi
+ */
+public class ValidationFormatHelper {
+
+
+    public static String dateFormat(String format, String defaultFormat) {
+
+        if (format != null && !format.trim().isEmpty()) {
+            format = format.trim();
+            if (format.startsWith("fmt:")) {
+                format = format.substring(4);
+                format = format.replace("%Y", "yyyy");
+                format = format.replace("%y", "yy");
+                format = format.replace("%m", "MM");
+                format = format.replace("%d", "dd");
+                format = format.replace("%a", "E");
+                format = format.replace("%A", "EEEE");
+                format = format.replace("%w", "F");
+                format = format.replace("%b", "MMM");
+                format = format.replace("%B", "MMMMM");
+                format = format.replace("%H", "HH");
+                format = format.replace("%I", "hh");
+                format = format.replace("%p", "a");
+                format = format.replace("%M", "mm");
+                format = format.replace("%S", "ss");
+                format = format.replace("%z", "Z");
+                format = format.replace("%Z", "z");
+                format = format.replace("%j", "DDD");
+                format = format.replace("%U", "ww");
+                return format;
+            }
+        }
+        return defaultFormat;
+    }
+
+    public static Integer doubleToInteger(Double value) {
+        if (value == null) return null;
+        return (int)Math.round(value);
+    }
+}

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

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

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -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
@@ -134,70 +142,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());
+    private void initializeColumnWithRules(Field column) {
+
+        if (column.getType() != null) {
+            if (column.getType() == NUMBER) {
+                add(column.getName(), new DoubleValidation());
+            }
+
+            if (column.getType() == INTEGER) {
+                add(column.getName(), new IntegerValidation());
+            }
+
+            if (column.getType() == DATE) {
+                String format = dateFormat(column.getFormat(), "YYYY-MM-DD");
+                add(column.getName(), new DateValidation(format));
+            }
+
+            if (column.getType() == DATETIME) {
+                String format = dateFormat(column.getFormat(), "YYYY-MM-DDThh:mm:ssZ");
+                add(column.getName(), new DateValidation(format));
+            }
+
+            if (column.getType() == TIME) {
+                String format = dateFormat(column.getFormat(), "hh:mm:ss");
+                add(column.getName(), new DateValidation(format));
+            }
+
+            if (column.getType() == STRING && column.getFormat().equalsIgnoreCase(EMAIL.getExternalValue())) {
+                add(column.getName(), new EmailValidation());
+            }
+
+            if (column.getType() == STRING && column.getFormat().equalsIgnoreCase(URI.getExternalValue())) {
+                add(column.getName(), new UriValidation());
+            }
+
+            if (column.getType() == STRING && column.getFormat().equalsIgnoreCase(UUID.getExternalValue())) {
+                add(column.getName(), new UuidValidation());
+            }
+
+            if (column.getType() == STRING && column.getFormat().equalsIgnoreCase(BINARY.getExternalValue())) {
+                add(column.getName(), new BinaryValidation());
+            }
+
+            if (column.getType() == STRING && column.getFormat() == null) {
+                columnValidationMap.get(column).remove(Validation.Type.STRING);
+            }
         }
 
-        Boolean integerRule = validationConfig.getIntegerRuleFor(column);
+        String groovy = column.getGroovy();
-        if (integerRule != null && integerRule) {
-            add(column, new IntegerValidation());
-        }
-
-        Boolean notEmptyRule = validationConfig.getNotEmptyRuleFor(column);
-        if (notEmptyRule != null && notEmptyRule) {
-            add(column, new NotEmptyValidation());
-        }
-
-        Boolean uniqueRule = validationConfig.getUniqueRuleFor(column);
-        if (uniqueRule != null && uniqueRule) {
-            add(column, new UniqueValidation(columnValueProvider, column));
-        }
-
-        String dateRule = validationConfig.getDateRuleFor(column);
-        if (dateRule != null && !dateRule.trim().isEmpty()) {
-            add(column, new DateValidation(dateRule));
-        }
-
-        Integer minLength = validationConfig.getMinLengthRuleFor(column);
-        if (minLength != null) {
-            add(column, new MinLengthValidation(minLength));
-        }
-
-        Integer maxLength = validationConfig.getMaxLengthRuleFor(column);
-        if (maxLength != null) {
-            add(column, new MaxLengthValidation(maxLength));
-        }
-
-        String regexp = validationConfig.getRegexpRuleFor(column);
-        if (regexp != null && !regexp.trim().isEmpty()) {
-            add(column, new RegExpValidation(regexp));
-        }
-
-        String groovy = validationConfig.getGroovyRuleFor(column);
         if (groovy != null && !groovy.trim().isEmpty()) {
-            add(column, new GroovyValidation(groovy));
+            add(column.getName(), new GroovyValidation(groovy));
         }
-        List<String> valueOfRule = validationConfig.getValueOfRuleFor(column);
+
-        if (valueOfRule != null && !valueOfRule.isEmpty()) {
+        Constraints constraints = column.getConstraints();
-            add(column, new ValueOfValidation(valueOfRule));
+        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.getName(), new ValueOfValidation(valueOfRule));
+            }
         }
     }
 
 
+
+
     public ValidationError isHeaderValid(String[] headerNames) {
         ValidationError result = null;
         if (validationConfig != null) {
@@ -227,4 +280,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-2016 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+package ninja.javafx.smartcsv.validation.checker;
+
+import ninja.javafx.smartcsv.validation.ValidationError;
+
+import java.util.Base64;
+
+/**
+ * checks if the value is a base64 encoded string representing binary data
+ */
+public class BinaryValidation extends EmptyValueIsValid {
+
+    @Override
+    public void check(int row, String value, ValidationError error) {
+        try {
+            Base64.getDecoder().decode(value);
+        } catch (IllegalArgumentException e) {
+            error.add("validation.message.binary");
+        }
+    }
+
+    @Override
+    public Type getType() {
+        return Type.STRING;
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -46,6 +46,7 @@ preferences.quoteMode = Quote mode:
 validation.message.not.empty = should not be empty
 validation.message.integer = should be an integer
 validation.message.double = should be a double
+validation.message.email = should be an email address
 validation.message.alphanumeric = should be alphanumeric
 validation.message.groovy.exception = groovy script '{0}' throws exception: {1}
 validation.message.groovy.return.null = groovy script '{0}' returns null
@@ -55,6 +56,9 @@ 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}"
@@ -74,6 +78,8 @@ validation.rules.active = active
 validation.rules.name = rule
 validation.rules.value = value
 validation.rule.label.unique = Unique in column
+validation.rule.format = Format:
+validation.rule.type = Type:
 
 dialog.validation.rules.title = Validation rules
 dialog.validation.rules.header = Validation rules of column "{0}"
@@ -85,3 +91,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

@@ -55,6 +55,7 @@ preferences.quoteMode = Einfassungsmodus:
 validation.message.not.empty = Darf nicht leer sein.
 validation.message.integer = Muss eine Zahl sein.
 validation.message.double = Muss eine Gleitkommazahl sein
+validation.message.email = Muss eine Email-Adresse sein
 validation.message.alphanumeric = Darf nur Zahlen und Buchstaben enthalten.
 validation.message.groovy.exception = groovy script '{0}' wirft folgenden Fehler: {1}
 validation.message.groovy.return.null = groovy script '{0}' meldet "null"
@@ -64,6 +65,9 @@ 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
@@ -83,6 +87,8 @@ validation.rules.active = Aktiv
 validation.rules.name = Regel
 validation.rules.value = Wert
 validation.rule.label.unique = Einmalig in Spalte
+validation.rule.format = Format:
+validation.rule.type = Typ:
 
 dialog.validation.rules.title = Pr\u00fcfregeln
 dialog.validation.rules.header = Pr\u00fcfregeln f\u00fcr die Spalte "{0}"
@@ -95,3 +101,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

@@ -3,7 +3,9 @@
 <?import java.net.URL?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.Spinner?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.ColumnConstraints?>
@@ -11,64 +13,56 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import org.fxmisc.richtext.CodeArea?>
 
-<GridPane hgap="10.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="600.0" vgap="10.0" xmlns="http://javafx.com/javafx/8.0.101" xmlns:fx="http://javafx.com/fxml/1">
+<GridPane hgap="20.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="800.0" vgap="6.0" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1">
-  <columnConstraints>
+    <columnConstraints>
-      <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>
+        <ColumnConstraints halignment="LEFT" hgrow="ALWAYS" />
-  <rowConstraints>
+    </columnConstraints>
-      <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 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" valignment="CENTER" 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" 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>
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+    <children>
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+        <Label text="%validation.rule.type" GridPane.columnSpan="2" GridPane.halignment="LEFT" GridPane.hgrow="ALWAYS" />
-  </rowConstraints>
+        <Label text="%validation.rule.format" GridPane.columnSpan="2" GridPane.halignment="LEFT" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" />
-   <children>
+        <ComboBox fx:id="typeComboBox" maxWidth="1.7976931348623157E308" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.halignment="LEFT" GridPane.hgrow="ALWAYS" />
-      <Label text="%validation.rule.label.not_empty" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+        <ComboBox fx:id="formatComboBox" prefWidth="150.0" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="1" visible="false" />
-      <Label text="%validation.rule.label.integer" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+        <TextField fx:id="formatTextField" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="1" visible="false" />
-      <Label text="%validation.rule.label.double" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+        <CheckBox fx:id="enableNotEmptyRule" mnemonicParsing="false" text="%validation.rule.label.not_empty" GridPane.rowIndex="3" />
-      <Label text="%validation.rule.label.minlength" GridPane.columnIndex="1" GridPane.rowIndex="6" />
+        <CheckBox fx:id="enableUniqueRule" mnemonicParsing="false" text="%validation.rule.label.unique" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-      <Label text="%validation.rule.label.maxlength" GridPane.columnIndex="1" GridPane.rowIndex="7" />
+        <CheckBox fx:id="enableMinLengthRule" mnemonicParsing="false" text="%validation.rule.label.minlength" GridPane.rowIndex="4" />
-      <Label text="%validation.rule.label.dateformat" GridPane.columnIndex="1" GridPane.rowIndex="8" />
+        <Spinner fx:id="minLengthSpinner" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-      <Label text="%validation.rule.label.alphanumeric" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+        <CheckBox fx:id="enableMaxLengthRule" mnemonicParsing="false" text="%validation.rule.label.maxlength" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-      <Label text="%validation.rule.label.regexp" GridPane.columnIndex="1" GridPane.rowIndex="9" />
+        <Spinner fx:id="maxLengthSpinner" GridPane.columnIndex="3" GridPane.rowIndex="4" />
-      <Label text="%validation.rule.label.value_of" GridPane.columnIndex="1" GridPane.rowIndex="10" />
+        <CheckBox fx:id="enableRegexpRule" mnemonicParsing="false" text="%validation.rule.label.regexp" GridPane.rowIndex="5" />
-      <Label text="%validation.rule.label.groovy" GridPane.columnIndex="1" GridPane.rowIndex="11" />
+        <TextField fx:id="regexpRuleTextField" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="5" />
-      <Label text="%validation.rule.label.unique" GridPane.columnIndex="1" GridPane.rowIndex="5" />
+        <CheckBox fx:id="enableValueOfRule" mnemonicParsing="false" text="%validation.rule.label.value_of" GridPane.rowIndex="6" />
-       <CheckBox fx:id="enableNotEmptyRule" mnemonicParsing="false" GridPane.rowIndex="1" />
+        <TextField fx:id="valueOfRuleTextField" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="6" />
-       <CheckBox fx:id="enableIntegerRule" mnemonicParsing="false" GridPane.rowIndex="2" />
+        <CheckBox fx:id="enableGroovyRule" mnemonicParsing="false" text="%validation.rule.label.groovy" GridPane.rowIndex="7">
-       <CheckBox fx:id="enableDoubleRule" mnemonicParsing="false" GridPane.rowIndex="3" />
+            <GridPane.margin>
-       <CheckBox fx:id="enableAlphanumericRule" mnemonicParsing="false" GridPane.rowIndex="4" />
+                <Insets top="8.0" />
-       <CheckBox fx:id="enableUniqueRule" mnemonicParsing="false" GridPane.rowIndex="5" />
+            </GridPane.margin>
-       <CheckBox fx:id="enableMinLengthRule" mnemonicParsing="false" GridPane.rowIndex="6" />
+        </CheckBox>
-      <Spinner fx:id="minLengthSpinner" GridPane.columnIndex="2" GridPane.rowIndex="6" />
+        <CodeArea fx:id="groovyRuleTextArea" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="7">
-       <CheckBox fx:id="enableMaxLengthRule" mnemonicParsing="false" GridPane.rowIndex="7" />
+            <GridPane.margin>
-      <Spinner fx:id="maxLengthSpinner" GridPane.columnIndex="2" GridPane.rowIndex="7" />
+                <Insets top="8.0" />
-       <CheckBox fx:id="enableDateRule" mnemonicParsing="false" GridPane.rowIndex="8" />
+            </GridPane.margin>
-      <TextField fx:id="dateformatRuleTextField" GridPane.columnIndex="2" GridPane.rowIndex="8" />
+        </CodeArea>
-       <CheckBox fx:id="enableRegexpRule" mnemonicParsing="false" GridPane.rowIndex="9" />
+        <Separator prefWidth="200.0" GridPane.columnSpan="4" GridPane.rowIndex="2" />
-      <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>
+    </children>
-   <padding>
+    <padding>
-      <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-   </padding>
+    </padding>
     <stylesheets>
         <URL value="@/ninja/javafx/smartcsv/fx/smartcsv.css" />
     </stylesheets>

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

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

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

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

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

@@ -2,6 +2,7 @@ package ninja.javafx.smartcsv.validation;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;