From ad3a22a1706e0d3126deb42f47b723bdbd875239 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Thu, 10 Jun 2021 19:18:17 +0200 Subject: [PATCH] [Fix] Parameter.isEqualTo() should not get the value --- .../java/li/strolch/model/parameter/AbstractListParameter.java | 3 ++- .../main/java/li/strolch/model/parameter/BooleanParameter.java | 3 ++- .../main/java/li/strolch/model/parameter/DateParameter.java | 2 +- .../java/li/strolch/model/parameter/DurationParameter.java | 3 ++- .../main/java/li/strolch/model/parameter/FloatParameter.java | 3 ++- .../main/java/li/strolch/model/parameter/IntegerParameter.java | 3 ++- .../main/java/li/strolch/model/parameter/LongParameter.java | 3 ++- .../main/java/li/strolch/model/parameter/StringParameter.java | 3 ++- 8 files changed, 15 insertions(+), 8 deletions(-) diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/AbstractListParameter.java b/li.strolch.model/src/main/java/li/strolch/model/parameter/AbstractListParameter.java index 15bca4b6d..8024e9076 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/parameter/AbstractListParameter.java +++ b/li.strolch.model/src/main/java/li/strolch/model/parameter/AbstractListParameter.java @@ -186,7 +186,8 @@ public abstract class AbstractListParameter extends AbstractParameter @Override public boolean isEqualTo(Parameter> otherValue) { - return this.value.equals(otherValue.getValue()); + AbstractListParameter other = (AbstractListParameter) otherValue; + return this.value.equals(other.value); } @Override diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/BooleanParameter.java b/li.strolch.model/src/main/java/li/strolch/model/parameter/BooleanParameter.java index ee7003117..795658a89 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/parameter/BooleanParameter.java +++ b/li.strolch.model/src/main/java/li/strolch/model/parameter/BooleanParameter.java @@ -99,7 +99,8 @@ public class BooleanParameter extends AbstractParameter { @Override public boolean isEqualTo(Parameter otherValue) { - return this.value.equals(otherValue.getValue()); + BooleanParameter other = (BooleanParameter) otherValue; + return this.value.equals(other.value); } @Override diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/DateParameter.java b/li.strolch.model/src/main/java/li/strolch/model/parameter/DateParameter.java index 1509ebeb2..c0463135e 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/parameter/DateParameter.java +++ b/li.strolch.model/src/main/java/li/strolch/model/parameter/DateParameter.java @@ -143,7 +143,7 @@ public class DateParameter extends AbstractParameter { @Override public boolean isEqualTo(Parameter otherValue) { DateParameter other = (DateParameter) otherValue; - return this.value.equals(other.getValueZdt()); + return this.value.equals(other.value); } @Override diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/DurationParameter.java b/li.strolch.model/src/main/java/li/strolch/model/parameter/DurationParameter.java index 77f6f8eca..a759776bb 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/parameter/DurationParameter.java +++ b/li.strolch.model/src/main/java/li/strolch/model/parameter/DurationParameter.java @@ -124,7 +124,8 @@ public class DurationParameter extends AbstractParameter { @Override public boolean isEqualTo(Parameter otherValue) { - return this.value.equals(otherValue.getValue()); + DurationParameter other = (DurationParameter) otherValue; + return this.value.equals(other.value); } @Override diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/FloatParameter.java b/li.strolch.model/src/main/java/li/strolch/model/parameter/FloatParameter.java index 7d64b1d8f..b6193e878 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/parameter/FloatParameter.java +++ b/li.strolch.model/src/main/java/li/strolch/model/parameter/FloatParameter.java @@ -100,7 +100,8 @@ public class FloatParameter extends AbstractParameter { @Override public boolean isEqualTo(Parameter otherValue) { - return this.value.equals(otherValue.getValue()); + FloatParameter other = (FloatParameter) otherValue; + return this.value.equals(other.value); } @Override diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/IntegerParameter.java b/li.strolch.model/src/main/java/li/strolch/model/parameter/IntegerParameter.java index 15df5cf5f..026804248 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/parameter/IntegerParameter.java +++ b/li.strolch.model/src/main/java/li/strolch/model/parameter/IntegerParameter.java @@ -103,7 +103,8 @@ public class IntegerParameter extends AbstractParameter { @Override public boolean isEqualTo(Parameter otherValue) { - return this.value.equals(otherValue.getValue()); + IntegerParameter other = (IntegerParameter) otherValue; + return this.value.equals(other.value); } @Override diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/LongParameter.java b/li.strolch.model/src/main/java/li/strolch/model/parameter/LongParameter.java index 7142eb562..6a9fb44f8 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/parameter/LongParameter.java +++ b/li.strolch.model/src/main/java/li/strolch/model/parameter/LongParameter.java @@ -93,7 +93,8 @@ public class LongParameter extends AbstractParameter { @Override public boolean isEqualTo(Parameter otherValue) { - return this.value.equals(otherValue.getValue()); + LongParameter other = (LongParameter) otherValue; + return this.value.equals(other.value); } @Override diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/StringParameter.java b/li.strolch.model/src/main/java/li/strolch/model/parameter/StringParameter.java index 776f55b28..6401c4d0c 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/parameter/StringParameter.java +++ b/li.strolch.model/src/main/java/li/strolch/model/parameter/StringParameter.java @@ -132,7 +132,8 @@ public class StringParameter extends AbstractParameter { @Override public boolean isEqualTo(Parameter otherValue) { - return this.value.equals(otherValue.getValue()); + StringParameter other = (StringParameter) otherValue; + return this.value.equals(other.value); } @Override