frosch95/SmartCSV.fx
1
0
Fork 0
mirror of https://github.com/frosch95/SmartCSV.fx.git synced 2026-04-11 13:38:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

use of better icons, create a new validation file for csv

Browse Source
This commit is contained in:
Andreas Billmann
2016-07-22 23:51:08 +02:00
parent 3aa9303b3e
commit 328c1b0b88
9 changed files with 172 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@@ -22,7 +22,10 @@ dependencies {
compile group: 'org.springframework', name:'spring-context', version: '4.3.1.RELEASE'
compile group: 'net.sf.supercsv', name: 'super-csv', version: '2.4.0'
compile group: 'commons-validator', name: 'commons-validator', version: '1.5.1'
compile group: 'de.jensd', name: 'fontawesomefx', version: '8.9'
compile group: 'de.jensd', name: 'fontawesomefx-commons', version: '8.12'
compile group: 'de.jensd', name: 'fontawesomefx-fontawesome', version: '4.6.3'
compile group: 'de.jensd', name: 'fontawesomefx-materialdesignfont', version: '1.6.50'
compile group: 'de.jensd', name: 'fontawesomefx-materialicons', version: '2.2.0'
compile group: 'org.controlsfx', name: 'controlsfx', version: '8.40.11'
compile group: 'com.google.code.gson', name: 'gson', version: '2.7'
compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.6.2'

66
src/main/java/ninja/javafx/smartcsv/fx/SmartCSVController.java
View File

@@ -135,6 +135,9 @@ public class SmartCSVController extends FXMLController {
@FXML
private MenuItem saveAsMenuItem;
@FXML
private MenuItem createConfigMenuItem;
@FXML
private MenuItem loadConfigMenuItem;
@@ -156,6 +159,9 @@ public class SmartCSVController extends FXMLController {
@FXML
private Button saveAsButton;
@FXML
private Button createConfigButton;
@FXML
private Button loadConfigButton;
@@ -199,11 +205,11 @@ public class SmartCSVController extends FXMLController {
setupTableCellFactory();
setupErrorSideBar(resourceBundle);
bindMenuItemsToFileExistence(currentCsvFile, saveMenuItem, saveAsMenuItem, addRowMenuItem, loadConfigMenuItem);
bindButtonsToFileExistence(currentCsvFile, saveButton, saveAsButton, addRowButton, loadConfigButton);
bindMenuItemsToContentExistence(currentCsvFile, saveMenuItem, saveAsMenuItem, addRowMenuItem, createConfigMenuItem, loadConfigMenuItem);
bindButtonsToContentExistence(currentCsvFile, saveButton, saveAsButton, addRowButton, createConfigButton, loadConfigButton);
bindMenuItemsToFileExistence(currentConfigFile, saveConfigMenuItem, saveAsConfigMenuItem);
bindButtonsToFileExistence(currentConfigFile, saveAsConfigButton, saveConfigButton);
bindMenuItemsToContentExistence(currentConfigFile, saveConfigMenuItem, saveAsConfigMenuItem);
bindButtonsToContentExistence(currentConfigFile, saveAsConfigButton, saveConfigButton);
bindCsvFileName();
bindConfigFileName();
@@ -251,6 +257,13 @@ public class SmartCSVController extends FXMLController {
loadFile(JSON_FILTER_TEXT, JSON_FILTER_EXTENSION, "Open Validation Configuration", currentConfigFile);
}
@FXML
public void createConfig(ActionEvent actionEvent) {
currentConfigFile.setContent(currentCsvFile.getContent().createValidationConfiguration());
currentConfigFile.setFile(null);
currentConfigFile.setFileChanged(true);
}
@FXML
public void saveCsv(ActionEvent actionEvent) {
useSaveFileService(currentCsvFile);
@@ -263,7 +276,11 @@ public class SmartCSVController extends FXMLController {
@FXML
public void saveConfig(ActionEvent actionEvent) {
useSaveFileService(currentConfigFile);
if (currentConfigFile.getFile() == null) {
saveAsConfig(actionEvent);
} else {
useSaveFileService(currentConfigFile);
}
}
@FXML
@@ -375,15 +392,15 @@ public class SmartCSVController extends FXMLController {
tableView.getSelectionModel().select(lastRow);
}
private void bindMenuItemsToFileExistence(FileStorage file, MenuItem... items) {
private void bindMenuItemsToContentExistence(FileStorage file, MenuItem... items) {
for (MenuItem item: items) {
item.disableProperty().bind(isNull(file.fileProperty()));
item.disableProperty().bind(isNull(file.contentProperty()));
}
}
private void bindButtonsToFileExistence(FileStorage file, Button... items) {
private void bindButtonsToContentExistence(FileStorage file, Button... items) {
for (Button item: items) {
item.disableProperty().bind(isNull(file.fileProperty()));
item.disableProperty().bind(isNull(file.contentProperty()));
}
}
@@ -461,50 +478,45 @@ public class SmartCSVController extends FXMLController {
File file = fileChooser.showOpenDialog(applicationPane.getScene().getWindow());
if (file != null) {
storageFile.setFile(file);
useLoadFileService(storageFile, event -> runLater(() -> {
resetContent();
storageFile.setFileChanged(false);
}));
useLoadFileService(storageFile, t -> resetContent());
}
}
private File saveFile(String filterText, String filter, FileStorage initFile) {
File file = initFile.getFile();
if (initFile.getContent() != null) {
private File saveFile(String filterText, String filter, FileStorage fileStorage) {
File file = fileStorage.getFile();
if (fileStorage.getContent() != null) {
final FileChooser fileChooser = new FileChooser();
//Set extension filter
final FileChooser.ExtensionFilter extFilter = new FileChooser.ExtensionFilter(filterText, filter);
fileChooser.getExtensionFilters().add(extFilter);
if (initFile.getFile() != null) {
fileChooser.setInitialDirectory(initFile.getFile().getParentFile());
fileChooser.setInitialFileName(initFile.getFile().getName());
if (fileStorage.getFile() != null) {
fileChooser.setInitialDirectory(fileStorage.getFile().getParentFile());
fileChooser.setInitialFileName(fileStorage.getFile().getName());
}
fileChooser.setTitle("Save File");
//Show open file dialog
file = fileChooser.showSaveDialog(applicationPane.getScene().getWindow());
if (file != null) {
initFile.setFile(file);
useSaveFileService(currentCsvFile);
fileStorage.setFile(file);
useSaveFileService(fileStorage);
}
}
return file;
}
private void useLoadFileService(FileStorage fileStorage, EventHandler<WorkerStateEvent> value) {
private void useLoadFileService(FileStorage fileStorage, EventHandler<WorkerStateEvent> onSucceededHandler) {
loadFileService.setFileStorage(fileStorage);
loadFileService.restart();
loadFileService.setOnSucceeded(value);
loadFileService.setOnSucceeded(onSucceededHandler);
}
private void useSaveFileService(FileStorage fileStorage) {
saveFileService.setFileStorage(fileStorage);
saveFileService.restart();
saveFileService.setOnSucceeded(event -> runLater(() -> {
resetContent();
}));
saveFileService.setOnSucceeded(t -> resetContent());
}
/**
@@ -569,7 +581,7 @@ public class SmartCSVController extends FXMLController {
private ContextMenu contextMenuForColumn(String header) {
ContextMenu contextMenu = new ContextMenu();
MenuItem editColumnRulesMenuItem = new MenuItem(resourceBundle.getString("context.menu.edit.column.rules"));
bindMenuItemsToFileExistence(currentConfigFile, editColumnRulesMenuItem);
bindMenuItemsToContentExistence(currentConfigFile, editColumnRulesMenuItem);
editColumnRulesMenuItem.setOnAction(e -> showValidationEditor(header));
contextMenu.getItems().addAll(editColumnRulesMenuItem);
return contextMenu;

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

@@ -126,6 +126,14 @@ public class CSVModel {
return validator != null && validator.hasConfig();
}
public ValidationConfiguration createValidationConfiguration() {
ValidationConfiguration newValidationConfiguration = new ValidationConfiguration();
newValidationConfiguration.setHeaderNames(this.header);
this.validator = new Validator(newValidationConfiguration);
this.revalidate();
return newValidationConfiguration;
}
private static class RevalidationService extends Service<List<ValidationError>> {
private Validator validator;

4
src/main/java/ninja/javafx/smartcsv/validation/HeaderConfiguration.java
View File

@@ -39,4 +39,8 @@ public class HeaderConfiguration {
public String[] getNames() {
return names;
}
public void setNames(String[] names) {
this.names = names;
}
}

4
src/main/java/ninja/javafx/smartcsv/validation/ValidationConfiguration.java
View File

@@ -48,6 +48,10 @@ public class ValidationConfiguration {
return headerConfiguration.getNames();
}
public void setHeaderNames(String[] headerNames) {
headerConfiguration.setNames(headerNames);
}
public Boolean getIntegerRuleFor(String column) {
return (Boolean)getValue(column, "integer");
}

65
src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.css
View File

@@ -15,48 +15,68 @@
}
.open-icon {
-glyph-name: "FILE_TEXT_ALT";
-glyph-size: 14px;
-glyph-name: "FILE_IMPORT";
-glyph-size: 16px;
}
.file-document-icon {
-glyph-name: "FILE_DOCUMENT";
-glyph-size: 16px;
}
.config-icon {
-glyph-name: "CHECK";
-glyph-size: 14px;
-glyph-name: "CLIPBOARD";
-glyph-size: 16px;
}
.create-config-icon {
-glyph-name: "STAR";
-glyph-size: 10px;
}
.load-config-icon {
-glyph-name: "ARROW_UP_BOLD";
-glyph-size: 10px;
}
.save-config-icon {
-glyph-name: "ARROW_DOWN_BOLD";
-glyph-size: 10px;
}
.save-icon {
-glyph-name: "FLOPPY_ALT";
-glyph-size: 14px;
-glyph-name: "FILE_EXPORT";
-glyph-size: 16px;
}
.exit-icon {
-glyph-name: "SIGN_OUT";
-glyph-size: 14px;
-glyph-name: "EXIT_TO_APP";
-glyph-size: 16px;
}
.info-icon {
-glyph-name: "INFO";
-glyph-size: 14px;
-glyph-name: "INFORMATION_OUTLINE";
-glyph-size: 16px;
}
.error-title-icon {
-glyph-name: "EXCLAMATION_TRIANGLE";
-glyph-size: 14px;
.config-check-icon {
-glyph-name: "CLIPBOARD_CHECK";
-glyph-size: 16px;
}
.preferences-icon {
-glyph-name: "COG";
-glyph-size: 14px;
-glyph-name: "SETTINGS";
-glyph-size: 16px;
}
.delete-icon {
-glyph-name: "MINUS";
-glyph-size: 14px;
-glyph-name: "TABLE_ROW_REMOVE";
-glyph-size: 16px;
}
.add-icon {
-glyph-name: "PLUS";
-glyph-size: 14px;
-glyph-name: "TABLE_ROW_PLUS_AFTER";
-glyph-size: 16px;
}
/* toolbar customization based on http://fxexperience.com/2012/02/customized-segmented-toolbar-buttons/ */
@@ -91,6 +111,13 @@
-fx-fill: white;
}
.menu-item .load-config-icon,
.menu-item .save-config-icon,
.menu-item .create-config-icon
{
-fx-fill: white;
}
.tool-bar .save-icon {
-glyph-size: 16px;
-fx-fill: white;

97
src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.fxml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import de.jensd.fx.glyphs.GlyphsStack?>
<?import de.jensd.fx.glyphs.fontawesome.FontAwesomeIconView?>
<?import java.net.URL?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
@@ -22,6 +21,7 @@
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>
<?import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView?>
<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.65" xmlns:fx="http://javafx.com/fxml/1">
<top>
<VBox id="background" prefWidth="100.0" BorderPane.alignment="CENTER">
@@ -32,57 +32,72 @@
<items>
<MenuItem mnemonicParsing="false" onAction="#openCsv" text="%menu.open.csv">
<graphic>
<FontAwesomeIconView styleClass="open-icon" />
<MaterialDesignIconView styleClass="open-icon" />
</graphic>
</MenuItem>
<MenuItem fx:id="saveMenuItem" disable="true" mnemonicParsing="false" onAction="#saveCsv" text="%menu.save">
<graphic>
<FontAwesomeIconView styleClass="save-icon" />
<MaterialDesignIconView styleClass="save-icon" />
</graphic>
</MenuItem>
<MenuItem fx:id="saveAsMenuItem" disable="true" mnemonicParsing="false" onAction="#saveAsCsv" text="%menu.save.as">
<graphic>
<FontAwesomeIconView styleClass="save-icon" />
<MaterialDesignIconView styleClass="save-icon" />
</graphic>
</MenuItem>
<SeparatorMenuItem mnemonicParsing="false" />
<MenuItem fx:id="createConfigMenuItem" disable="true" mnemonicParsing="false" onAction="#createConfig" text="%menu.create.config">
<graphic>
<GlyphsStack>
<children>
<MaterialDesignIconView styleClass="config-icon" />
<MaterialDesignIconView style="-fx-opacity: 0.7;" styleClass="create-config-icon" />
</children>
</GlyphsStack>
</graphic>
</MenuItem>
<MenuItem fx:id="loadConfigMenuItem" disable="true" mnemonicParsing="false" onAction="#openConfig" text="%menu.open.config">
<graphic>
<FontAwesomeIconView styleClass="config-icon" />
<GlyphsStack>
<children>
<MaterialDesignIconView styleClass="config-icon" />
<MaterialDesignIconView style="-fx-opacity: 0.7;" styleClass="load-config-icon" />
</children>
</GlyphsStack>
</graphic>
</MenuItem>
<MenuItem fx:id="saveConfigMenuItem" disable="true" mnemonicParsing="false" onAction="#saveConfig" text="%menu.save.config">
<graphic>
<GlyphsStack>
<children>
<FontAwesomeIconView style="-fx-opacity: 0.7;" styleClass="save-icon" />
<FontAwesomeIconView styleClass="config-icon" />
<MaterialDesignIconView styleClass="config-icon" />
<MaterialDesignIconView style="-fx-opacity: 0.7;" styleClass="save-config-icon" />
</children>
</GlyphsStack>
</graphic>
</MenuItem>
<MenuItem fx:id="saveAsConfigMenuItem" disable="true" mnemonicParsing="false" onAction="#saveAsConfig" text="%menu.save.as.config">
<graphic>
<GlyphsStack>
<children>
<FontAwesomeIconView style="-fx-opacity: 0.7;" styleClass="save-icon" />
<FontAwesomeIconView styleClass="config-icon" />
</children>
</GlyphsStack>
<GlyphsStack>
<children>
<MaterialDesignIconView styleClass="config-icon" />
<MaterialDesignIconView style="-fx-opacity: 0.7;" styleClass="save-config-icon" />
</children>
</GlyphsStack>
</graphic>
</MenuItem>
<SeparatorMenuItem mnemonicParsing="false" />
<MenuItem mnemonicParsing="false" onAction="#preferences" text="%menu.preferences">
<graphic>
<FontAwesomeIconView styleClass="preferences-icon" />
<MaterialDesignIconView styleClass="preferences-icon" />
</graphic>
</MenuItem>
<SeparatorMenuItem mnemonicParsing="false" />
<MenuItem mnemonicParsing="false" onAction="#close" text="%menu.close">
<graphic>
<FontAwesomeIconView styleClass="exit-icon" />
<MaterialDesignIconView styleClass="exit-icon" />
</graphic>
</MenuItem>
</items>
@@ -91,12 +106,12 @@
<items>
<MenuItem fx:id="deleteRowMenuItem" disable="true" mnemonicParsing="false" onAction="#deleteRow" text="%menu.delete.row">
<graphic>
<FontAwesomeIconView styleClass="delete-icon" />
<MaterialDesignIconView styleClass="delete-icon" />
</graphic>
</MenuItem>
<MenuItem fx:id="addRowMenuItem" disable="true" mnemonicParsing="false" onAction="#addRow" text="%menu.add.row">
<graphic>
<FontAwesomeIconView styleClass="add-icon" />
<MaterialDesignIconView styleClass="add-icon" />
</graphic>
</MenuItem>
</items>
@@ -105,7 +120,7 @@
<items>
<MenuItem mnemonicParsing="false" onAction="#about" text="%menu.about">
<graphic>
<FontAwesomeIconView styleClass="info-icon" />
<MaterialDesignIconView styleClass="info-icon" />
</graphic>
</MenuItem>
</items>
@@ -119,7 +134,7 @@
<Tooltip text="%menu.open.csv" />
</tooltip>
<graphic>
<FontAwesomeIconView styleClass="open-icon" />
<MaterialDesignIconView styleClass="open-icon" />
</graphic>
</Button>
<Button fx:id="saveButton" disable="true" mnemonicParsing="false" onAction="#saveCsv">
@@ -127,7 +142,7 @@
<Tooltip text="%menu.save" />
</tooltip>
<graphic>
<FontAwesomeIconView styleClass="save-icon" />
<MaterialDesignIconView styleClass="save-icon" />
</graphic>
</Button>
<Button fx:id="saveAsButton" disable="true" mnemonicParsing="false" onAction="#saveAsCsv" styleClass="last" text="...">
@@ -135,18 +150,36 @@
<Tooltip text="%menu.save.as" />
</tooltip>
<graphic>
<FontAwesomeIconView styleClass="save-icon" />
<MaterialDesignIconView styleClass="save-icon" />
</graphic>
</Button>
</HBox>
<Region styleClass="spacer" />
<HBox styleClass="segmented-button-bar">
<Button fx:id="createConfigButton" disable="true" mnemonicParsing="false" onAction="#createConfig">
<tooltip>
<Tooltip text="%menu.create.config" />
</tooltip>
<graphic>
<GlyphsStack>
<children>
<MaterialDesignIconView styleClass="config-icon" />
<MaterialDesignIconView style="-fx-opacity: 0.7;" styleClass="create-config-icon" />
</children>
</GlyphsStack>
</graphic>
</Button>
<Button fx:id="loadConfigButton" disable="true" mnemonicParsing="false" onAction="#openConfig">
<tooltip>
<Tooltip text="%menu.open.config" />
</tooltip>
<graphic>
<FontAwesomeIconView styleClass="config-icon" />
<GlyphsStack>
<children>
<MaterialDesignIconView styleClass="config-icon" />
<MaterialDesignIconView style="-fx-opacity: 0.7;" styleClass="load-config-icon" />
</children>
</GlyphsStack>
</graphic>
</Button>
<Button fx:id="saveConfigButton" disable="true" mnemonicParsing="false" onAction="#saveConfig">
@@ -156,8 +189,8 @@
<graphic>
<GlyphsStack>
<children>
<FontAwesomeIconView style="-fx-opacity: 0.7;" styleClass="save-icon" />
<FontAwesomeIconView styleClass="config-icon" />
<MaterialDesignIconView styleClass="config-icon" />
<MaterialDesignIconView style="-fx-opacity: 0.7;" styleClass="save-config-icon" />
</children>
</GlyphsStack>
</graphic>
@@ -169,8 +202,8 @@
<graphic>
<GlyphsStack>
<children>
<FontAwesomeIconView style="-fx-opacity: 0.7;" styleClass="save-icon" />
<FontAwesomeIconView styleClass="config-icon" />
<MaterialDesignIconView styleClass="config-icon" />
<MaterialDesignIconView style="-fx-opacity: 0.7;" styleClass="save-config-icon" />
</children>
</GlyphsStack>
@@ -184,7 +217,7 @@
<Tooltip text="%menu.delete.row" />
</tooltip>
<graphic>
<FontAwesomeIconView styleClass="delete-icon" />
<MaterialDesignIconView styleClass="delete-icon" />
</graphic>
</Button>
<Button fx:id="addRowButton" disable="true" mnemonicParsing="false" onAction="#addRow" styleClass="last">
@@ -192,7 +225,7 @@
<Tooltip text="%menu.add.row" />
</tooltip>
<graphic>
<FontAwesomeIconView styleClass="add-icon" />
<MaterialDesignIconView styleClass="add-icon" />
</graphic>
</Button>
</HBox>
@@ -203,7 +236,7 @@
<Tooltip text="%menu.preferences" />
</tooltip>
<graphic>
<FontAwesomeIconView styleClass="preferences-icon" />
<MaterialDesignIconView styleClass="preferences-icon" />
</graphic>
</Button>
<Button mnemonicParsing="false" onAction="#close" styleClass="last">
@@ -211,7 +244,7 @@
<Tooltip text="%menu.close" />
</tooltip>
<graphic>
<FontAwesomeIconView styleClass="exit-icon" />
<MaterialDesignIconView styleClass="exit-icon" />
</graphic>
</Button>
</HBox>
@@ -248,10 +281,10 @@
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<FontAwesomeIconView styleClass="open-icon" GridPane.hgrow="NEVER" />
<MaterialDesignIconView styleClass="file-document-icon" GridPane.hgrow="NEVER" />
<Label text="%stateline.csv" GridPane.columnIndex="1" GridPane.hgrow="NEVER" />
<Label fx:id="csvName" GridPane.columnIndex="2" GridPane.hgrow="ALWAYS" />
<FontAwesomeIconView styleClass="open-icon" GridPane.columnIndex="3" GridPane.hgrow="NEVER" />
<MaterialDesignIconView styleClass="config-check-icon" GridPane.columnIndex="3" GridPane.hgrow="NEVER" />
<Label text="%stateline.configuration" GridPane.columnIndex="4" GridPane.hgrow="NEVER" />
<Label fx:id="configurationName" GridPane.columnIndex="5" GridPane.hgrow="ALWAYS" />
</children>

1
src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.properties
View File

@@ -1,5 +1,6 @@
menu.open.csv = Open CSV File
menu.open.config = Open Validation Config
menu.create.config = Create Validation Config
menu.save = Save
menu.save.as = Save As ...
menu.save.config = Save Validation Config

1
src/main/resources/ninja/javafx/smartcsv/fx/smartcsv_de.properties
View File

@@ -8,6 +8,7 @@
menu.open.csv = CSV Datei \u00f6ffnen
menu.open.config = Pr\u00fcfkonfiguration \u00f6ffnen
menu.create.config = Pr\u00fcfkonfiguration erzeugen
menu.save = Speichern
menu.save.as = Speichern als ...
menu.save.config = Pr\u00fcfkonfiguration speichern