From 6fb3099232cd8694f6299b62c66aed123a7d7bf4 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Tue, 25 Sep 2018 08:51:34 +0200 Subject: [PATCH] [New] Added new helper methods to Parameters --- .../model/parameter/BooleanParameter.java | 2 +- .../model/parameter/DateParameter.java | 2 +- .../model/parameter/DurationParameter.java | 2 +- .../model/parameter/FloatListParameter.java | 2 +- .../model/parameter/FloatParameter.java | 2 +- .../model/parameter/IntegerListParameter.java | 2 +- .../model/parameter/IntegerParameter.java | 2 +- .../model/parameter/LongListParameter.java | 2 +- .../model/parameter/LongParameter.java | 2 +- .../li/strolch/model/parameter/Parameter.java | 2 +- .../model/parameter/StringListParameter.java | 2 +- .../model/parameter/StringParameter.java | 2 +- .../model/parameter/ParameterTest.java | 22 +++++++++---------- 13 files changed, 23 insertions(+), 23 deletions(-) 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 9ba7f1f8c..8f6c362f6 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 @@ -70,7 +70,7 @@ public class BooleanParameter extends AbstractParameter { } @Override - public void setValue(Parameter parameter) { + public void setValueFrom(Parameter parameter) { assertNotReadonly(); this.value = parameter.getValue(); } 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 396271413..ad07f01d7 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 @@ -76,7 +76,7 @@ public class DateParameter extends AbstractParameter { } @Override - public void setValue(Parameter parameter) { + public void setValueFrom(Parameter parameter) { assertNotReadonly(); this.value = parameter.getValue(); } 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 387cbf9a5..4bbc9c4f7 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 @@ -70,7 +70,7 @@ public class DurationParameter extends AbstractParameter { } @Override - public void setValue(Parameter parameter) { + public void setValueFrom(Parameter parameter) { assertNotReadonly(); this.value = parameter.getValue(); } diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/FloatListParameter.java b/li.strolch.model/src/main/java/li/strolch/model/parameter/FloatListParameter.java index 213289a92..b97d34cab 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/parameter/FloatListParameter.java +++ b/li.strolch.model/src/main/java/li/strolch/model/parameter/FloatListParameter.java @@ -92,7 +92,7 @@ public class FloatListParameter extends AbstractParameter> implemen } @Override - public void setValue(Parameter> parameter) { + public void setValueFrom(Parameter> parameter) { assertNotReadonly(); this.value = new ArrayList<>(parameter.getValue()); } 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 59bd6bdfb..656c8a84e 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 @@ -71,7 +71,7 @@ public class FloatParameter extends AbstractParameter { } @Override - public void setValue(Parameter parameter) { + public void setValueFrom(Parameter parameter) { assertNotReadonly(); this.value = parameter.getValue(); } diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/IntegerListParameter.java b/li.strolch.model/src/main/java/li/strolch/model/parameter/IntegerListParameter.java index b65043a32..56eb83cdd 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/parameter/IntegerListParameter.java +++ b/li.strolch.model/src/main/java/li/strolch/model/parameter/IntegerListParameter.java @@ -92,7 +92,7 @@ public class IntegerListParameter extends AbstractParameter> imple } @Override - public void setValue(Parameter> parameter) { + public void setValueFrom(Parameter> parameter) { assertNotReadonly(); this.value = new ArrayList<>(parameter.getValue()); } 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 a971c1e1e..8b74b173a 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 @@ -79,7 +79,7 @@ public class IntegerParameter extends AbstractParameter { } @Override - public void setValue(Parameter parameter) { + public void setValueFrom(Parameter parameter) { assertNotReadonly(); this.value = parameter.getValue(); } diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/LongListParameter.java b/li.strolch.model/src/main/java/li/strolch/model/parameter/LongListParameter.java index 7cfe392ba..a33cb6625 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/parameter/LongListParameter.java +++ b/li.strolch.model/src/main/java/li/strolch/model/parameter/LongListParameter.java @@ -92,7 +92,7 @@ public class LongListParameter extends AbstractParameter> implements } @Override - public void setValue(Parameter> parameter) { + public void setValueFrom(Parameter> parameter) { assertNotReadonly(); this.value = new ArrayList<>(parameter.getValue()); } 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 95a1d110c..64acc8f68 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 @@ -69,7 +69,7 @@ public class LongParameter extends AbstractParameter { } @Override - public void setValue(Parameter parameter) { + public void setValueFrom(Parameter parameter) { assertNotReadonly(); this.value = parameter.getValue(); } diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/Parameter.java b/li.strolch.model/src/main/java/li/strolch/model/parameter/Parameter.java index 9ad021617..94231bba6 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/parameter/Parameter.java +++ b/li.strolch.model/src/main/java/li/strolch/model/parameter/Parameter.java @@ -61,7 +61,7 @@ public interface Parameter extends StrolchElement, Comparable> { * @param parameter * the parameter from which to copy the new value */ - public void setValue(Parameter parameter); + public void setValueFrom(Parameter parameter); /** * Clears the value, dependent on the concrete class diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/StringListParameter.java b/li.strolch.model/src/main/java/li/strolch/model/parameter/StringListParameter.java index 45c0ecdde..49bc8ac6a 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/parameter/StringListParameter.java +++ b/li.strolch.model/src/main/java/li/strolch/model/parameter/StringListParameter.java @@ -92,7 +92,7 @@ public class StringListParameter extends AbstractParameter> impleme } @Override - public void setValue(Parameter> parameter) { + public void setValueFrom(Parameter> parameter) { assertNotReadonly(); this.value = new ArrayList<>(parameter.getValue()); } 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 01cb46eeb..a3465c40e 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 @@ -79,7 +79,7 @@ public class StringParameter extends AbstractParameter { } @Override - public void setValue(Parameter parameter) { + public void setValueFrom(Parameter parameter) { assertNotReadonly(); this.value = parameter.getValue(); } diff --git a/li.strolch.model/src/test/java/li/strolch/model/parameter/ParameterTest.java b/li.strolch.model/src/test/java/li/strolch/model/parameter/ParameterTest.java index 5244e4b51..31083ef3f 100644 --- a/li.strolch.model/src/test/java/li/strolch/model/parameter/ParameterTest.java +++ b/li.strolch.model/src/test/java/li/strolch/model/parameter/ParameterTest.java @@ -36,7 +36,7 @@ public class ParameterTest { assertTrue(p.isEmpty()); assertEquals("", p.getValue()); - p.setValue(other); + p.setValueFrom(other); assertTrue(p.isEqualTo(other.getValue())); assertTrue(p.isEqualTo(other)); } @@ -53,7 +53,7 @@ public class ParameterTest { assertTrue(p.isEmpty()); assertEquals(Integer.valueOf(0), p.getValue()); - p.setValue(other); + p.setValueFrom(other); assertTrue(p.isEqualTo(other.getValue())); assertTrue(p.isEqualTo(other)); @@ -83,7 +83,7 @@ public class ParameterTest { assertTrue(p.isEmpty()); assertEquals(Long.valueOf(0L), p.getValue()); - p.setValue(other); + p.setValueFrom(other); assertTrue(p.isEqualTo(other.getValue())); assertTrue(p.isEqualTo(other)); @@ -113,7 +113,7 @@ public class ParameterTest { assertTrue(p.isEmpty()); assertEquals(Boolean.FALSE, p.getValue()); - p.setValue(other); + p.setValueFrom(other); assertTrue(p.isEqualTo(other.getValue())); assertTrue(p.isEqualTo(other)); @@ -133,7 +133,7 @@ public class ParameterTest { assertTrue(p.isEmpty()); assertEquals(Double.valueOf(0.0D), p.getValue()); - p.setValue(other); + p.setValueFrom(other); assertTrue(p.isEqualTo(other.getValue())); assertTrue(p.isEqualTo(other)); @@ -163,7 +163,7 @@ public class ParameterTest { assertTrue(p.isEmpty()); assertEquals(new Date(0L), p.getValue()); - p.setValue(other); + p.setValueFrom(other); assertTrue(p.isEqualTo(other.getValue())); assertTrue(p.isEqualTo(other)); @@ -193,7 +193,7 @@ public class ParameterTest { assertTrue(p.isEmpty()); assertEquals(Long.valueOf(0L), p.getValue()); - p.setValue(other); + p.setValueFrom(other); assertTrue(p.isEqualTo(other.getValue())); assertTrue(p.isEqualTo(other)); } @@ -210,7 +210,7 @@ public class ParameterTest { assertTrue(p.isEmpty()); assertEquals(emptyList(), p.getValue()); - p.setValue(other); + p.setValueFrom(other); assertTrue(p.isEqualTo(other.getValue())); assertTrue(p.isEqualTo(other)); @@ -239,7 +239,7 @@ public class ParameterTest { assertTrue(p.isEmpty()); assertEquals(emptyList(), p.getValue()); - p.setValue(other); + p.setValueFrom(other); assertTrue(p.isEqualTo(other.getValue())); assertTrue(p.isEqualTo(other)); @@ -268,7 +268,7 @@ public class ParameterTest { assertTrue(p.isEmpty()); assertEquals(emptyList(), p.getValue()); - p.setValue(other); + p.setValueFrom(other); assertTrue(p.isEqualTo(other.getValue())); assertTrue(p.isEqualTo(other)); @@ -297,7 +297,7 @@ public class ParameterTest { assertTrue(p.isEmpty()); assertEquals(emptyList(), p.getValue()); - p.setValue(other); + p.setValueFrom(other); assertTrue(p.isEqualTo(other.getValue())); assertTrue(p.isEqualTo(other));