From d4ea245f6a502ec8736764026feaa3d14964f930 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Mon, 19 Oct 2020 10:03:37 +0200
Subject: [PATCH] Changed value type from primitive double to Double object
---
src/main/java/no/nibio/vips/entity/WeatherObservation.java | 6 +++---
src/main/java/no/nibio/vips/util/WeatherUtil.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/no/nibio/vips/entity/WeatherObservation.java b/src/main/java/no/nibio/vips/entity/WeatherObservation.java
index 6434b5a..7a12c68 100755
--- a/src/main/java/no/nibio/vips/entity/WeatherObservation.java
+++ b/src/main/java/no/nibio/vips/entity/WeatherObservation.java
@@ -46,7 +46,7 @@ public class WeatherObservation implements Comparable{
private String elementMeasurementTypeId;
private Integer logIntervalId;
private Date timeMeasured;
- private double value;
+ private Double value;
/** Creates a new instance of WeatherObservation */
public WeatherObservation() {
@@ -134,14 +134,14 @@ public class WeatherObservation implements Comparable{
/**
* @return the value
*/
- public double getValue() {
+ public Double getValue() {
return value;
}
/**
* @param value the value to set
*/
- public final void setValue(double value) {
+ public final void setValue(Double value) {
this.value = value;
}
diff --git a/src/main/java/no/nibio/vips/util/WeatherUtil.java b/src/main/java/no/nibio/vips/util/WeatherUtil.java
index 8168a3e..956a3a7 100755
--- a/src/main/java/no/nibio/vips/util/WeatherUtil.java
+++ b/src/main/java/no/nibio/vips/util/WeatherUtil.java
@@ -702,7 +702,7 @@ public class WeatherUtil {
wind2m.get(0).getValue(),
globalRadiation.get(0).getValue()
);
- Integer precedingLeafWetnessValue = precedingLeafWetness != null ? (int) precedingLeafWetness.getValue() : 0;
+ Integer precedingLeafWetnessValue = precedingLeafWetness != null ? precedingLeafWetness.getValue().intValue() : 0;
// Iterating list with index (instead of using Iterator pattern) has
// performance gains on very long lists
for(int i=1;i<temperature.size();i++)
--
GitLab