Merge pull request #29 from frosch95/dragndrop

Support for Drag'n'Drop
Support for drag'n'drop
2026-04-11 13:38:23 +02:00 · 2022-10-19 12:49:36 +02:00 · 2022-10-19 12:34:55 +02:00 · 2022-10-15 13:59:48 +02:00 · 2022-10-15 13:47:55 +02:00 · 2022-10-15 13:41:31 +02:00
79 changed files with 370 additions and 262 deletions
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -0,0 +1,21 @@
+name: Build and Test with Gradle
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 17
+      uses: actions/setup-java@v1
+      with:
+        java-version: 17
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew build
+    - name: Test with Gradle
+      run: ./gradlew test
--- a/.travis.yml
+++ b/.travis.yml
@@ -1 +0,0 @@
-language: java
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,7 +1,7 @@
 The MIT License (MIT)
 ------------------------------------------------------------------------------------------------------------------------

-Copyright (c) 2015-2019 Andreas Billmann <andreas.billmann@javafx.ninja>
+Copyright (c) 2015-2021 Andreas Billmann <andreas.billmann@javafx.ninja>



--- a/README.md
+++ b/README.md
@@ -1,5 +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)
+![Build and Test](https://github.com/frosch95/SmartCSV.fx/workflows/Build%20and%20Test%20with%20Gradle/badge.svg) ![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.

@@ -15,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 (1.0.0)](https://github.com/frosch95/SmartCSV.fx/releases/download/1.0.0/SmartCSV.fx-1.0.0.zip)
+binary distribution of the [latest release (1.2.0)](https://github.com/frosch95/SmartCSV.fx/releases/download/1.2.0/SmartCSV.fx-1.2.0.zip)

 ## Talks
 [Introduction](http://javafx.ninja/talks/introduction/)
@@ -24,7 +24,7 @@ binary distribution of the [latest release (1.0.0)](https://github.com/frosch95/
 ### The MIT License (MIT)


-Copyright (c) 2015-2019 Andreas Billmann <andreas.billmann@javafx.ninja>
+Copyright (c) 2015-2020 Andreas Billmann <andreas.billmann@javafx.ninja>



--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ plugins {
    id 'java'
    id 'groovy'
    id 'application'
-    id 'org.openjfx.javafxplugin' version '0.0.8'
+    id 'org.openjfx.javafxplugin' version '0.0.10'
 }

 repositories {
@@ -11,29 +11,36 @@ repositories {
    jcenter()
 }

+apply plugin: 'java'
+sourceCompatibility = 17
+targetCompatibility = 17
+
 javafx {
+    version = "17"
    modules = [ 'javafx.controls', 'javafx.fxml' ]
 }

 dependencies {
    // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
-    testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.2'
-    testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.5.2'
-    testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '2.2'
-    testCompile group: 'org.mockito', name: 'mockito-core', version:'3.1.0'
-    compile group: 'org.codehaus.groovy', name: 'groovy-all', version: '3.0.0-beta-3'
-    compile group: 'org.springframework', name:'spring-context', version: '5.2.0.RELEASE'
-    compile group: 'net.sf.supercsv', name: 'super-csv', version: '2.4.0'
-    compile group: 'commons-validator', name: 'commons-validator', version: '1.6'
-    compile group: 'de.jensd', name: 'fontawesomefx-commons', version: '11.0'
-    compile group: 'de.jensd', name: 'fontawesomefx-fontawesome', version: '4.7.0-11'
-    compile group: 'de.jensd', name: 'fontawesomefx-materialdesignfont', version: '1.7.22-11'
-    compile group: 'de.jensd', name: 'fontawesomefx-materialicons', version: '2.2.0-11'
-    compile group: 'org.controlsfx', name: 'controlsfx', version: '11.0.0'
-    compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
-    compile group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.10.2'
+    testImplementation  group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.8.2'
+    testRuntimeOnly  group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.2'
+    testImplementation  group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.8.2'
+    testImplementation  group: 'org.hamcrest', name: 'hamcrest-library', version: '2.2'
+    testImplementation  group: 'org.mockito', name: 'mockito-core', version:'3.1.0'
+    implementation  group: 'org.apache.groovy', name: 'groovy', version: '4.0.0-rc-1'
+    implementation  group: 'org.springframework', name:'spring-context', version: '5.3.13'
+    implementation  group: 'de.siegmar', name: 'fastcsv', version: '2.1.0'
+    implementation  group: 'commons-validator', name: 'commons-validator', version: '1.7'
+    implementation  group: 'de.jensd', name: 'fontawesomefx-commons', version: '11.0'
+    implementation  group: 'de.jensd', name: 'fontawesomefx-fontawesome', version: '4.7.0-11'
+    implementation  group: 'de.jensd', name: 'fontawesomefx-materialdesignfont', version: '1.7.22-11'
+    implementation  group: 'de.jensd', name: 'fontawesomefx-materialicons', version: '2.2.0-11'
+    implementation  group: 'org.controlsfx', name: 'controlsfx', version: '11.1.0'
+    implementation  group: 'com.google.code.gson', name: 'gson', version: '2.8.9'
+    implementation  group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.14.1'
+    implementation  group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.14.1'
+    implementation  group: 'org.fxmisc.richtext', name: 'richtextfx', version: '0.10.7'
+
 }

 test {
@@ -41,5 +48,5 @@ test {
 }

 group 'ninja.javafx'
-version '1.0.0'
+version '1.2.0'
 mainClassName = 'ninja.javafx.smartcsv.Main'
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/src/main/java/ninja/javafx/smartcsv/FileReader.java
+++ b/src/main/java/ninja/javafx/smartcsv/FileReader.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/FileWriter.java
+++ b/src/main/java/ninja/javafx/smartcsv/FileWriter.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/Main.java
+++ b/src/main/java/ninja/javafx/smartcsv/Main.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/csv/CSVConfigurable.java
+++ b/src/main/java/ninja/javafx/smartcsv/csv/CSVConfigurable.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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,22 +26,24 @@

 package ninja.javafx.smartcsv.csv;

-import org.supercsv.prefs.CsvPreference;
+import ninja.javafx.smartcsv.preferences.Preferences;
+
+import static ninja.javafx.smartcsv.preferences.Preferences.defaultPreferences;

 /**
 *
 */
 public class CSVConfigurable {

-    protected CsvPreference csvPreference;
+    protected Preferences csvPreference;

    protected String fileEncoding;

    public CSVConfigurable() {
-        csvPreference = CsvPreference.EXCEL_NORTH_EUROPE_PREFERENCE;
+        csvPreference = defaultPreferences();
    }

-    public void setCsvPreference(CsvPreference csvPreference) {
+    public void setCsvPreference(Preferences csvPreference) {
        this.csvPreference = csvPreference;
    }

--- a/src/main/java/ninja/javafx/smartcsv/csv/CSVFileReader.java
+++ b/src/main/java/ninja/javafx/smartcsv/csv/CSVFileReader.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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.csv;

+import de.siegmar.fastcsv.reader.NamedCsvReader;
 import ninja.javafx.smartcsv.FileReader;
 import ninja.javafx.smartcsv.fx.table.model.CSVModel;
-import ninja.javafx.smartcsv.fx.table.model.CSVRow;
-import org.supercsv.io.CsvMapReader;
-import org.supercsv.io.ICsvMapReader;

 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
-import java.util.Map;

 /**
 * reads the csv file and stores the values in csv model
@@ -47,31 +44,38 @@ public class CSVFileReader extends CSVConfigurable implements FileReader<CSVMode
    @Override
    public void read(File file) throws IOException {

-        ICsvMapReader mapReader = null;
-        try {
-            mapReader = new CsvMapReader(new java.io.FileReader(file.getAbsoluteFile(), Charset.forName(fileEncoding)),
-                    csvPreference);
+        System.out.println(csvPreference);
+        try (var csv = getNamedCsvReader(file)) {
            model = new CSVModel();

            // the header columns are used as the keys to the Map
-            String[] header = mapReader.getHeader(true);
+            var header = csv.getHeader().toArray(new String[csv.getHeader().size()]);
            model.setHeader(header);

-            Map<String, String> customerMap;
-            while ((customerMap = mapReader.read(header)) != null) {
-                CSVRow row = model.addRow();
+            csv.forEach(csvRow -> {
+                var row = model.addRow();
                for (String column : header) {
-                    model.addValue(row, column, customerMap.get(column));
+                    model.addValue(row, column, csvRow.getField(column));
                }
-            }
+            });

-        } finally {
-            if (mapReader != null) {
-                mapReader.close();
-            }
+        } catch (IOException ex) {
+            // TODO perhaps a custom NinjaException that can properly identify and localize the exception message
+            // is this a file not found? is this a corrupt csv? etc
+            throw new IOException("Failed to read " + file + ": " + ex.getMessage(), ex);
        }
    }

+    private NamedCsvReader getNamedCsvReader(File file) throws IOException {
+        var builder = NamedCsvReader.builder()
+                .fieldSeparator(csvPreference.delimiterChar());
+        if (csvPreference.quoteChar() != null) {
+            builder.quoteCharacter(csvPreference.quoteChar());
+        }
+
+        return builder.build(file.toPath(), Charset.forName(fileEncoding));
+    }
+
    public CSVModel getContent() {
        return model;
    }
--- a/src/main/java/ninja/javafx/smartcsv/csv/CSVFileWriter.java
+++ b/src/main/java/ninja/javafx/smartcsv/csv/CSVFileWriter.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 javafx.ninja <info@javafx.ninja>
                                                                                                                    
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -26,18 +26,17 @@

 package ninja.javafx.smartcsv.csv;

+import de.siegmar.fastcsv.writer.CsvWriter;
+import de.siegmar.fastcsv.writer.QuoteStrategy;
 import ninja.javafx.smartcsv.fx.table.model.CSVModel;
 import ninja.javafx.smartcsv.fx.table.model.CSVRow;
-import org.supercsv.io.CsvMapWriter;
-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 java.util.List;

-import static java.util.stream.Collectors.toMap;
+import static java.util.stream.Collectors.toList;

 /**
 * filewriter for the csv
@@ -52,22 +51,22 @@ public class CSVFileWriter extends CSVConfigurable implements ninja.javafx.smart

    @Override
    public void write(File filename) throws IOException {
-        ICsvMapWriter mapWriter = null;
-        try {
-            mapWriter = new CsvMapWriter(new FileWriter(filename.getAbsolutePath(), Charset.forName(fileEncoding)),
-                    csvPreference);
-            mapWriter.writeHeader(model.getHeader());
-
+        try (var writer = getCsvWriter(filename)){
+            writer.writeRow(model.getHeader());
            for(CSVRow row: model.getRows()) {
-                Map<String, String> columns = convertMapFromModel(row);
-                mapWriter.write(columns, model.getHeader());
+                writer.writeRow(convertMapFromModel(row));
            }
        }
-        finally {
-            if( mapWriter != null ) {
-                mapWriter.close();
-            }
+    }
+
+    private CsvWriter getCsvWriter(File filename) throws IOException {
+        var writer = CsvWriter.builder().fieldSeparator(csvPreference.delimiterChar());
+        if (csvPreference.quoteChar() != null) {
+            writer.quoteCharacter(csvPreference.quoteChar());
+            writer.quoteStrategy(QuoteStrategy.ALWAYS);
        }
+
+        return writer.build(filename.toPath(), Charset.forName(fileEncoding));
    }

    /**
@@ -75,13 +74,8 @@ public class CSVFileWriter extends CSVConfigurable implements ninja.javafx.smart
     * @param row the row to convert
     * @return a simple map for the supercvs writer
     */
-    private Map<String, String> convertMapFromModel(CSVRow row) {
-        return row.getColumns().entrySet().stream()
-                .collect(
-                        toMap(
-                            Map.Entry::getKey,
-                            e -> e.getValue().getValue().getValue() != null ? e.getValue().getValue().getValue() : ""
-                        )
-                );
+    private List<String> convertMapFromModel(CSVRow row) {
+        return row.getColumns().values().stream().map(v -> v.get().getValue())
+                .collect(toList());
    }
 }
--- a/src/main/java/ninja/javafx/smartcsv/export/ErrorExport.java
+++ b/src/main/java/ninja/javafx/smartcsv/export/ErrorExport.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/files/FileStorage.java
+++ b/src/main/java/ninja/javafx/smartcsv/files/FileStorage.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/fx/FXMLController.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/FXMLController.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/fx/SmartCSV.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/SmartCSV.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
@@ -85,6 +85,8 @@ public class SmartCSV extends Application {
    private void showUI(Stage primaryStage, String name, String version) {
        SmartCSVController smartCVSController = appContext.getBean(SmartCSVController.class);
        Scene scene = new Scene((Parent) smartCVSController.getView());
+        var defaultThemeCss = getClass().getResource("/ninja/javafx/smartcsv/fx/smartcsv.css").toExternalForm();
+        scene.getRoot().getStylesheets().add(defaultThemeCss);

        primaryStage.setScene(scene);
        primaryStage.setTitle(String.format("%s %s", name, version));
--- a/src/main/java/ninja/javafx/smartcsv/fx/SmartCSVController.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/SmartCSVController.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 javafx.ninja <info@javafx.ninja>

   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -36,6 +36,8 @@ import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.control.*;
+import javafx.scene.input.Dragboard;
+import javafx.scene.input.TransferMode;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.FileChooser;
@@ -52,6 +54,7 @@ import ninja.javafx.smartcsv.fx.table.ValidationCellFactory;
 import ninja.javafx.smartcsv.fx.table.model.CSVModel;
 import ninja.javafx.smartcsv.fx.table.model.CSVRow;
 import ninja.javafx.smartcsv.fx.table.model.CSVValue;
+import ninja.javafx.smartcsv.fx.util.JavaFxUtils;
 import ninja.javafx.smartcsv.fx.util.LoadFileService;
 import ninja.javafx.smartcsv.fx.util.SaveFileService;
 import ninja.javafx.smartcsv.fx.validation.ValidationEditorController;
@@ -63,7 +66,6 @@ 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;
-import org.supercsv.prefs.CsvPreference;

 import java.io.File;
 import java.io.IOException;
@@ -78,6 +80,7 @@ import static javafx.application.Platform.exit;
 import static javafx.application.Platform.runLater;
 import static javafx.beans.binding.Bindings.*;
 import static javafx.scene.layout.AnchorPane.*;
+import static ninja.javafx.smartcsv.preferences.Preferences.defaultPreferences;

 /**
 * main controller of the application
@@ -85,6 +88,7 @@ import static javafx.scene.layout.AnchorPane.*;
@Component
 public class SmartCSVController extends FXMLController {

+
    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
    // constants
    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -206,6 +210,9 @@ public class SmartCSVController extends FXMLController {
    @FXML
    private Label currentLineNumber;

+    @FXML
+    private Label totalNumberOfLines;
+
    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
    // members
    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -220,7 +227,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<Preferences> csvPreferenceFile = new FileStorage<>(new PreferencesFileReader(), new PreferencesFileWriter());
    private FileStorage<String> fileEncodingFile = new FileStorage<>(new EncodingFileReader(), new EncodingFileWriter());

    private ListChangeListener<ValidationError> errorListListener = c -> tableView.refresh();
@@ -250,6 +257,34 @@ public class SmartCSVController extends FXMLController {
        fileEncodingFile.setFile(ENCODING_FILE);

        loadCsvPreferencesFromFile();
+
+        initDragAndDrop();
+    }
+
+    private void initDragAndDrop() {
+        tableWrapper.setOnDragOver(event -> {
+            Dragboard db = event.getDragboard();
+            if (event.getGestureSource() != tableWrapper
+                    && db.hasFiles()
+                    && db.getFiles().size() == 1
+                    && db.getFiles().get(0).getName().endsWith(".csv")) {
+                event.acceptTransferModes(TransferMode.COPY);
+            }
+            event.consume();
+        });
+
+        tableWrapper.setOnDragDropped(event -> {
+            Dragboard db = event.getDragboard();
+            boolean success = false;
+            if (db.hasFiles() && db.getFiles().size() == 1) {
+                File file = db.getFiles().get(0);
+                openFile(currentCsvFile, file);
+                success = true;
+            }
+            /* let the source know whether the string was successfully
+             * transferred and used */
+            event.setDropCompleted(success);
+        });
    }

    private void loadEncodingFromFile() {
@@ -366,7 +401,7 @@ public class SmartCSVController extends FXMLController {
        Optional<ButtonType> result = alert.showAndWait();

        if (result.get() == ButtonType.OK){
-            CsvPreference csvPreference = preferencesController.getCsvPreference();
+            Preferences csvPreference = preferencesController.getCsvPreference();
            setCsvPreference(csvPreference);
            saveCsvPreferences(csvPreference);
            String fileEncoding = CharsetHelper.getCharsetName(preferencesController.getFileEncoding());
@@ -542,12 +577,12 @@ public class SmartCSVController extends FXMLController {
                loadEncodingFromFile();
            });
        } else {
-            setCsvPreference(CsvPreference.EXCEL_NORTH_EUROPE_PREFERENCE);
+            setCsvPreference(defaultPreferences());
            loadEncodingFromFile();
        }
    }

-    private void saveCsvPreferences(CsvPreference csvPreference) {
+    private void saveCsvPreferences(Preferences csvPreference) {
        try {
            createPreferenceFile();
            csvPreferenceFile.setContent(csvPreference);
@@ -570,7 +605,7 @@ public class SmartCSVController extends FXMLController {
        }
    }

-    private void setCsvPreference(CsvPreference csvPreference) {
+    private void setCsvPreference(Preferences csvPreference) {
        preferencesController.setCsvPreference(csvPreference);
        csvFileReader.setCsvPreference(csvPreference);
        csvFileWriter.setCsvPreference(csvPreference);
@@ -594,9 +629,14 @@ public class SmartCSVController extends FXMLController {

        //Show open file dialog
        File file = fileChooser.showOpenDialog(applicationPane.getScene().getWindow());
+        openFile(storageFile, file);
+    }
+
+    private void openFile(FileStorage storageFile, File file) {
        if (file != null) {
+            File previousFile = storageFile.getFile();
            storageFile.setFile(file);
-            useLoadFileService(storageFile, t -> resetContent());
+            useLoadFileService(storageFile, t -> resetContent(), () -> storageFile.setFile(previousFile));
        }
    }

@@ -625,13 +665,20 @@ public class SmartCSVController extends FXMLController {
        return file;
    }

-    private void useLoadFileService(FileStorage fileStorage, EventHandler<WorkerStateEvent> onSucceededHandler) {
+    private void useLoadFileService(FileStorage<?> fileStorage, EventHandler<WorkerStateEvent> onSucceededHandler) {
+        useLoadFileService(fileStorage, onSucceededHandler, () -> {
+            // nothing to rollback
+        });
+    }
+
+    private void useLoadFileService(FileStorage<?> fileStorage, EventHandler<WorkerStateEvent> onSucceededHandler, Runnable rollbackAction) {
        loadFileService.setFileStorage(fileStorage);
        loadFileService.restart();
        loadFileService.setOnSucceeded(onSucceededHandler);
+        loadFileService.setOnFailed(event -> JavaFxUtils.onServiceError(event, "LoadFileService Error", "Failed to load the file.", rollbackAction));
    }

-    private void useSaveFileService(FileStorage fileStorage) {
+    private void useSaveFileService(FileStorage<?> fileStorage) {
        saveFileService.setFileStorage(fileStorage);
        saveFileService.restart();
        saveFileService.setOnSucceeded(t -> resetContent());
@@ -664,6 +711,8 @@ public class SmartCSVController extends FXMLController {
            tableView.getItems().setAll(currentCsvFile.getContent().getRows());
            tableView.setEditable(true);

+            totalNumberOfLines.textProperty().setValue("" + currentCsvFile.getContent().getRows().size());
+
            setBottomAnchor(tableView, 0.0);
            setTopAnchor(tableView, 0.0);
            setLeftAnchor(tableView, 0.0);
--- a/src/main/java/ninja/javafx/smartcsv/fx/about/AboutController.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/about/AboutController.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/fx/list/ErrorSideBar.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/list/ErrorSideBar.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/fx/list/GotoLineDialog.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/list/GotoLineDialog.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/fx/preferences/PreferencesController.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/preferences/PreferencesController.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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,18 +34,15 @@ import javafx.scene.control.ComboBox;
 import javafx.scene.control.TextField;
 import javafx.scene.control.TextFormatter;
 import ninja.javafx.smartcsv.fx.FXMLController;
+import ninja.javafx.smartcsv.preferences.Preferences;
 import org.springframework.beans.factory.annotation.Value;
 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;

-import static ninja.javafx.smartcsv.preferences.QuoteModeHelper.getQuoteMode;
-import static ninja.javafx.smartcsv.preferences.QuoteModeHelper.getQuoteModeName;
-
 /**
 * controller for preferences
 */
@@ -58,15 +55,9 @@ public class PreferencesController extends FXMLController {
    @FXML
    private TextField delimiterChar;

-    @FXML
-    private CheckBox surroundingSpacesNeedQuotes;
-
    @FXML
    private CheckBox ignoreEmptyLines;

-    @FXML
-    private ComboBox<String> quoteMode;
-
    @FXML
    private ComboBox<String> fileEncoding;

@@ -83,7 +74,6 @@ 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 -> {
@@ -102,24 +92,23 @@ public class PreferencesController extends FXMLController {
    }

    private void revalidate() {
-        valid.setValue(quoteChar.getText().length() == 1 && delimiterChar.getText().length() == 1);
+        valid.setValue(quoteChar.getText().length() <= 1 && delimiterChar.getText().length() == 1);
    }

-    public void setCsvPreference(CsvPreference csvPreference) {
-        quoteChar.setText(Character.toString(csvPreference.getQuoteChar()));
-        delimiterChar.setText(Character.toString((char)csvPreference.getDelimiterChar()));
-        surroundingSpacesNeedQuotes.setSelected(csvPreference.isSurroundingSpacesNeedQuotes());
-        ignoreEmptyLines.setSelected(csvPreference.isIgnoreEmptyLines());
-        quoteMode.getSelectionModel().select(getQuoteModeName(csvPreference.getQuoteMode()));
-        endOfLineSymbols = csvPreference.getEndOfLineSymbols();
+    public void setCsvPreference(Preferences csvPreference) {
+        if (csvPreference.quoteChar() != null) {
+            quoteChar.setText(csvPreference.quoteChar().toString());
+        } else {
+            quoteChar.setText("");
+        }
+        delimiterChar.setText(Character.toString(csvPreference.delimiterChar()));
+        ignoreEmptyLines.setSelected(csvPreference.ignoreEmptyLines());
+        endOfLineSymbols = csvPreference.endOfLineSymbols();
    }

-    public CsvPreference getCsvPreference() {
-        return new CsvPreference.Builder(quoteChar.getText().charAt(0), delimiterChar.getText().charAt(0), endOfLineSymbols)
-                .useQuoteMode(getQuoteMode(quoteMode.getSelectionModel().getSelectedItem()))
-                .surroundingSpacesNeedQuotes(surroundingSpacesNeedQuotes.isSelected())
-                .ignoreEmptyLines(ignoreEmptyLines.isSelected())
-                .build();
+    public Preferences getCsvPreference() {
+        var quote = quoteChar.getText().length() == 0 ? null : quoteChar.getText().charAt(0);
+        return new Preferences(quote, delimiterChar.getText().charAt(0), endOfLineSymbols, ignoreEmptyLines.isSelected());
    }

    public void setFileEncoding(String fileEncoding) {
--- a/src/main/java/ninja/javafx/smartcsv/fx/table/EditableValidationCell.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/table/EditableValidationCell.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/fx/table/ObservableMapValueFactory.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/table/ObservableMapValueFactory.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/fx/table/ValidationCellFactory.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/table/ValidationCellFactory.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/fx/table/model/CSVModel.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/table/model/CSVModel.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/fx/table/model/CSVRow.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/table/model/CSVRow.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/fx/table/model/CSVValue.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/table/model/CSVValue.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/fx/table/model/ColumnValueProvider.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/table/model/ColumnValueProvider.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/fx/util/ColorConstants.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/util/ColorConstants.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/fx/util/I18nValidationUtil.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/util/I18nValidationUtil.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/fx/util/JavaFxUtils.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/util/JavaFxUtils.java
@@ -0,0 +1,73 @@
+/*
+   The MIT License (MIT)
+   -----------------------------------------------------------------------------
+
+   Copyright (c) 2021 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.util;
+
+import javafx.concurrent.Worker;
+import javafx.concurrent.WorkerStateEvent;
+import javafx.scene.control.Alert;
+import ninja.javafx.smartcsv.fx.SmartCSVController;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+/**
+ * This class helps extract useful messages from exceptions
+ * TODO: make I18n maybe?
+ */
+public final class JavaFxUtils {
+
+    private static final Logger logger = LogManager.getLogger(SmartCSVController.class);
+
+    private JavaFxUtils() {
+    }
+
+    public static void onServiceError(WorkerStateEvent event, String windowTitle, String errorHeader) {
+        onServiceError(event, windowTitle, errorHeader, () -> {
+        });
+    }
+
+    public static void onServiceError(WorkerStateEvent event, String windowTitle, String errorHeader, Runnable rollbackAction) {
+        Alert alert = new Alert(Alert.AlertType.ERROR);
+        alert.setTitle(windowTitle);
+        alert.setHeaderText(errorHeader);
+        alert.setContentText(findExceptionMessage(event.getSource()));
+        alert.showAndWait();
+    }
+
+    private static String findExceptionMessage(Worker<?> source) {
+        if (source == null) {
+            return "Cannot identify the source of the event!";
+        } else if (source.getException() == null) {
+            return "The event did not have an exception?";
+        }
+        Throwable exception = source.getException();
+        logger.error("Error in " + source.getClass().getSimpleName(), exception);
+        if (exception.getMessage() == null) {
+            return "Exception of type " + exception.getClass() + " had no message, check the logs.";
+        }
+        return exception.getMessage();
+    }
+
+}
--- a/src/main/java/ninja/javafx/smartcsv/fx/util/LoadFileService.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/util/LoadFileService.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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,17 +34,17 @@ import ninja.javafx.smartcsv.files.FileStorage;
 * Service class for async load of a csv file
 */
@org.springframework.stereotype.Service
-public class LoadFileService extends Service {
+public class LoadFileService extends Service<Void> {

-    private FileStorage file;
+    private FileStorage<?> file;

-    public void setFileStorage(FileStorage file) {
+    public void setFileStorage(FileStorage<?> file) {
        this.file = file;
    }

    @Override
-    protected Task createTask() {
-        return new Task() {
+    protected Task<Void> createTask() {
+        return new Task<>() {
            @Override
            protected Void call() throws Exception {
                if (file != null) {
--- a/src/main/java/ninja/javafx/smartcsv/fx/util/SaveFileService.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/util/SaveFileService.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 javafx.ninja <info@javafx.ninja>
                                                                                                                    
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -31,22 +31,22 @@ import javafx.concurrent.Task;
 import ninja.javafx.smartcsv.files.FileStorage;

 /**
- * Service class for async load of a csv file
+ * Service class for async save of a csv file
 */
@org.springframework.stereotype.Service
-public class SaveFileService extends Service {
+public class SaveFileService extends Service<Void> {

-    private FileStorage file;
+    private FileStorage<?> file;

-    public void setFileStorage(FileStorage value) {
+    public void setFileStorage(FileStorage<?> value) {
        file = value;
    }

    @Override
-    protected Task createTask() {
-        return new Task() {
+    protected Task<Void> createTask() {
+        return new Task<>() {
            @Override
-            protected Void call() throws Exception {
+            protected Void call() {
                try {
                    file.save();
                } catch (Throwable ex) {
--- a/src/main/java/ninja/javafx/smartcsv/fx/validation/StringFormatEditorCellFactory.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/validation/StringFormatEditorCellFactory.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/fx/validation/StringFormatStringConverter.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/validation/StringFormatStringConverter.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/fx/validation/ValidationEditorController.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/validation/ValidationEditorController.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/preferences/CharsetHelper.java
+++ b/src/main/java/ninja/javafx/smartcsv/preferences/CharsetHelper.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/preferences/EncodingFileReader.java
+++ b/src/main/java/ninja/javafx/smartcsv/preferences/EncodingFileReader.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/preferences/EncodingFileWriter.java
+++ b/src/main/java/ninja/javafx/smartcsv/preferences/EncodingFileWriter.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/preferences/QuoteModeHelper.java
+++ b/src/main/java/ninja/javafx/smartcsv/preferences/QuoteModeHelper.java
@@ -2,8 +2,8 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
-                                                                                                                    
+   Copyright (c) 2015-2021 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
@@ -21,36 +21,18 @@
   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.supercsv.quote.AlwaysQuoteMode;
-import org.supercsv.quote.ColumnQuoteMode;
-import org.supercsv.quote.NormalQuoteMode;
-import org.supercsv.quote.QuoteMode;
+public record Preferences(
+        Character quoteChar,
+        char delimiterChar,
+        String endOfLineSymbols,
+        boolean ignoreEmptyLines) {

-/**
- * Helper class for mapping quote quoteModeName
- */
-public class QuoteModeHelper {
-
-    public static QuoteMode getQuoteMode(String quoteModeName) {
-        switch (quoteModeName) {
-            case "always": return new AlwaysQuoteMode();
-            case "column": return new ColumnQuoteMode();
-            default: return new NormalQuoteMode();
-        }
-    }
-
-    public static String getQuoteModeName(QuoteMode quoteMode) {
-        if (quoteMode instanceof AlwaysQuoteMode) {
-            return "always";
-        } else if (quoteMode instanceof ColumnQuoteMode) {
-            return "column";
-        } else {
-            return "normal";
-        }
+    public static Preferences defaultPreferences() {
+        return new Preferences('\"',',', "\n", true);
    }
 }
--- a/src/main/java/ninja/javafx/smartcsv/preferences/PreferencesFileReader.java
+++ b/src/main/java/ninja/javafx/smartcsv/preferences/PreferencesFileReader.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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,27 +28,23 @@ package ninja.javafx.smartcsv.preferences;

 import com.google.gson.GsonBuilder;
 import ninja.javafx.smartcsv.FileReader;
-import org.supercsv.prefs.CsvPreference;
-import org.supercsv.quote.AlwaysQuoteMode;

 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;

-import static ninja.javafx.smartcsv.preferences.QuoteModeHelper.getQuoteMode;
+import static ninja.javafx.smartcsv.preferences.Preferences.defaultPreferences;

 /**
 * file reader for the preferences
 */
-public class PreferencesFileReader implements FileReader<CsvPreference> {
+public class PreferencesFileReader implements FileReader<Preferences> {

-    private CsvPreference csvPreference;
+    private Preferences csvPreference;

    public PreferencesFileReader() {
-        csvPreference = new CsvPreference.
-                Builder(CsvPreference.EXCEL_NORTH_EUROPE_PREFERENCE).
-                useQuoteMode(new AlwaysQuoteMode()).build();
+        csvPreference = defaultPreferences();
    }

    @Override
@@ -56,22 +52,15 @@ public class PreferencesFileReader implements FileReader<CsvPreference> {
        Map config = new GsonBuilder().create().fromJson(new java.io.FileReader(filename), HashMap.class);

        if (config != null) {
-            char quoteChar = config.get("quoteChar").toString().charAt(0);
+            Character quoteChar = config.get("quoteChar") == null ? null : 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");
-            String quoteMode = config.get("quoteMode").toString();
-
-            csvPreference = new CsvPreference.Builder(quoteChar, delimiterChar, endOfLineSymbols)
-                    .useQuoteMode(getQuoteMode(quoteMode))
-                    .surroundingSpacesNeedQuotes(surroundingSpacesNeedQuotes)
-                    .ignoreEmptyLines(ignoreEmptyLines)
-                    .build();
+            csvPreference = new Preferences(quoteChar, delimiterChar, endOfLineSymbols, ignoreEmptyLines);
        }
    }

-    public CsvPreference getContent() {
+    public Preferences getContent() {
        return csvPreference;
    }

--- a/src/main/java/ninja/javafx/smartcsv/preferences/PreferencesFileWriter.java
+++ b/src/main/java/ninja/javafx/smartcsv/preferences/PreferencesFileWriter.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

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

 import java.io.File;
 import java.io.IOException;
@@ -40,22 +39,20 @@ import java.util.Map;
 /**
 * Save preferences to configuration file
 */
-public class PreferencesFileWriter implements FileWriter<CsvPreference> {
+public class PreferencesFileWriter implements FileWriter<Preferences> {

-    private CsvPreference csvPreference;
+    private Preferences csvPreference;

-    public void setContent(CsvPreference csvPreference) {
+    public void setContent(Preferences csvPreference) {
        this.csvPreference = csvPreference;
    }

    public void write(File file) throws IOException {
        Map<String, Object> preferences = new HashMap<>();
-        preferences.put("quoteChar", Character.toString(csvPreference.getQuoteChar()));
-        preferences.put("delimiterChar", Character.toString((char)csvPreference.getDelimiterChar()));
-        preferences.put("endOfLineSymbols", csvPreference.getEndOfLineSymbols());
-        preferences.put("surroundingSpacesNeedQuotes", csvPreference.isSurroundingSpacesNeedQuotes());
-        preferences.put("ignoreEmptyLines", csvPreference.isIgnoreEmptyLines());
-        preferences.put("quoteMode", QuoteModeHelper.getQuoteModeName(csvPreference.getQuoteMode()));
+        preferences.put("quoteChar", csvPreference.quoteChar() == null ? null: csvPreference.quoteChar().toString());
+        preferences.put("delimiterChar", Character.toString((char)csvPreference.delimiterChar()));
+        preferences.put("endOfLineSymbols", csvPreference.endOfLineSymbols());
+        preferences.put("ignoreEmptyLines", csvPreference.ignoreEmptyLines());

        Gson gson = new GsonBuilder().setPrettyPrinting().create();
        Files.write(file.toPath(), gson.toJson(preferences).getBytes());
--- a/src/main/java/ninja/javafx/smartcsv/validation/RevalidationService.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/RevalidationService.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/ValidationError.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/ValidationError.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/ValidationFileReader.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/ValidationFileReader.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/ValidationFileWriter.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/ValidationFileWriter.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/ValidationMessage.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/ValidationMessage.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/Validator.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/Validator.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/checker/BinaryValidation.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/BinaryValidation.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/checker/DateValidation.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/DateValidation.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/checker/DoubleValidation.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/DoubleValidation.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/checker/EmailValidation.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/EmailValidation.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/checker/GroovyValidation.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/GroovyValidation.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/checker/IntegerValidation.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/IntegerValidation.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/checker/MaxLengthValidation.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/MaxLengthValidation.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/checker/MinLengthValidation.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/MinLengthValidation.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/checker/NotEmptyValidation.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/NotEmptyValidation.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/checker/RegExpValidation.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/RegExpValidation.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/checker/UniqueValidation.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/UniqueValidation.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/checker/UriValidation.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/UriValidation.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/checker/UuidValidation.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/UuidValidation.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/checker/Validation.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/Validation.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/checker/ValueOfValidation.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/checker/ValueOfValidation.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/configuration/Constraints.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/configuration/Constraints.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/configuration/Field.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/configuration/Field.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/configuration/StringFormat.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/configuration/StringFormat.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/configuration/Type.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/configuration/Type.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/java/ninja/javafx/smartcsv/validation/configuration/ValidationConfiguration.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/configuration/ValidationConfiguration.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/main/resources/ninja/javafx/smartcsv/fx/about/about.fxml
+++ b/src/main/resources/ninja/javafx/smartcsv/fx/about/about.fxml
@@ -23,6 +23,7 @@
      </Label>
      <Label text="AOE Takashi (https://github.com/aoetk)" />
      <Label text="Hasan Kara (https://github.com/haisi)" />
+      <Label text="apixandru (https://github.com/apixandru)" />
      <Label text="3rd party software">
         <VBox.margin>
            <Insets top="8.0" />
@@ -60,8 +61,8 @@
                  <Hyperlink onAction="#openLinkInBrowser" text="http://www.groovy-lang.org/" GridPane.columnIndex="1" GridPane.rowIndex="2" />
                  <Label text="spring framework" GridPane.rowIndex="3" />
                  <Hyperlink onAction="#openLinkInBrowser" text="https://spring.io/" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-                  <Label text="supercsv" GridPane.rowIndex="4" />
-                   <Hyperlink onAction="#openLinkInBrowser" text="http://super-csv.github.io/super-csv/" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+                  <Label text="FastCSV" GridPane.rowIndex="4" />
+                   <Hyperlink onAction="#openLinkInBrowser" text="https://github.com/osiegmar/FastCSV" GridPane.columnIndex="1" GridPane.rowIndex="4" />
                  <Label text="Gson" GridPane.rowIndex="5" />
                   <Hyperlink onAction="#openLinkInBrowser" text="https://github.com/google/gson/" GridPane.columnIndex="1" GridPane.rowIndex="5" />
                  <Label text="commons-validator" GridPane.rowIndex="6" />
@@ -89,7 +90,7 @@
            <Font size="18.0" />
         </font>
      </Label>
-      <TextArea editable="false" prefHeight="200.0" prefWidth="200.0" text="Copyright (c) 2015-2019 Andreas Billmann &lt;andreas.billmann@javafx.ninja&gt;&#10;&#10;Permission is hereby granted, free of charge, to any person obtaining a copy&#10;of this software and associated documentation files (the &quot;Software&quot;), to deal&#10;in the Software without restriction, including without limitation the rights&#10;to use, copy, modify, merge, publish, distribute, sublicense, and/or sell&#10;copies of the Software, and to permit persons to whom the Software is&#10;furnished to do so, subject to the following conditions:&#10;&#10;The above copyright notice and this permission notice shall be included in&#10;all copies or substantial portions of the Software.&#10;&#10;&#10;&#10;THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR&#10;IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,&#10;FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE&#10;AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER&#10;LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,&#10;OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN&#10;THE SOFTWARE." wrapText="true" />
+      <TextArea editable="false" prefHeight="200.0" prefWidth="200.0" text="Copyright (c) 2015-2021 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 />
--- a/src/main/resources/ninja/javafx/smartcsv/fx/application.properties
+++ b/src/main/resources/ninja/javafx/smartcsv/fx/application.properties
@@ -1,5 +1,5 @@
 application.name = SmartCSV.fx
-application.version = 1.0.0
+application.version = 1.2.0

 # fxml views
 fxml.smartcvs.view = /ninja/javafx/smartcsv/fx/smartcsv.fxml
--- a/src/main/resources/ninja/javafx/smartcsv/fx/preferences/preferences.fxml
+++ b/src/main/resources/ninja/javafx/smartcsv/fx/preferences/preferences.fxml
@@ -12,23 +12,17 @@
    <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 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" />
      <TextField fx:id="quoteChar" GridPane.columnIndex="1" />
      <Label text="%preferences.delimiterChar" GridPane.rowIndex="1" />
      <TextField fx:id="delimiterChar" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-      <Label text="%preferences.surroundingSpacesNeedQuotes" GridPane.rowIndex="2" />
-      <CheckBox fx:id="surroundingSpacesNeedQuotes" mnemonicParsing="false" text="" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-      <Label text="%preferences.ignoreEmptyLines" GridPane.rowIndex="3" />
-      <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" />
+      <Label text="%preferences.ignoreEmptyLines" GridPane.rowIndex="2" />
+      <CheckBox fx:id="ignoreEmptyLines" mnemonicParsing="false" text="" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+      <Label text="%preferences.fileEncoding" GridPane.rowIndex="3" />
+      <ComboBox fx:id="fileEncoding" editable="true" prefWidth="150.0" GridPane.columnIndex="1" GridPane.rowIndex="3" />
   </children>
   <padding>
      <Insets bottom="8.0" left="8.0" right="8.0" top="8.0" />
--- a/src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.fxml
+++ b/src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.fxml
@@ -5,7 +5,6 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import java.net.URL?>
 <BorderPane fx:id="applicationPane" maxHeight="-Infinity" maxWidth="1000.0" minHeight="700.0" minWidth="-Infinity" prefHeight="700.0" prefWidth="1000.0" xmlns="http://javafx.com/javafx/8.0.101" xmlns:fx="http://javafx.com/fxml/1">
    <top>
        <VBox id="background" prefWidth="100.0" BorderPane.alignment="CENTER">
@@ -265,9 +264,6 @@
    </center>
    <left>
    </left>
-    <stylesheets>
-        <URL value="@/ninja/javafx/smartcsv/fx/smartcsv.css" />
-    </stylesheets>
    <bottom>
        <GridPane hgap="8.0" BorderPane.alignment="CENTER">
            <columnConstraints>
@@ -279,7 +275,9 @@
                <ColumnConstraints hgrow="ALWAYS" minWidth="10.0" />
                <ColumnConstraints hgrow="NEVER" minWidth="10.0" />
                <ColumnConstraints fillWidth="false" halignment="RIGHT" hgrow="NEVER" minWidth="10.0" prefWidth="100.0" />
-            <ColumnConstraints hgrow="ALWAYS" minWidth="10.0" prefWidth="100.0" />
+                <ColumnConstraints hgrow="ALWAYS" minWidth="10.0" prefWidth="100.0" />
+                <ColumnConstraints fillWidth="false" halignment="RIGHT" hgrow="NEVER" minWidth="10.0" prefWidth="100.0" />
+                <ColumnConstraints hgrow="ALWAYS" minWidth="10.0" prefWidth="100.0" />
            </columnConstraints>
            <rowConstraints>
                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
@@ -293,6 +291,8 @@
                <Label fx:id="configurationName" GridPane.columnIndex="5" GridPane.hgrow="ALWAYS" />
                <Label text="%lineNumber" GridPane.columnIndex="7" />
                <Label fx:id="currentLineNumber" text="" GridPane.columnIndex="8" />
+                <Label text="%totalNumberOfLines" GridPane.columnIndex="9" />
+                <Label fx:id="totalNumberOfLines" text="0" GridPane.columnIndex="10" />
            </children>
            <BorderPane.margin>
                <Insets bottom="4.0" left="8.0" right="8.0" top="4.0" />
--- a/src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.properties
+++ b/src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.properties
@@ -87,6 +87,7 @@ dialog.validation.rules.header = Validation rules of column "{0}"
 context.menu.edit.column.rules = Edit rules

 lineNumber = Selected line:
+totalNumberOfLines = Lines:

 log.header.message = {0} has {1} errors
 log.message = row {0} column {1} : {2}
--- a/src/main/resources/ninja/javafx/smartcsv/fx/smartcsv_de.properties
+++ b/src/main/resources/ninja/javafx/smartcsv/fx/smartcsv_de.properties
@@ -97,6 +97,7 @@ dialog.validation.rules.header = Pr\u00fcfregeln f\u00fcr die Spalte "{0}"
 context.menu.edit.column.rules = Pr\u00fcfregeln bearbeiten

 lineNumber = Ausgew\u00e4hlte Zeile:
+totalNumberOfLines = Zeilen:

 log.header.message = {0} hat {1} Fehler
 log.message = Zeile {0} Spalte {1} : {2}
--- a/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVModelTest.java
+++ b/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVModelTest.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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,8 +28,9 @@ package ninja.javafx.smartcsv.fx.table.model;

 import org.junit.jupiter.api.Test;

+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
+

 /**
 * unit test for the csv model
--- a/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVRowTest.java
+++ b/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVRowTest.java
@@ -2,9 +2,10 @@ package ninja.javafx.smartcsv.fx.table.model;

 import org.junit.jupiter.api.Test;

+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+

 /**
 * unit test for row class
--- a/src/test/java/ninja/javafx/smartcsv/preferences/CharsetHelperTest.java
+++ b/src/test/java/ninja/javafx/smartcsv/preferences/CharsetHelperTest.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 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
--- a/src/test/java/ninja/javafx/smartcsv/validation/HeaderValidationTest.java
+++ b/src/test/java/ninja/javafx/smartcsv/validation/HeaderValidationTest.java
@@ -2,7 +2,7 @@
   The MIT License (MIT)
   -----------------------------------------------------------------------------

-   Copyright (c) 2015-2019 javafx.ninja <info@javafx.ninja>
+   Copyright (c) 2015-2021 javafx.ninja <info@javafx.ninja>
                                                                                                                    
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -38,9 +38,10 @@ import java.util.stream.Stream;

 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+

 /**
 * unit test for header validator
--- a/src/test/java/ninja/javafx/smartcsv/validation/ValidatorTest.java
+++ b/src/test/java/ninja/javafx/smartcsv/validation/ValidatorTest.java
@@ -12,9 +12,9 @@ import java.util.stream.Stream;

 import static java.util.Arrays.asList;
 import static java.util.stream.Collectors.joining;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;

 /**
 * unit test for validator
Author	SHA1	Message	Date
Andreas Billmann	7dac3ce011	Merge pull request #29 from frosch95/dragndrop Support for Drag'n'Drop	2022-10-19 12:49:36 +02:00
Andreas Billmann	449f929f08	Support for drag'n'drop	2022-10-19 12:34:55 +02:00
Andreas Billmann	9e3561fedb	fix release link	2022-10-15 13:59:48 +02:00
Andreas Billmann	9c1b110bfd	Merge pull request #28 from frosch95/total_number_of_lines total number of lines	2022-10-15 13:47:55 +02:00
Andreas Billmann	398219a897	total number of lines	2022-10-15 13:41:31 +02:00
Andreas Billmann	a79dde5421	Merge pull request #24 from frosch95/switch_to_fastcsv switch to fastcsv	2021-12-10 00:54:12 +01:00
Andreas Billmann	fb234fa50e	fix tests	2021-12-10 00:51:38 +01:00
Andreas Billmann	43856dffab	switch to fastcsv as supercsv is not maintaned anymore	2021-12-10 00:30:59 +01:00
Andreas Billmann	8cecca2172	update the thanks section	2021-11-23 06:19:33 +01:00
Andreas Billmann	35f395d44a	Update README.md	2021-11-22 22:22:55 +01:00
Andreas Billmann	9961373d76	Update version	2021-11-22 22:11:04 +01:00
Andreas Billmann	fd6938fa80	Merge pull request #23 from apixandru/loader_exceptions #22 don't ignore loading exceptions	2021-11-22 22:08:58 +01:00
Alexandru	78f3f5909e	#22 don't ignore loading exceptions	2021-10-29 05:05:13 -07:00
Andreas Billmann	d572dcdeed	JDK17	2021-10-02 09:26:59 +02:00
Andreas Billmann	af6ce56f71	changed to jdk 17 LTS	2021-10-02 07:28:16 +02:00
Andreas Billmann	2f692352b7	remove travis badge	2020-11-02 22:02:45 +01:00
Andreas Billmann	5b59c76200	try to build on ubuntu	2020-11-02 22:00:20 +01:00
Andreas Billmann	7e40daa1e5	remove branch dependencies	2020-11-02 21:54:59 +01:00
Andreas Billmann	2da843e1e2	added gthub action badge	2020-11-02 21:45:28 +01:00
Andreas Billmann	d1ffd09941	use github action	2020-11-02 21:42:57 +01:00
Andreas Billmann	4c29d29bf5	Update README.md	2020-10-06 02:19:28 +02:00
Andreas Billmann	c4f91d94f1	Merge pull request #18 from frosch95/update-dependencies update the dependencies	2020-10-02 23:43:52 +02:00
Andreas Billmann	8c43c5a1de	update the dependencies	2020-10-02 23:40:31 +02:00