version 1.0.0

logo for the app

.travis.yml

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

README.md

@@ -1,4 +1,5 @@
 # SmartCSV.fx
+[![Build Status](https://travis-ci.org/frosch95/SmartCSV.fx.svg?branch=master)](https://travis-ci.org/frosch95/SmartCSV.fx) ![GitHub All Releases](https://img.shields.io/github/downloads/frosch95/SmartCSV.fx/total) ![GitHub](https://img.shields.io/github/license/frosch95/SmartCSV.fx) ![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/frosch95/SmartCSV.fx?label=version) ![GitHub Release Date](https://img.shields.io/github/release-date/frosch95/SmartCSV.fx)
 ## Description
 A simple JavaFX application to load, save and edit a CSV file and provide a [JSON Table Schema](http://specs.frictionlessdata.io/json-table-schema/) for columns to check the values in the columns.
 
@@ -14,7 +15,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.9.1)](https://github.com/frosch95/SmartCSV.fx/releases/download/0.9.1/SmartCSV.fx-0.9.1-SNAPSHOT.zip)
+binary distribution of the [latest release (1.0.0)](https://github.com/frosch95/SmartCSV.fx/releases/download/1.0.0/SmartCSV.fx-1.0.0.zip)
 
 ## Talks
 [Introduction](http://javafx.ninja/talks/introduction/)
@@ -23,7 +24,7 @@ binary distribution of the [latest release (0.9.1)](https://github.com/frosch95/
 ### The MIT License (MIT)
 
 
-Copyright (c) 2015-2016 Andreas Billmann <andreas.billmann@javafx.ninja>
+Copyright (c) 2015-2019 Andreas Billmann <andreas.billmann@javafx.ninja>
 
 
 

build.gradle

@@ -12,13 +12,15 @@ repositories {
 }
 
 javafx {
-    version = "13"
     modules = [ 'javafx.controls', 'javafx.fxml' ]
 }
 
 dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3'
+    // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
+    testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.2'
+    testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.5.2'
+    testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '2.2'
+    testCompile group: 'org.mockito', name: 'mockito-core', version:'3.1.0'
     compile group: 'org.codehaus.groovy', name: 'groovy-all', version: '3.0.0-beta-3'
     compile group: 'org.springframework', name:'spring-context', version: '5.2.0.RELEASE'
     compile group: 'net.sf.supercsv', name: 'super-csv', version: '2.4.0'
@@ -34,6 +36,10 @@ dependencies {
     compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.10.2'
 }
 
+test {
+    useJUnitPlatform()
+}
+
 group 'ninja.javafx'
-version '0.9.2-SNAPSHOT'
+version '1.0.0'
 mainClassName = 'ninja.javafx.smartcsv.Main'

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

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

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

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

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

@@ -1,3 +1,29 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+
 package ninja.javafx.smartcsv;
 
 import ninja.javafx.smartcsv.fx.SmartCSV;

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -35,6 +35,8 @@ public class CSVConfigurable {
 
     protected CsvPreference csvPreference;
 
+    protected String fileEncoding;
+
     public CSVConfigurable() {
         csvPreference = CsvPreference.EXCEL_NORTH_EUROPE_PREFERENCE;
     }
@@ -42,4 +44,9 @@ public class CSVConfigurable {
     public void setCsvPreference(CsvPreference csvPreference) {
         this.csvPreference = csvPreference;
     }
+
+    public void setFileEncoding(String fileEncoding) {
+        this.fileEncoding = fileEncoding;
+    }
+
 }

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -34,6 +34,7 @@ import org.supercsv.io.ICsvMapReader;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.Map;
 
 /**
@@ -48,7 +49,8 @@ public class CSVFileReader extends CSVConfigurable implements FileReader<CSVMode
 
         ICsvMapReader mapReader = null;
         try {
-            mapReader = new CsvMapReader(new java.io.FileReader(file.getAbsoluteFile()), csvPreference);
+            mapReader = new CsvMapReader(new java.io.FileReader(file.getAbsoluteFile(), Charset.forName(fileEncoding)),
+                    csvPreference);
             model = new CSVModel();
 
             // the header columns are used as the keys to the Map

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -34,6 +34,7 @@ import org.supercsv.io.ICsvMapWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.Map;
 
 import static java.util.stream.Collectors.toMap;
@@ -53,7 +54,8 @@ public class CSVFileWriter extends CSVConfigurable implements ninja.javafx.smart
     public void write(File filename) throws IOException {
         ICsvMapWriter mapWriter = null;
         try {
-            mapWriter = new CsvMapWriter(new FileWriter(filename.getAbsolutePath()), csvPreference);
+            mapWriter = new CsvMapWriter(new FileWriter(filename.getAbsolutePath(), Charset.forName(fileEncoding)),
+                    csvPreference);
             mapWriter.writeHeader(model.getHeader());
 
             for(CSVRow row: model.getRows()) {

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

@@ -1,9 +1,34 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+
 package ninja.javafx.smartcsv.export;
 
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;
 import ninja.javafx.smartcsv.fx.table.model.CSVModel;
-import ninja.javafx.smartcsv.validation.ValidationError;
 
 import java.io.File;
 import java.io.StringWriter;

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

@@ -1,3 +1,29 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+
 package ninja.javafx.smartcsv.files;
 
 import javafx.beans.property.BooleanProperty;

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

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

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -30,6 +30,7 @@ import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
+import javafx.scene.image.Image;
 import javafx.stage.Stage;
 import ninja.javafx.smartcsv.fx.about.AboutController;
 import org.springframework.context.annotation.*;
@@ -87,6 +88,7 @@ public class SmartCSV extends Application {
 
         primaryStage.setScene(scene);
         primaryStage.setTitle(String.format("%s %s", name, version));
+        primaryStage.getIcons().add(new Image(SmartCSV.class.getResourceAsStream("/ninja/javafx/smartcsv/icon/logo.png")));
         primaryStage.show();
         primaryStage.setMaximized(true);
 

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -26,6 +26,7 @@
 
 package ninja.javafx.smartcsv.fx;
 
+import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
 import javafx.collections.ListChangeListener;
 import javafx.collections.WeakListChangeListener;
@@ -54,12 +55,11 @@ import ninja.javafx.smartcsv.fx.table.model.CSVValue;
 import ninja.javafx.smartcsv.fx.util.LoadFileService;
 import ninja.javafx.smartcsv.fx.util.SaveFileService;
 import ninja.javafx.smartcsv.fx.validation.ValidationEditorController;
-import ninja.javafx.smartcsv.preferences.PreferencesFileReader;
-import ninja.javafx.smartcsv.preferences.PreferencesFileWriter;
-import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
+import ninja.javafx.smartcsv.preferences.*;
 import ninja.javafx.smartcsv.validation.ValidationError;
 import ninja.javafx.smartcsv.validation.ValidationFileReader;
 import ninja.javafx.smartcsv.validation.ValidationFileWriter;
+import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -68,6 +68,7 @@ import org.supercsv.prefs.CsvPreference;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.nio.charset.Charset;
 import java.util.Optional;
 import java.util.ResourceBundle;
 
@@ -93,6 +94,13 @@ public class SmartCSVController extends FXMLController {
             ".SmartCSV.fx" +
             File.separator + "" +
             "preferences.json");
+
+    private static final File ENCODING_FILE = new File(System.getProperty("user.home") +
+            File.separator +
+            ".SmartCSV.fx" +
+            File.separator +
+            "encoding.json");
+
     public static final String CSV_FILTER_TEXT = "CSV files (*.csv)";
     public static final String CSV_FILTER_EXTENSION = "*.csv";
     public static final String JSON_FILTER_TEXT = "JSON files (*.json)";
@@ -213,6 +221,7 @@ public class SmartCSVController extends FXMLController {
     private FileStorage<CSVModel> currentCsvFile = new FileStorage<>(csvFileReader, csvFileWriter);
     private FileStorage<ValidationConfiguration> currentConfigFile = new FileStorage<>(new ValidationFileReader(), new ValidationFileWriter());
     private FileStorage<CsvPreference> csvPreferenceFile = new FileStorage<>(new PreferencesFileReader(), new PreferencesFileWriter());
+    private FileStorage<String> fileEncodingFile = new FileStorage<>(new EncodingFileReader(), new EncodingFileWriter());
 
     private ListChangeListener<ValidationError> errorListListener = c -> tableView.refresh();
     private WeakListChangeListener<ValidationError> weakErrorListListener = new WeakListChangeListener<>(errorListListener);
@@ -238,10 +247,25 @@ public class SmartCSVController extends FXMLController {
         bindConfigFileName();
 
         csvPreferenceFile.setFile(PREFERENCES_FILE);
+        fileEncodingFile.setFile(ENCODING_FILE);
 
         loadCsvPreferencesFromFile();
     }
 
+    private void loadEncodingFromFile() {
+        if (fileEncodingFile.getFile().exists()) {
+            useLoadFileService(fileEncodingFile, event -> setFileEncoding(fileEncodingFile.getContent()));
+        } else {
+            setFileEncoding(Charset.defaultCharset().name());
+        }
+    }
+
+    private void setFileEncoding(String content) {
+        preferencesController.setFileEncoding(content);
+        csvFileReader.setFileEncoding(content);
+        csvFileWriter.setFileEncoding(content);
+    }
+
     private void setupErrorSideBar(ResourceBundle resourceBundle) {
         errorSideBar = new ErrorSideBar(resourceBundle);
         errorSideBar.selectedValidationErrorProperty().addListener((observable, oldValue, newValue) -> {
@@ -345,8 +369,29 @@ public class SmartCSVController extends FXMLController {
             CsvPreference csvPreference = preferencesController.getCsvPreference();
             setCsvPreference(csvPreference);
             saveCsvPreferences(csvPreference);
+            String fileEncoding = CharsetHelper.getCharsetName(preferencesController.getFileEncoding());
+            setFileEncoding(fileEncoding);
+            saveFileEncoding(fileEncoding);
         } else {
             preferencesController.setCsvPreference(csvPreferenceFile.getContent());
+            preferencesController.setFileEncoding(fileEncodingFile.getContent());
+        }
+    }
+
+    private void saveFileEncoding(String fileEncoding) {
+        try {
+            createFileEncodingFile();
+            fileEncodingFile.setContent(fileEncoding);
+            useSaveFileService(fileEncodingFile);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void createFileEncodingFile() throws IOException {
+        if (!fileEncodingFile.getFile().exists()) {
+            createPreferencesFileFolder();
+            fileEncodingFile.getFile().createNewFile();
         }
     }
 
@@ -492,9 +537,13 @@ public class SmartCSVController extends FXMLController {
 
     private void loadCsvPreferencesFromFile() {
         if (csvPreferenceFile.getFile().exists()) {
-            useLoadFileService(csvPreferenceFile, event -> setCsvPreference(csvPreferenceFile.getContent()));
+            useLoadFileService(csvPreferenceFile, event -> {
+                setCsvPreference(csvPreferenceFile.getContent());
+                loadEncodingFromFile();
+            });
         } else {
             setCsvPreference(CsvPreference.EXCEL_NORTH_EUROPE_PREFERENCE);
+            loadEncodingFromFile();
         }
     }
 
@@ -608,6 +657,10 @@ public class SmartCSVController extends FXMLController {
                 addColumn(column, tableView);
             }
 
+            tableView.getColumns().addListener(
+                    (InvalidationListener) observable -> currentCsvFile.getContent().setHeader(
+                            tableView.getColumns().stream().map((x) -> x.getText()).toArray(String[]::new)));
+
             tableView.getItems().setAll(currentCsvFile.getContent().getRows());
             tableView.setEditable(true);
 

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

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

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

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

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

@@ -1,3 +1,29 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+
 package ninja.javafx.smartcsv.fx.list;
 
 import javafx.application.Platform;
@@ -9,9 +35,6 @@ import javafx.scene.layout.Region;
 
 import java.util.function.UnaryOperator;
 
-/**
- * Created by abi on 05.08.2016.
- */
 public class GotoLineDialog extends Dialog<Integer> {
 
     private final GridPane grid;

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -39,6 +39,7 @@ import org.springframework.stereotype.Component;
 import org.supercsv.prefs.CsvPreference;
 
 import java.net.URL;
+import java.nio.charset.Charset;
 import java.util.ResourceBundle;
 import java.util.function.UnaryOperator;
 
@@ -66,6 +67,9 @@ public class PreferencesController extends FXMLController {
     @FXML
     private ComboBox<String> quoteMode;
 
+    @FXML
+    private ComboBox<String> fileEncoding;
+
     private String endOfLineSymbols;
 
     private BooleanProperty valid = new SimpleBooleanProperty(true);
@@ -80,6 +84,7 @@ public class PreferencesController extends FXMLController {
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         quoteMode.getItems().addAll("normal", "always", "column");
+        fileEncoding.getItems().addAll(Charset.availableCharsets().keySet());
 
         UnaryOperator<TextFormatter.Change> allowOnlyOneCharacter = change -> {
             if (change.isContentChange()) {
@@ -117,6 +122,14 @@ public class PreferencesController extends FXMLController {
                 .build();
     }
 
+    public void setFileEncoding(String fileEncoding) {
+        this.fileEncoding.setValue(fileEncoding);
+    }
+
+    public String getFileEncoding() {
+        return fileEncoding.getValue();
+    }
+
     public boolean getValid() {
         return valid.get();
     }

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -125,7 +125,7 @@ public class EditableValidationCell extends TableCell<CSVRow, CSVValue> {
         });
     }
 
-    private class ValueTextField extends TextField {
+    private static class ValueTextField extends TextField {
         private CSVValue value;
 
         public ValueTextField(CSVValue value) {

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -47,7 +47,6 @@ public class ObservableMapValueFactory implements
     @Override
     public ObjectProperty<CSVValue> call(TableColumn.CellDataFeatures<CSVRow, CSVValue> features) {
         CSVRow row = features.getValue();
-        ObjectProperty<CSVValue> value = row.getColumns().get(key);
-        return value;
+        return row.getColumns().get(key);
     }
 }

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

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

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

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

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

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

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

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

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

@@ -1,3 +1,29 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+
 package ninja.javafx.smartcsv.fx.table.model;
 
 /**

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,44 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+
+package ninja.javafx.smartcsv.preferences;
+
+import java.nio.charset.Charset;
+
+/**
+ * Helper class for getting charset's name
+ */
+public class CharsetHelper {
+
+    public static String getCharsetName(String name) {
+        try {
+            return Charset.forName(name).name();
+        } catch (Exception e) {
+            return Charset.defaultCharset().name();
+        }
+    }
+
+}

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

@@ -0,0 +1,62 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+
+package ninja.javafx.smartcsv.preferences;
+
+import com.google.gson.GsonBuilder;
+import ninja.javafx.smartcsv.FileReader;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * file reader for the file encoding
+ */
+public class EncodingFileReader implements FileReader<String> {
+
+    private String fileEncoding;
+
+    public EncodingFileReader() {
+        fileEncoding = Charset.defaultCharset().name();
+    }
+
+    @Override
+    public String getContent() {
+        return fileEncoding;
+    }
+
+    @Override
+    public void read(File filename) throws IOException {
+        Map settings = new GsonBuilder().create().fromJson(new java.io.FileReader(filename), HashMap.class);
+        if (settings != null) {
+            fileEncoding = CharsetHelper.getCharsetName(settings.get("fileEncoding").toString());
+        }
+    }
+
+}

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

@@ -0,0 +1,59 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+
+package ninja.javafx.smartcsv.preferences;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import ninja.javafx.smartcsv.FileWriter;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Save the file encoding to configuration file
+ */
+public class EncodingFileWriter implements FileWriter<String> {
+
+    private String fileEncoding;
+
+    @Override
+    public void setContent(String fileEncoding) {
+        this.fileEncoding = fileEncoding;
+    }
+
+    @Override
+    public void write(File filename) throws IOException {
+        Map<String, String> encodings = new HashMap<>();
+        encodings.put("fileEncoding", CharsetHelper.getCharsetName(fileEncoding));
+        Gson gson = new GsonBuilder().setPrettyPrinting().create();
+        Files.write(filename.toPath(), gson.toJson(encodings).getBytes());
+    }
+
+}

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -43,7 +43,6 @@ import static ninja.javafx.smartcsv.preferences.QuoteModeHelper.getQuoteMode;
  */
 public class PreferencesFileReader implements FileReader<CsvPreference> {
 
-    private Map config;
     private CsvPreference csvPreference;
 
     public PreferencesFileReader() {
@@ -54,14 +53,14 @@ public class PreferencesFileReader implements FileReader<CsvPreference> {
 
     @Override
     public void read(File filename) throws IOException {
-        config = new GsonBuilder().create().fromJson(new java.io.FileReader(filename), HashMap.class);
+        Map config = new GsonBuilder().create().fromJson(new java.io.FileReader(filename), HashMap.class);
 
         if (config != null) {
             char quoteChar = config.get("quoteChar").toString().charAt(0);
             char delimiterChar = config.get("delimiterChar").toString().charAt(0);
             String endOfLineSymbols = config.get("endOfLineSymbols").toString();
-            boolean surroundingSpacesNeedQuotes = (Boolean)config.get("surroundingSpacesNeedQuotes");
-            boolean ignoreEmptyLines = (Boolean)config.get("ignoreEmptyLines");
+            boolean surroundingSpacesNeedQuotes = (Boolean) config.get("surroundingSpacesNeedQuotes");
+            boolean ignoreEmptyLines = (Boolean) config.get("ignoreEmptyLines");
             String quoteMode = config.get("quoteMode").toString();
 
             csvPreference = new CsvPreference.Builder(quoteChar, delimiterChar, endOfLineSymbols)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -37,11 +37,11 @@ import org.codehaus.groovy.control.CompilationFailedException;
 public class GroovyValidation extends EmptyValueIsValid {
 
     private String groovyScript;
-    private GroovyShell shell = new GroovyShell();
     private Script script;
 
     public GroovyValidation(String groovyScript) {
         this.groovyScript = groovyScript;
+        GroovyShell shell = new GroovyShell();
         script = shell.parse(groovyScript);
     }
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -34,6 +34,7 @@ import java.util.UUID;
  */
 public class UuidValidation extends EmptyValueIsValid {
 
+    @SuppressWarnings("ResultOfMethodCallIgnored")
     @Override
     public void check(int row, String value, ValidationError error) {
         try {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -41,6 +41,7 @@ preferences.delimiterChar = Delimiter character:
 preferences.ignoreEmptyLines = Ignore empty lines:
 preferences.surroundingSpacesNeedQuotes = Surrounding spaces need quotes:
 preferences.quoteMode = Quote mode:
+preferences.fileEncoding = File encoding:
 
 # validaton messages
 validation.message.not.empty = should not be empty

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

@@ -50,6 +50,7 @@ preferences.delimiterChar = Trennzeichen:
 preferences.ignoreEmptyLines = Leere Zeilen ignorieren:
 preferences.surroundingSpacesNeedQuotes = Leerzeichen einfassen:
 preferences.quoteMode = Einfassungsmodus:
+preferences.fileEncoding = Dateicodierung:
 
 # validaton messages
 validation.message.not.empty = Darf nicht leer sein.

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

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

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,7 @@
 
 package ninja.javafx.smartcsv.fx.table.model;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertThat;
@@ -39,14 +39,13 @@ public class CSVModelTest {
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // constants
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    static final String TESTHEADER = "TESTHEADER";
-    static final String TESTVALUE = "TESTVALUE";
-    static final String FILEPATH = "filepath";
+    private static final String TESTHEADER = "TESTHEADER";
+    private static final String TESTVALUE = "TESTVALUE";
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // subject under test
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    CSVModel sut = new CSVModel();
+    private CSVModel sut = new CSVModel();
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // tests

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

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

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

@@ -0,0 +1,57 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+*/
+
+package ninja.javafx.smartcsv.preferences;
+
+import org.junit.jupiter.api.Test;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class CharsetHelperTest {
+
+    @Test
+    public void getCharsetName_known_charset() {
+        String result = CharsetHelper.getCharsetName("UTF-16");
+        assertEquals(StandardCharsets.UTF_16.name(), result);
+        assertNotEquals(StandardCharsets.UTF_16.name(), Charset.defaultCharset());
+    }
+
+    @Test
+    public void getCharsetName_unknown_charset() {
+        String result = CharsetHelper.getCharsetName("foobar");
+        assertEquals(Charset.defaultCharset().name(), result);
+    }
+
+    @Test
+    public void getCharsetName_null_charset() {
+        String result = CharsetHelper.getCharsetName(null);
+        assertEquals(Charset.defaultCharset().name(), result);
+    }
+
+}

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

@@ -2,7 +2,7 @@
    The MIT License (MIT)
    -----------------------------------------------------------------------------
 
-   Copyright (c) 2015-2016 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
                                                                                                                     
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -29,17 +29,15 @@ 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;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-import java.util.Collection;
 import java.util.List;
+import java.util.stream.Stream;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
-import static java.util.stream.Collectors.joining;
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
@@ -47,50 +45,22 @@ import static org.junit.Assert.assertTrue;
 /**
  * unit test for header validator
  */
-@RunWith(Parameterized.class)
 public class HeaderValidationTest {
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // parameters
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    private ValidationConfiguration config;
-    private Boolean expectedResult;
-    private List<ValidationMessage> expectedErrors;
-    private String[] headerNames;
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // subject under test
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    private Validator sut;
-
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // parameterized constructor
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    public HeaderValidationTest(String configHeaderNames,
-                                String[] headerNames,
-                                Boolean expectedResult,
-                                List<ValidationMessage> expectedErrors) {
-        Gson gson = new GsonBuilder().create();
-        this.config = gson.fromJson(configHeaderNames, ValidationConfiguration.class);
-        this.headerNames = headerNames;
-        this.expectedResult = expectedResult;
-        this.expectedErrors = expectedErrors;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    // init
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    @Before
-    public void initialize() {
-        sut = new Validator(config, new TestColumnValueProvider());
-    }
-
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // tests
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    @Test
-    public void validation() {
+    @ParameterizedTest
+    @MethodSource("validationConfigurations")
+    public void validation(String configHeaderNames,
+                           String[] headerNames,
+                           Boolean expectedResult,
+                           List<ValidationMessage> expectedErrors) {
+        // setup
+        Gson gson = new GsonBuilder().create();
+        ValidationConfiguration config = gson.fromJson(configHeaderNames, ValidationConfiguration.class);
+        Validator sut = new Validator(config, new TestColumnValueProvider());
+
         // execution
         ValidationError result = sut.isHeaderValid(headerNames);
 
@@ -104,17 +74,17 @@ public class HeaderValidationTest {
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     // parameters for tests
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    @Parameterized.Parameters
-    public static Collection validationConfigurations() {
-        return asList(new Object[][] {
-                { json(), new String[] {}, true, null },
-                { json("a"), new String[] {"a"}, true, null },
-                { json("a"), new String[] {"b"}, false, singletonList(new ValidationMessage("validation.message.header.match", "0", "a", "b"))},
-                { json("a"), new String[] {"a","b"}, false, singletonList(new ValidationMessage("validation.message.header.length", "2", "1"))},
-                { json("a", "b"), new String[] {"b", "a"}, false, asList(new ValidationMessage("validation.message.header.match", "0", "a", "b"), new ValidationMessage("validation.message.header.match", "1", "b", "a")) }
-        });
+    public static Stream<Arguments> validationConfigurations() {
+        return Stream.of(
+                Arguments.of( json(), new String[] {}, true, null ),
+                Arguments.of( json("a"), new String[] {"a"}, true, null ),
+                Arguments.of( json("a"), new String[] {"b"}, false, singletonList(new ValidationMessage("validation.message.header.match", "0", "a", "b"))),
+                Arguments.of( json("a"), new String[] {"a","b"}, false, singletonList(new ValidationMessage("validation.message.header.length", "2", "1"))),
+                Arguments.of( json("a", "b"), new String[] {"b", "a"}, false, asList(new ValidationMessage("validation.message.header.match", "0", "a", "b"), new ValidationMessage("validation.message.header.match", "1", "b", "a")) )
+        );
     }
 
+    @SuppressWarnings("StringConcatenationInLoop")
     public static String json(String... headerNames) {
 
         String json = "{ \"fields\": [";

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

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