editor should support new config ... first steps

2026-04-11 13:38:23 +02:00 · 2016-09-01 22:05:31 +02:00
parent 6f635f5e75
commit 04a54da798
8 changed files with 109 additions and 132 deletions
--- a/src/main/java/ninja/javafx/smartcsv/fx/validation/ValidationEditorController.java
+++ b/src/main/java/ninja/javafx/smartcsv/fx/validation/ValidationEditorController.java
@@ -55,6 +55,7 @@ import java.util.regex.Pattern;
 import static java.util.Arrays.asList;
 import static java.util.stream.Collectors.joining;
 import static javafx.beans.binding.Bindings.when;
+import static ninja.javafx.smartcsv.validation.ValidationFormatHelper.doubleToInteger;

 /**
 * controller for editing column validations
@@ -110,9 +111,6 @@ public class ValidationEditorController extends FXMLController {
    @FXML
    private Spinner<Integer>  maxLengthSpinner;

-    @FXML
-    private TextField dateformatRuleTextField;
-
    @FXML
    private TextField regexpRuleTextField;

@@ -131,9 +129,6 @@ public class ValidationEditorController extends FXMLController {
    @FXML
    private CheckBox enableMaxLengthRule;

-    @FXML
-    private CheckBox enableDateRule;
-
    @FXML
    private CheckBox enableRegexpRule;

@@ -167,7 +162,6 @@ public class ValidationEditorController extends FXMLController {

        initSpinner(minLengthSpinner, enableMinLengthRule);
        initSpinner(maxLengthSpinner, enableMaxLengthRule);
-        initTextInputControl(dateformatRuleTextField, enableDateRule);
        initTextInputControl(regexpRuleTextField, enableRegexpRule);
        initTextInputControl(valueOfRuleTextField, enableValueOfRule);
        initCodeAreaControl(groovyRuleTextArea, enableGroovyRule);
@@ -294,66 +288,45 @@ public class ValidationEditorController extends FXMLController {

    private void updateForm() {

-//        updateCheckBox(
-//                validationConfiguration.getNotEmptyRuleFor(getSelectedColumn()),
-//                enableNotEmptyRule
-//        );
-//
-//        updateCheckBox(
-//                validationConfiguration.getIntegerRuleFor(getSelectedColumn()),
-//                enableIntegerRule
-//        );
-//
-//        updateCheckBox(
-//                validationConfiguration.getDoubleRuleFor(getSelectedColumn()),
-//                enableDoubleRule
-//        );
-//
-//        updateCheckBox(
-//                validationConfiguration.getAlphanumericRuleFor(getSelectedColumn()),
-//                enableAlphanumericRule
-//        );
-//
-//        updateCheckBox(
-//                validationConfiguration.getUniqueRuleFor(getSelectedColumn()),
-//                enableUniqueRule
-//        );
-//
-//        updateSpinner(
-//                minLengthSpinner,
-//                validationConfiguration.getMinLengthRuleFor(getSelectedColumn()),
-//                enableMinLengthRule
-//        );
-//
-//        updateSpinner(
-//                maxLengthSpinner,
-//                validationConfiguration.getMaxLengthRuleFor(getSelectedColumn()),
-//                enableMaxLengthRule
-//        );
-//
-//        updateTextInputControl(
-//                dateformatRuleTextField,
-//                validationConfiguration.getDateRuleFor(getSelectedColumn()),
-//                enableDateRule
-//        );
-//
-//        updateTextInputControl(
-//                regexpRuleTextField,
-//                validationConfiguration.getRegexpRuleFor(getSelectedColumn()),
-//                enableRegexpRule
-//        );
-//
-//        updateTextInputControl(
-//                valueOfRuleTextField,
-//                validationConfiguration.getValueOfRuleFor(getSelectedColumn()),
-//                enableValueOfRule
-//        );
-//
-//        updateCodeAreaControl(
-//                groovyRuleTextArea,
-//                validationConfiguration.getGroovyRuleFor(getSelectedColumn()),
-//                enableGroovyRule
-//        );
+        updateCheckBox(
+                (Boolean)validationConfiguration.getFieldConfiguration(getSelectedColumn()).getConstraints().get("required"),
+                enableNotEmptyRule
+        );
+
+        updateCheckBox(
+                (Boolean)validationConfiguration.getFieldConfiguration(getSelectedColumn()).getConstraints().get("unique"),
+                enableUniqueRule
+        );
+
+        updateSpinner(
+                minLengthSpinner,
+                doubleToInteger((Double)validationConfiguration.getFieldConfiguration(getSelectedColumn()).getConstraints().get("minLength")),
+                enableMinLengthRule
+        );
+
+        updateSpinner(
+                maxLengthSpinner,
+                doubleToInteger((Double)validationConfiguration.getFieldConfiguration(getSelectedColumn()).getConstraints().get("maxLength")),
+                enableMaxLengthRule
+        );
+
+        updateTextInputControl(
+                regexpRuleTextField,
+                (String)validationConfiguration.getFieldConfiguration(getSelectedColumn()).getConstraints().get("pattern"),
+                enableRegexpRule
+        );
+
+        updateTextInputControl(
+                valueOfRuleTextField,
+                (String)validationConfiguration.getFieldConfiguration(getSelectedColumn()).getConstraints().get("enum"),
+                enableValueOfRule
+        );
+
+        updateCodeAreaControl(
+                groovyRuleTextArea,
+                (String)validationConfiguration.getFieldConfiguration(getSelectedColumn()).getConstraints().get("groovy"),
+                enableGroovyRule
+        );
    }

    private void updateCheckBox(Boolean value, CheckBox ruleEnabled) {
--- a/src/main/java/ninja/javafx/smartcsv/validation/ValidationConfiguration.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/ValidationConfiguration.java
@@ -47,6 +47,15 @@ public class ValidationConfiguration {
        this.fieldConfigurations = fieldConfigurations;
    }

+    public FieldConfiguration getFieldConfiguration(String column) {
+        for (FieldConfiguration fieldConfiguration: fieldConfigurations) {
+            if (fieldConfiguration.getName().equals(column)) {
+                return fieldConfiguration;
+            }
+        }
+        return null;
+    }
+
    public String[] headerNames() {
        if (fieldConfigurations != null) {
            List<String> headerNames = new ArrayList<>();
--- a/src/main/java/ninja/javafx/smartcsv/validation/ValidationFormatHelper.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/ValidationFormatHelper.java
@@ -3,7 +3,7 @@ package ninja.javafx.smartcsv.validation;
 /**
 * @author abi
 */
-public class DateFormatHelper {
+public class ValidationFormatHelper {


    public static String dateFormat(String format, String defaultFormat) {
@@ -35,4 +35,9 @@ public class DateFormatHelper {
        }
        return defaultFormat;
    }
+
+    public static Integer doubleToInteger(Double value) {
+        if (value == null) return null;
+        return (int)Math.round(value);
+    }
 }
--- a/src/main/java/ninja/javafx/smartcsv/validation/Validator.java
+++ b/src/main/java/ninja/javafx/smartcsv/validation/Validator.java
@@ -32,7 +32,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import static ninja.javafx.smartcsv.validation.DateFormatHelper.dateFormat;
+import static ninja.javafx.smartcsv.validation.ValidationFormatHelper.dateFormat;
+import static ninja.javafx.smartcsv.validation.ValidationFormatHelper.doubleToInteger;

 /**
 * This class checks all the validations defined in the
@@ -252,8 +253,5 @@ public class Validator {
        return result;
    }

-    private Integer doubleToInteger(Double value) {
-        if (value == null) return null;
-        return (int)Math.round(value);
-    }
+
 }
--- a/src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.css
+++ b/src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.css
@@ -1,16 +1,16 @@
-.list-view {
+.table-view .list-view {
    -fx-background-color: -fx-background;
    -fx-padding: 1;
 }

-.list-cell {
+.table-view .list-cell {
    -fx-padding: 1.0em 1.0em 1.0em 1.0em;
 }
-.list-cell:odd {
+.table-view .list-cell:odd {
    -fx-background: -fx-control-inner-background-alt;
 }

-.list-cell:even {
+.table-view .list-cell:even {
    -fx-background: -fx-control-inner-background;
 }

--- a/src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.properties
+++ b/src/main/resources/ninja/javafx/smartcsv/fx/smartcsv.properties
@@ -74,6 +74,8 @@ validation.rules.active = active
 validation.rules.name = rule
 validation.rules.value = value
 validation.rule.label.unique = Unique in column
+validation.rule.format = Format:
+validation.rule.type = Type:

 dialog.validation.rules.title = Validation rules
 dialog.validation.rules.header = Validation rules of column "{0}"
--- a/src/main/resources/ninja/javafx/smartcsv/fx/smartcsv_de.properties
+++ b/src/main/resources/ninja/javafx/smartcsv/fx/smartcsv_de.properties
@@ -83,6 +83,8 @@ validation.rules.active = Aktiv
 validation.rules.name = Regel
 validation.rules.value = Wert
 validation.rule.label.unique = Einmalig in Spalte
+validation.rule.format = Format:
+validation.rule.type = Typ:

 dialog.validation.rules.title = Pr\u00fcfregeln
 dialog.validation.rules.header = Pr\u00fcfregeln f\u00fcr die Spalte "{0}"
--- a/src/main/resources/ninja/javafx/smartcsv/fx/validation/validationEditor.fxml
+++ b/src/main/resources/ninja/javafx/smartcsv/fx/validation/validationEditor.fxml
@@ -5,6 +5,7 @@
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ComboBox?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Separator?>
 <?import javafx.scene.control.Spinner?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.ColumnConstraints?>
@@ -12,64 +13,51 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import org.fxmisc.richtext.CodeArea?>

-<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.76-ea" xmlns:fx="http://javafx.com/fxml/1">
-  <columnConstraints>
-      <ColumnConstraints halignment="CENTER" hgrow="NEVER" maxWidth="50.0" prefWidth="50.0" />
-    <ColumnConstraints hgrow="NEVER" />
-    <ColumnConstraints hgrow="ALWAYS" />
-  </columnConstraints>
-  <rowConstraints>
+<GridPane hgap="20.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="800.0" vgap="6.0" xmlns="http://javafx.com/javafx/8.0.101" xmlns:fx="http://javafx.com/fxml/1">
+    <columnConstraints>
+        <ColumnConstraints halignment="LEFT" hgrow="NEVER" />
+        <ColumnConstraints halignment="LEFT" hgrow="ALWAYS" />
+        <ColumnConstraints halignment="LEFT" hgrow="NEVER" />
+        <ColumnConstraints halignment="LEFT" hgrow="ALWAYS" />
+    </columnConstraints>
+    <rowConstraints>
+        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+        <RowConstraints minHeight="10.0" prefHeight="30.0" valignment="CENTER" vgrow="SOMETIMES" />
+        <RowConstraints minHeight="10.0" prefHeight="30.0" valignment="CENTER" vgrow="SOMETIMES" />
+        <RowConstraints minHeight="10.0" prefHeight="30.0" valignment="CENTER" vgrow="SOMETIMES" />
      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-  </rowConstraints>
-   <children>
-      <Label text="%validation.rule.label.not_empty" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-      <Label text="%validation.rule.label.minlength" GridPane.columnIndex="1" GridPane.rowIndex="6" />
-      <Label text="%validation.rule.label.maxlength" GridPane.columnIndex="1" GridPane.rowIndex="7" />
-      <Label text="%validation.rule.label.dateformat" GridPane.columnIndex="1" GridPane.rowIndex="8" />
-      <Label text="%validation.rule.label.regexp" GridPane.columnIndex="1" GridPane.rowIndex="9" />
-      <Label text="%validation.rule.label.value_of" GridPane.columnIndex="1" GridPane.rowIndex="10" />
-      <Label text="%validation.rule.label.groovy" GridPane.columnIndex="1" GridPane.rowIndex="11" />
-      <Label text="%validation.rule.label.unique" GridPane.columnIndex="1" GridPane.rowIndex="5" />
-       <CheckBox fx:id="enableNotEmptyRule" mnemonicParsing="false" GridPane.rowIndex="4" />
-       <CheckBox fx:id="enableUniqueRule" mnemonicParsing="false" GridPane.rowIndex="5" />
-       <CheckBox fx:id="enableMinLengthRule" mnemonicParsing="false" GridPane.rowIndex="6" />
-      <Spinner fx:id="minLengthSpinner" GridPane.columnIndex="2" GridPane.rowIndex="6" />
-       <CheckBox fx:id="enableMaxLengthRule" mnemonicParsing="false" GridPane.rowIndex="7" />
-      <Spinner fx:id="maxLengthSpinner" GridPane.columnIndex="2" GridPane.rowIndex="7" />
-       <CheckBox fx:id="enableDateRule" mnemonicParsing="false" GridPane.rowIndex="8" />
-      <TextField fx:id="dateformatRuleTextField" GridPane.columnIndex="2" GridPane.rowIndex="8" />
-       <CheckBox fx:id="enableRegexpRule" mnemonicParsing="false" GridPane.rowIndex="9" />
-      <TextField fx:id="regexpRuleTextField" GridPane.columnIndex="2" GridPane.rowIndex="9" />
-       <CheckBox fx:id="enableValueOfRule" mnemonicParsing="false" GridPane.rowIndex="10" />
-      <TextField fx:id="valueOfRuleTextField" GridPane.columnIndex="2" GridPane.rowIndex="10" />
-       <CheckBox fx:id="enableGroovyRule" mnemonicParsing="false" GridPane.rowIndex="11" />
-      <CodeArea fx:id="groovyRuleTextArea" prefHeight="300.0" prefWidth="200.0" GridPane.columnIndex="2" GridPane.rowIndex="11" GridPane.rowSpan="2" />
-      <Label style="-fx-font-weight: bold;" text="%validation.rules.active" GridPane.rowIndex="3" />
-      <Label style="-fx-font-weight: bold;" text="%validation.rules.name" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-      <Label style="-fx-font-weight: bold;" text="%validation.rules.value" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-      <Label text="Label" GridPane.columnSpan="2" GridPane.halignment="LEFT" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" />
-      <Label text="Label" GridPane.columnSpan="2" GridPane.halignment="LEFT" GridPane.hgrow="ALWAYS" />
-      <ComboBox fx:id="typeComboBox" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" GridPane.columnIndex="2" GridPane.halignment="LEFT" GridPane.hgrow="ALWAYS" GridPane.vgrow="NEVER">
+      <RowConstraints minHeight="10.0" valignment="TOP" vgrow="ALWAYS" />
+      <RowConstraints />
+    </rowConstraints>
+    <children>
+        <Label text="%validation.rule.type" GridPane.columnSpan="2" GridPane.halignment="LEFT" GridPane.hgrow="ALWAYS" />
+        <Label text="%validation.rule.format" GridPane.columnSpan="2" GridPane.halignment="LEFT" GridPane.hgrow="ALWAYS" GridPane.rowIndex="1" />
+        <ComboBox fx:id="typeComboBox" maxWidth="1.7976931348623157E308" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.halignment="LEFT" GridPane.hgrow="ALWAYS" />
+        <CheckBox fx:id="enableNotEmptyRule" mnemonicParsing="false" text="%validation.rule.label.not_empty" GridPane.rowIndex="3" />
+        <CheckBox fx:id="enableUniqueRule" mnemonicParsing="false" text="%validation.rule.label.unique" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+        <CheckBox fx:id="enableMinLengthRule" mnemonicParsing="false" text="%validation.rule.label.minlength" GridPane.rowIndex="4" />
+        <Spinner fx:id="minLengthSpinner" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+        <CheckBox fx:id="enableMaxLengthRule" mnemonicParsing="false" text="%validation.rule.label.maxlength" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+        <Spinner fx:id="maxLengthSpinner" GridPane.columnIndex="3" GridPane.rowIndex="4" />
+        <CheckBox fx:id="enableRegexpRule" mnemonicParsing="false" text="%validation.rule.label.regexp" GridPane.rowIndex="5" />
+        <TextField fx:id="regexpRuleTextField" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="5" />
+        <CheckBox fx:id="enableValueOfRule" mnemonicParsing="false" text="%validation.rule.label.value_of" GridPane.rowIndex="6" />
+        <TextField fx:id="valueOfRuleTextField" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="6" />
+        <CheckBox fx:id="enableGroovyRule" mnemonicParsing="false" text="%validation.rule.label.groovy" GridPane.rowIndex="7">
         <GridPane.margin>
-            <Insets />
-         </GridPane.margin></ComboBox>
-
-   </children>
-   <padding>
-      <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-   </padding>
+            <Insets top="8.0" />
+         </GridPane.margin></CheckBox>
+        <CodeArea fx:id="groovyRuleTextArea" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="7">
+         <GridPane.margin>
+            <Insets top="8.0" />
+         </GridPane.margin></CodeArea>
+      <Separator prefWidth="200.0" GridPane.columnSpan="4" GridPane.rowIndex="2" />
+    </children>
+    <padding>
+        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+    </padding>
    <stylesheets>
        <URL value="@/ninja/javafx/smartcsv/fx/smartcsv.css" />
    </stylesheets>