Skip to content
Snippets Groups Projects
Commit e82f0e79 authored by Nikolaus Krismer's avatar Nikolaus Krismer
Browse files

fixed import order (minor change)

changed getter name
parent 2978704d
No related branches found
No related tags found
No related merge requests found
package it.unibz.inf.isochrone.config; package it.unibz.inf.isochrone.config;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.tngtech.configbuilder.ConfigBuilder;
import com.tngtech.configbuilder.annotation.propertyloaderconfiguration.PropertyExtension;
import com.tngtech.configbuilder.annotation.propertyloaderconfiguration.PropertyLocations;
import com.tngtech.configbuilder.annotation.propertyloaderconfiguration.PropertySuffixes;
import com.tngtech.configbuilder.annotation.typetransformer.TypeTransformer;
import com.tngtech.configbuilder.annotation.typetransformer.TypeTransformers;
import com.tngtech.configbuilder.annotation.valueextractor.PropertyValue;
import it.unibz.inf.isochrone.util.EnumContainer.Dataset; import it.unibz.inf.isochrone.util.EnumContainer.Dataset;
import it.unibz.inf.isochrone.util.EnumContainer.TableType; import it.unibz.inf.isochrone.util.EnumContainer.TableType;
import it.unibz.inf.isochrone.util.Point; import it.unibz.inf.isochrone.util.Point;
...@@ -19,16 +29,6 @@ import java.util.Set; ...@@ -19,16 +29,6 @@ import java.util.Set;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.tngtech.configbuilder.ConfigBuilder;
import com.tngtech.configbuilder.annotation.propertyloaderconfiguration.PropertyExtension;
import com.tngtech.configbuilder.annotation.propertyloaderconfiguration.PropertyLocations;
import com.tngtech.configbuilder.annotation.propertyloaderconfiguration.PropertySuffixes;
import com.tngtech.configbuilder.annotation.typetransformer.TypeTransformer;
import com.tngtech.configbuilder.annotation.typetransformer.TypeTransformers;
import com.tngtech.configbuilder.annotation.valueextractor.PropertyValue;
/** /**
* Configuration for individual datasets. * Configuration for individual datasets.
* *
...@@ -115,7 +115,7 @@ public class ConfigDataset { ...@@ -115,7 +115,7 @@ public class ConfigDataset {
@NotNull @NotNull
@PropertyValue("tbl.dateCodes") @PropertyValue("tbl.dateCodes")
private String tableDaymarker; private String tableDatecodes;
@NotNull @NotNull
@PropertyValue("tbl.links") @PropertyValue("tbl.links")
...@@ -198,7 +198,7 @@ public class ConfigDataset { ...@@ -198,7 +198,7 @@ public class ConfigDataset {
indexIsoLinks = o.indexIsoLinks; indexIsoLinks = o.indexIsoLinks;
indexIsoNodes = o.indexIsoNodes; indexIsoNodes = o.indexIsoNodes;
// tableBuilding = o.tableBuilding; // tableBuilding = o.tableBuilding;
tableDaymarker = o.tableDaymarker; tableDatecodes = o.tableDatecodes;
tableEdges = o.tableEdges; tableEdges = o.tableEdges;
tableIsoAreaBuffer = o.tableIsoAreaBuffer; tableIsoAreaBuffer = o.tableIsoAreaBuffer;
tableIsoLinks = o.tableIsoLinks; tableIsoLinks = o.tableIsoLinks;
...@@ -288,8 +288,8 @@ public class ConfigDataset { ...@@ -288,8 +288,8 @@ public class ConfigDataset {
// } // }
@JsonIgnore @JsonIgnore
public String getTableDaymarker() { public String getTableDatecodes() {
return tableDaymarker; return tableDatecodes;
} }
@JsonIgnore @JsonIgnore
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment