From 3b220c3fd58169730fe04dd99e306f183e9d750d Mon Sep 17 00:00:00 2001 From: Andreas Billmann Date: Tue, 16 Feb 2016 17:18:37 +0100 Subject: [PATCH] set the some default preferences if file not found --- .../java/ninja/javafx/smartcsv/fx/SmartCSVController.java | 2 ++ .../smartcsv/fx/preferences/PreferencesController.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/ninja/javafx/smartcsv/fx/SmartCSVController.java b/src/main/java/ninja/javafx/smartcsv/fx/SmartCSVController.java index 7ccd1d2..ac8c20b 100644 --- a/src/main/java/ninja/javafx/smartcsv/fx/SmartCSVController.java +++ b/src/main/java/ninja/javafx/smartcsv/fx/SmartCSVController.java @@ -457,6 +457,8 @@ public class SmartCSVController extends FXMLController { if (PREFERENCES_FILE.exists()) { useLoadFileService(preferencesLoader, PREFERENCES_FILE, event -> setCsvPreference(preferencesLoader.getCSVpreference())); + } else { + setCsvPreference(CsvPreference.EXCEL_NORTH_EUROPE_PREFERENCE); } } diff --git a/src/main/java/ninja/javafx/smartcsv/fx/preferences/PreferencesController.java b/src/main/java/ninja/javafx/smartcsv/fx/preferences/PreferencesController.java index 52a885a..d5f6304 100644 --- a/src/main/java/ninja/javafx/smartcsv/fx/preferences/PreferencesController.java +++ b/src/main/java/ninja/javafx/smartcsv/fx/preferences/PreferencesController.java @@ -66,6 +66,8 @@ public class PreferencesController extends FXMLController { @FXML private ComboBox quoteMode; + private String endOfLineSymbols; + private BooleanProperty valid = new SimpleBooleanProperty(true); @@ -104,10 +106,11 @@ public class PreferencesController extends FXMLController { surroundingSpacesNeedQuotes.setSelected(csvPreference.isSurroundingSpacesNeedQuotes()); ignoreEmptyLines.setSelected(csvPreference.isIgnoreEmptyLines()); quoteMode.getSelectionModel().select(getQuoteModeName(csvPreference.getQuoteMode())); + endOfLineSymbols = csvPreference.getEndOfLineSymbols(); } public CsvPreference getCsvPreference() { - return new CsvPreference.Builder(quoteChar.getText().charAt(0), delimiterChar.getText().charAt(0), "\n") + return new CsvPreference.Builder(quoteChar.getText().charAt(0), delimiterChar.getText().charAt(0), endOfLineSymbols) .useQuoteMode(getQuoteMode(quoteMode.getSelectionModel().getSelectedItem())) .surroundingSpacesNeedQuotes(surroundingSpacesNeedQuotes.isSelected()) .ignoreEmptyLines(ignoreEmptyLines.isSelected())