diff --git a/.gitignore b/.gitignore index 23176e3effbf3094ff070c26224e3b2d14427283..7f86821d5b323a44238f4ca37b1cd48d1c893fec 100755 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ target/ classes/ +.idea/ diff --git a/src/main/java/no/nibio/vips/model/deliaradicumfloralisobservationmodel/DeliaRadicumFloralisObservationModel.java b/src/main/java/no/nibio/vips/model/deliaradicumfloralisobservationmodel/DeliaRadicumFloralisObservationModel.java index e6c4293f41d10747effb7c926975b1410e10fcb0..5e83339dae7d543dd5bab2a3cfb7affc1c92f5be 100755 --- a/src/main/java/no/nibio/vips/model/deliaradicumfloralisobservationmodel/DeliaRadicumFloralisObservationModel.java +++ b/src/main/java/no/nibio/vips/model/deliaradicumfloralisobservationmodel/DeliaRadicumFloralisObservationModel.java @@ -63,7 +63,7 @@ public class DeliaRadicumFloralisObservationModel extends I18nImpl implements Mo private ObjectMapper objectMapper; - private List<ObservationImpl> pestObservations; + private List<Observation> pestObservations; private TimeZone timeZone; private Date startDateGrowth; private Date endDateCalculation; @@ -260,7 +260,7 @@ public class DeliaRadicumFloralisObservationModel extends I18nImpl implements Mo @Override public void setConfiguration(ModelConfiguration config) throws ConfigValidationException { this.getObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - this.pestObservations = this.getObjectMapper().convertValue(config.getConfigParameter("pestObservations"), new TypeReference<List<ObservationImpl>>(){}); + this.pestObservations = this.getObjectMapper().convertValue(config.getConfigParameter("pestObservations"), new TypeReference<List<Observation>>(){}); Collections.sort(this.pestObservations); // Setting timezone this.timeZone = TimeZone.getTimeZone((String) config.getConfigParameter("timeZone"));