From ab952aa98ff10e348540e48c39b84b88785262a8 Mon Sep 17 00:00:00 2001
From: Andreas Billmann <andreas@billmann.de>
Date: Sun, 7 Aug 2016 23:13:47 +0200
Subject: [PATCH] optimized imports based on intellij IDEA

---
 .../javafx/smartcsv/csv/CSVFileReader.java    |  2 --
 .../javafx/smartcsv/csv/CSVFileWriter.java    |  1 -
 .../ninja/javafx/smartcsv/fx/SmartCSV.java    |  2 --
 .../smartcsv/fx/SmartCSVController.java       |  8 ------
 .../javafx/smartcsv/fx/list/ErrorSideBar.java |  1 -
 .../smartcsv/fx/list/GotoLineDialog.java      |  1 -
 .../fx/table/EditableValidationCell.java      |  1 -
 .../smartcsv/fx/table/model/CSVRow.java       |  3 ---
 .../smartcsv/fx/table/model/CSVValue.java     |  1 -
 .../smartcsv/fx/util/LoadFileService.java     |  3 ---
 .../smartcsv/fx/util/SaveFileService.java     |  6 -----
 .../preferences/PreferencesFileReader.java    |  1 -
 .../preferences/PreferencesFileWriter.java    |  1 -
 .../validation/ValidationFileReader.java      |  1 -
 .../validation/ValidationFileWriter.java      |  1 -
 .../ninja/javafx/smartcsv/fx/about/about.fxml | 13 +++-------
 .../smartcsv/fx/preferences/preferences.fxml  |  4 +--
 .../ninja/javafx/smartcsv/fx/smartcsv.fxml    | 26 ++++---------------
 .../fx/validation/validationEditor.fxml       | 12 +++------
 .../smartcsv/fx/table/model/CSVModelTest.java |  5 +---
 .../smartcsv/fx/table/model/CSVRowTest.java   |  5 +---
 21 files changed, 14 insertions(+), 84 deletions(-)

diff --git a/src/main/java/ninja/javafx/smartcsv/csv/CSVFileReader.java b/src/main/java/ninja/javafx/smartcsv/csv/CSVFileReader.java
index 6f09efc..99f077f 100644
--- a/src/main/java/ninja/javafx/smartcsv/csv/CSVFileReader.java
+++ b/src/main/java/ninja/javafx/smartcsv/csv/CSVFileReader.java
@@ -29,8 +29,6 @@ package ninja.javafx.smartcsv.csv;
 import ninja.javafx.smartcsv.FileReader;
 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 org.springframework.stereotype.Service;
 import org.supercsv.io.CsvMapReader;
 import org.supercsv.io.ICsvMapReader;
 
diff --git a/src/main/java/ninja/javafx/smartcsv/csv/CSVFileWriter.java b/src/main/java/ninja/javafx/smartcsv/csv/CSVFileWriter.java
index 9e63ccf..0fe6d9f 100644
--- a/src/main/java/ninja/javafx/smartcsv/csv/CSVFileWriter.java
+++ b/src/main/java/ninja/javafx/smartcsv/csv/CSVFileWriter.java
@@ -28,7 +28,6 @@ package ninja.javafx.smartcsv.csv;
 
 import ninja.javafx.smartcsv.fx.table.model.CSVModel;
 import ninja.javafx.smartcsv.fx.table.model.CSVRow;
-import org.springframework.stereotype.Service;
 import org.supercsv.io.CsvMapWriter;
 import org.supercsv.io.ICsvMapWriter;
 
diff --git a/src/main/java/ninja/javafx/smartcsv/fx/SmartCSV.java b/src/main/java/ninja/javafx/smartcsv/fx/SmartCSV.java
index 19bfb12..881c3f5 100644
--- a/src/main/java/ninja/javafx/smartcsv/fx/SmartCSV.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/SmartCSV.java
@@ -28,11 +28,9 @@ package ninja.javafx.smartcsv.fx;
 
 import javafx.application.Application;
 import javafx.application.Platform;
-import javafx.event.EventHandler;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
-import javafx.stage.WindowEvent;
 import ninja.javafx.smartcsv.fx.about.AboutController;
 import org.springframework.context.annotation.*;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
diff --git a/src/main/java/ninja/javafx/smartcsv/fx/SmartCSVController.java b/src/main/java/ninja/javafx/smartcsv/fx/SmartCSVController.java
index b2c7918..567a1b0 100644
--- a/src/main/java/ninja/javafx/smartcsv/fx/SmartCSVController.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/SmartCSVController.java
@@ -26,10 +26,6 @@
 
 package ninja.javafx.smartcsv.fx;
 
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener;
 import javafx.collections.WeakListChangeListener;
 import javafx.concurrent.WorkerStateEvent;
@@ -41,7 +37,6 @@ import javafx.scene.control.*;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.FileChooser;
-import javafx.util.converter.NumberStringConverter;
 import ninja.javafx.smartcsv.csv.CSVFileReader;
 import ninja.javafx.smartcsv.csv.CSVFileWriter;
 import ninja.javafx.smartcsv.files.FileStorage;
@@ -71,12 +66,9 @@ import org.supercsv.prefs.CsvPreference;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
-import java.text.MessageFormat;
-import java.util.Collection;
 import java.util.Optional;
 import java.util.ResourceBundle;
 
-import static java.lang.Integer.parseInt;
 import static java.lang.Math.max;
 import static java.text.MessageFormat.format;
 import static javafx.application.Platform.exit;
diff --git a/src/main/java/ninja/javafx/smartcsv/fx/list/ErrorSideBar.java b/src/main/java/ninja/javafx/smartcsv/fx/list/ErrorSideBar.java
index cca48f6..6b2cfa4 100644
--- a/src/main/java/ninja/javafx/smartcsv/fx/list/ErrorSideBar.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/list/ErrorSideBar.java
@@ -36,7 +36,6 @@ import javafx.scene.layout.Region;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import ninja.javafx.smartcsv.fx.table.model.CSVModel;
-import ninja.javafx.smartcsv.fx.util.ColorConstants;
 import ninja.javafx.smartcsv.validation.ValidationError;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/src/main/java/ninja/javafx/smartcsv/fx/list/GotoLineDialog.java b/src/main/java/ninja/javafx/smartcsv/fx/list/GotoLineDialog.java
index f187ff6..e92e2ef 100644
--- a/src/main/java/ninja/javafx/smartcsv/fx/list/GotoLineDialog.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/list/GotoLineDialog.java
@@ -1,6 +1,5 @@
 package ninja.javafx.smartcsv.fx.list;
 
-import com.sun.javafx.scene.control.skin.resources.ControlResources;
 import javafx.application.Platform;
 import javafx.geometry.Pos;
 import javafx.scene.control.*;
diff --git a/src/main/java/ninja/javafx/smartcsv/fx/table/EditableValidationCell.java b/src/main/java/ninja/javafx/smartcsv/fx/table/EditableValidationCell.java
index 98453b0..c4054cf 100644
--- a/src/main/java/ninja/javafx/smartcsv/fx/table/EditableValidationCell.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/table/EditableValidationCell.java
@@ -33,7 +33,6 @@ import javafx.scene.control.Tooltip;
 import javafx.scene.input.KeyCode;
 import ninja.javafx.smartcsv.fx.table.model.CSVRow;
 import ninja.javafx.smartcsv.fx.table.model.CSVValue;
-import ninja.javafx.smartcsv.fx.util.ColorConstants;
 
 import java.util.ResourceBundle;
 
