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

handle defaults

Browse Source
This commit is contained in:
Andreas Billmann
2016-09-12 05:02:43 +02:00
committed by Andreas Billmann
parent 4002219dfe
commit 4354afdf1d
3 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -289,15 +289,13 @@ public class ValidationEditorController extends FXMLController {
case STRING: case STRING:
updateFormatComboBox(getStringFormats()); updateFormatComboBox(getStringFormats());
break; break;
case NUMBER:
updateFormatComboBox(getNumberFormats());
break;
case DATE: case DATE:
case DATETIME: case DATETIME:
case TIME: case TIME:
updateFormatComboBox(getDateFormats()); updateFormatComboBox(getDateFormats());
break; break;
case INTEGER: case INTEGER:
case NUMBER:
default: default:
// format: no options // format: no options
formatComboBox.setDisable(true); formatComboBox.setDisable(true);

25
src/main/java/ninja/javafx/smartcsv/validation/ValidationFileReader.java
View File

@@ -28,6 +28,7 @@ package ninja.javafx.smartcsv.validation;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import ninja.javafx.smartcsv.FileReader; import ninja.javafx.smartcsv.FileReader;
import ninja.javafx.smartcsv.validation.configuration.FieldConfiguration;
import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration; import ninja.javafx.smartcsv.validation.configuration.ValidationConfiguration;
import java.io.File; import java.io.File;
@@ -43,6 +44,30 @@ public class ValidationFileReader implements FileReader<ValidationConfiguration>
@Override @Override
public void read(File file) throws IOException { public void read(File file) throws IOException {
config = new GsonBuilder().create().fromJson(new java.io.FileReader(file), ValidationConfiguration.class); config = new GsonBuilder().create().fromJson(new java.io.FileReader(file), ValidationConfiguration.class);
setDefaults();
}
private void setDefaults() {
for (FieldConfiguration fieldConfiguration: config.getFieldConfigurations()) {
if (fieldConfiguration.getType() == null) {
fieldConfiguration.setType(FieldConfiguration.Type.STRING);
}
if (fieldConfiguration.getType() == FieldConfiguration.Type.DATE) {
if (fieldConfiguration.getFormat() == null) {
fieldConfiguration.setFormat("yyyy-MM-dd");
}
}
if (fieldConfiguration.getType() == FieldConfiguration.Type.DATETIME) {
if (fieldConfiguration.getFormat() == null) {
fieldConfiguration.setFormat("yyyy-MM-ddThh:mm:ssZ");
}
}
if (fieldConfiguration.getType() == FieldConfiguration.Type.TIME) {
if (fieldConfiguration.getFormat() == null) {
fieldConfiguration.setFormat("hh:mm:ss");
}
}
}
} }
public ValidationConfiguration getContent() { public ValidationConfiguration getContent() {

13
src/main/java/ninja/javafx/smartcsv/validation/configuration/FieldConfiguration.java
View File

@@ -40,19 +40,6 @@ public class FieldConfiguration {
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
public enum NumberFormat {
@SerializedName("decimalChar") DECIMAL_CHAR,
@SerializedName("groupChar") GROUP_CHAR,
@SerializedName("currency") CURRENCY
}
public static List<String> getNumberFormats() {
return Stream.of(NumberFormat.values())
.map(NumberFormat::name)
.collect(Collectors.toList());
}
public enum DateFormat { public enum DateFormat {
@SerializedName("default") DEFAULT, @SerializedName("default") DEFAULT,
@SerializedName("any") ANY, @SerializedName("any") ANY,