From b9094a6f0da7592eb09105ac5deef624a91a1211 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Mon, 20 Nov 2017 11:30:53 +0100
Subject: [PATCH] Method signature change
---
.../applefruitmoth/AppleFruitMothController.java | 4 ++--
.../ObservationSiteSeasonCommonData.java | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java b/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java
index 1584a334..c048e907 100755
--- a/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java
+++ b/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/AppleFruitMothController.java
@@ -181,8 +181,8 @@ public class AppleFruitMothController extends HttpServlet {
ossc.setLastUpdated(SystemTime.getSystemTime());
ossc.setWarningStatus(formValidation.getFormField("warningStatus").getValueAsInteger());
- ossc.setDegreeOfParasitation(formValidation.getFormField("degreeOfParasitation") != null ? BigDecimal.valueOf(formValidation.getFormField("degreeOfParasitation").getValueAsDouble()): null);
- ossc.setThousandBerrySample(formValidation.getFormField("thousandBerrySample") != null ? BigDecimal.valueOf(formValidation.getFormField("thousandBerrySample").getValueAsDouble()): null);
+ ossc.setDegreeOfParasitation(formValidation.getFormField("degreeOfParasitation") != null ? formValidation.getFormField("degreeOfParasitation").getValueAsDouble(): null);
+ ossc.setThousandBerrySample(formValidation.getFormField("thousandBerrySample") != null ? formValidation.getFormField("thousandBerrySample").getValueAsDouble(): null);
ossc.setRemarks(formValidation.getFormField("remarks") != null ? formValidation.getFormField("remarks").getWebValue() : "");
observationSite.getObservationSiteSeasonCommonDataSet().add(ossc);
SessionControllerGetter.getAppleFruitMothBean().storeObservationSite(observationSite);
diff --git a/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/ObservationSiteSeasonCommonData.java b/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/ObservationSiteSeasonCommonData.java
index fe9cbb51..27842f45 100755
--- a/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/ObservationSiteSeasonCommonData.java
+++ b/src/main/java/no/nibio/vips/logic/modules/applefruitmoth/ObservationSiteSeasonCommonData.java
@@ -51,9 +51,9 @@ public class ObservationSiteSeasonCommonData implements Serializable {
@EmbeddedId
protected ObservationSiteSeasonCommonDataPK observationSiteSeasonCommonDataPK;
@Column(name = "thousand_berry_sample")
- private BigDecimal thousandBerrySample;
+ private Double thousandBerrySample;
@Column(name = "degree_of_parasitation")
- private BigDecimal degreeOfParasitation;
+ private Double degreeOfParasitation;
@Column(name = "warning_status")
private Integer warningStatus;
@Column(name = "remarks")
@@ -83,19 +83,19 @@ public class ObservationSiteSeasonCommonData implements Serializable {
this.observationSiteSeasonCommonDataPK = observationSiteSeasonCommonDataPK;
}
- public BigDecimal getThousandBerrySample() {
+ public Double getThousandBerrySample() {
return thousandBerrySample;
}
- public void setThousandBerrySample(BigDecimal thousandBerrySample) {
+ public void setThousandBerrySample(Double thousandBerrySample) {
this.thousandBerrySample = thousandBerrySample;
}
- public BigDecimal getDegreeOfParasitation() {
+ public Double getDegreeOfParasitation() {
return degreeOfParasitation;
}
- public void setDegreeOfParasitation(BigDecimal degreeOfParasitation) {
+ public void setDegreeOfParasitation(Double degreeOfParasitation) {
this.degreeOfParasitation = degreeOfParasitation;
}
--
GitLab