diff --git a/src/main/java/ninja/javafx/smartcsv/fx/table/model/CSVRow.java b/src/main/java/ninja/javafx/smartcsv/fx/table/model/CSVRow.java
index 2d10ff0..fcd0429 100644
--- a/src/main/java/ninja/javafx/smartcsv/fx/table/model/CSVRow.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/table/model/CSVRow.java
@@ -28,11 +28,8 @@ package ninja.javafx.smartcsv.fx.table.model;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableMap;
-import ninja.javafx.smartcsv.validation.Validator;
 
 /**
  * This class represents a single row in the csv file.
diff --git a/src/main/java/ninja/javafx/smartcsv/fx/table/model/CSVValue.java b/src/main/java/ninja/javafx/smartcsv/fx/table/model/CSVValue.java
index 57ae498..7903655 100644
--- a/src/main/java/ninja/javafx/smartcsv/fx/table/model/CSVValue.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/table/model/CSVValue.java
@@ -29,7 +29,6 @@ package ninja.javafx.smartcsv.fx.table.model;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import ninja.javafx.smartcsv.validation.ValidationError;
-import ninja.javafx.smartcsv.validation.Validator;
 
 /**
  * The csv value represents the value of a single cell.
diff --git a/src/main/java/ninja/javafx/smartcsv/fx/util/LoadFileService.java b/src/main/java/ninja/javafx/smartcsv/fx/util/LoadFileService.java
index 3aa3335..49606f0 100644
--- a/src/main/java/ninja/javafx/smartcsv/fx/util/LoadFileService.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/util/LoadFileService.java
@@ -28,11 +28,8 @@ package ninja.javafx.smartcsv.fx.util;
 
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;
-import ninja.javafx.smartcsv.FileReader;
 import ninja.javafx.smartcsv.files.FileStorage;
 
-import java.io.File;
-
 /**
  * Service class for async load of a csv file
  */
diff --git a/src/main/java/ninja/javafx/smartcsv/fx/util/SaveFileService.java b/src/main/java/ninja/javafx/smartcsv/fx/util/SaveFileService.java
index 86c6295..03c943b 100644
--- a/src/main/java/ninja/javafx/smartcsv/fx/util/SaveFileService.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/util/SaveFileService.java
@@ -28,14 +28,8 @@ package ninja.javafx.smartcsv.fx.util;
 
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;
-import ninja.javafx.smartcsv.FileWriter;
-import ninja.javafx.smartcsv.csv.CSVFileWriter;
 import ninja.javafx.smartcsv.files.FileStorage;
 
-import java.io.File;
-
-import static javafx.application.Platform.runLater;
-
 /**
  * Service class for async load of a csv file
  */
diff --git a/src/main/java/ninja/javafx/smartcsv/preferences/PreferencesFileReader.java b/src/main/java/ninja/javafx/smartcsv/preferences/PreferencesFileReader.java
index 5a9c920..f6258f6 100644
--- a/src/main/java/ninja/javafx/smartcsv/preferences/PreferencesFileReader.java
+++ b/src/main/java/ninja/javafx/smartcsv/preferences/PreferencesFileReader.java
@@ -28,7 +28,6 @@ package ninja.javafx.smartcsv.preferences;
 
 import com.google.gson.GsonBuilder;
 import ninja.javafx.smartcsv.FileReader;
-import org.springframework.stereotype.Service;
 import org.supercsv.prefs.CsvPreference;
 import org.supercsv.quote.AlwaysQuoteMode;
 
diff --git a/src/main/java/ninja/javafx/smartcsv/preferences/PreferencesFileWriter.java b/src/main/java/ninja/javafx/smartcsv/preferences/PreferencesFileWriter.java
index 9b70649..76fe6e9 100644
--- a/src/main/java/ninja/javafx/smartcsv/preferences/PreferencesFileWriter.java
+++ b/src/main/java/ninja/javafx/smartcsv/preferences/PreferencesFileWriter.java
@@ -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.springframework.stereotype.Service;
 import org.supercsv.prefs.CsvPreference;
 
 import java.io.File;
diff --git a/src/main/java/ninja/javafx/smartcsv/validation/ValidationFileReader.java b/src/main/java/ninja/javafx/smartcsv/validation/ValidationFileReader.java
index 6d4ede7..45e8a60 100644
--- a/src/main/java/ninja/javafx/smartcsv/validation/ValidationFileReader.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/ValidationFileReader.java
@@ -28,7 +28,6 @@ package ninja.javafx.smartcsv.validation;
 
 import com.google.gson.GsonBuilder;
 import ninja.javafx.smartcsv.FileReader;
-import org.springframework.stereotype.Service;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/ninja/javafx/smartcsv/validation/ValidationFileWriter.java b/src/main/java/ninja/javafx/smartcsv/validation/ValidationFileWriter.java
index 8fe2a49..328fcb9 100644
--- a/src/main/java/ninja/javafx/smartcsv/validation/ValidationFileWriter.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/ValidationFileWriter.java
@@ -29,7 +29,6 @@ package ninja.javafx.smartcsv.validation;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import ninja.javafx.smartcsv.FileWriter;
-import org.springframework.stereotype.Service;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/resources/ninja/javafx/smartcsv/fx/about/about.fxml b/src/main/resources/ninja/javafx/smartcsv/fx/about/about.fxml
index 20ed5f5..55b5cab 100644
--- a/src/main/resources/ninja/javafx/smartcsv/fx/about/about.fxml
+++ b/src/main/resources/ninja/javafx/smartcsv/fx/about/about.fxml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Hyperlink?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.TextArea?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
-
 <VBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="600.0" spacing="4.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <Label text="SmartCSV.fx">
diff --git a/src/main/resources/ninja/javafx/smartcsv/fx/preferences/preferences.fxml b/src/main/resources/ninja/javafx/smartcsv/fx/preferences/preferences.fxml
index 5a38f55..bac9768 100644
--- a/src/main/resources/ninja/javafx/smartcsv/fx/preferences/preferences.fxml
+++ b/src/main/resources/ninja/javafx/smartcsv/fx/preferences/preferences.fxml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
-<?import java.lang.*?>
 <?import javafx.scene.layout.*?>
-
 <GridPane hgap="8.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" vgap="8.0" xmlns="http://javafx.com/javafx/8.0.66" xmlns:fx="http://javafx.com/fxml/1">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
diff --git a/src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.fxml b/src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.fxml
index 2b66dd6..86e7046 100644
--- a/src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.fxml
+++ b/src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.fxml
@@ -1,27 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import de.jensd.fx.glyphs.GlyphsStack?>
-<?import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView?>
-<?import java.net.URL?>
+<?import de.jensd.fx.glyphs.*?>
+<?import de.jensd.fx.glyphs.materialdesignicons.*?>
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Menu?>
-<?import javafx.scene.control.MenuBar?>
-<?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.SeparatorMenuItem?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.control.ToolBar?>
-<?import javafx.scene.control.Tooltip?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Region?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
-
+<?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">
diff --git a/src/main/resources/ninja/javafx/smartcsv/fx/validation/validationEditor.fxml b/src/main/resources/ninja/javafx/smartcsv/fx/validation/validationEditor.fxml
index 201c598..6d29851 100644
--- a/src/main/resources/ninja/javafx/smartcsv/fx/validation/validationEditor.fxml
+++ b/src/main/resources/ninja/javafx/smartcsv/fx/validation/validationEditor.fxml
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.net.URL?>
 <?import javafx.geometry.Insets?>
-<?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Spinner?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
 <?import org.fxmisc.richtext.CodeArea?>
-
+<?import java.net.URL?>
 <GridPane hgap="10.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="600.0" vgap="10.0" xmlns="http://javafx.com/javafx/8.0.101" xmlns:fx="http://javafx.com/fxml/1">
   <columnConstraints>
       <ColumnConstraints halignment="CENTER" hgrow="NEVER" maxWidth="50.0" prefWidth="50.0" />
diff --git a/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVModelTest.java b/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVModelTest.java
index a9961df..9725cb4 100644
--- a/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVModelTest.java
+++ b/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVModelTest.java
@@ -26,13 +26,10 @@
 
 package ninja.javafx.smartcsv.fx.table.model;
 
-import ninja.javafx.smartcsv.validation.ValidationConfiguration;
-import ninja.javafx.smartcsv.validation.Validator;
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertThat;
 
 /**
  * unit test for the csv model
diff --git a/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVRowTest.java b/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVRowTest.java
index 39230d8..7649fe7 100644
--- a/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVRowTest.java
+++ b/src/test/java/ninja/javafx/smartcsv/fx/table/model/CSVRowTest.java
@@ -1,13 +1,10 @@
 package ninja.javafx.smartcsv.fx.table.model;
 
-import ninja.javafx.smartcsv.validation.Validator;
-import org.hamcrest.Matchers;
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
+import static org.junit.Assert.assertThat;
 
 /**
  * unit test for row class