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 778986569..8d3c160b6 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 @@ -73,13 +73,18 @@ public class BooleanParameter extends AbstractParameter { /** * Sets the value to false * - * @see Parameter#clearValue() + * @see Parameter#clear() */ @Override - public void clearValue() { + public void clear() { this.value = false; } + @Override + public boolean isEmpty() { + return !this.value; + } + @Override public String getType() { return StrolchValueType.BOOLEAN.getType(); 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 a6f47029a..73a8916c7 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 @@ -28,6 +28,7 @@ import li.strolch.utils.iso8601.ISO8601FormatFactory; public class DateParameter extends AbstractParameter { private static final long serialVersionUID = 0L; + private static final Date EMPTY_VALUE = ISO8601FormatFactory.getInstance().getDateFormat().parse("-"); private Date value; @@ -75,11 +76,16 @@ public class DateParameter extends AbstractParameter { /** * Sets the value to 1970-01-01 (unix time 0) * - * @see Parameter#clearValue() + * @see Parameter#clear() */ @Override - public void clearValue() { - this.value = ISO8601FormatFactory.getInstance().getDateFormat().parse("-"); + public void clear() { + this.value = EMPTY_VALUE; + } + + @Override + public boolean isEmpty() { + return this.value.equals(EMPTY_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 96c76cbcd..18ea479b6 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 @@ -68,13 +68,18 @@ public class DurationParameter extends AbstractParameter { /** * Sets the value to 0 * - * @see Parameter#clearValue() + * @see Parameter#clear() */ @Override - public void clearValue() { + public void clear() { this.value = 0L; } + @Override + public boolean isEmpty() { + return this.value == 0L; + } + @Override public void setValueFromString(String valueAsString) { setValue(parseFromString(valueAsString)); 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 38485392f..78f7f9e4f 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 @@ -107,12 +107,12 @@ public class FloatListParameter extends AbstractParameter> implemen } @Override - public void clearValue() { + public void clear() { this.value.clear(); } @Override - public boolean isValueEmpty() { + public boolean isEmpty() { return this.value.isEmpty(); } 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 6e7ffc13e..bf9279003 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 @@ -69,13 +69,18 @@ public class FloatParameter extends AbstractParameter { /** * Sets the value to 0 * - * @see Parameter#clearValue() + * @see Parameter#clear() */ @Override - public void clearValue() { + public void clear() { this.value = 0.0D; } + @Override + public boolean isEmpty() { + return this.value == 0.0D; + } + @Override public void setValueFromString(String valueAsString) { setValue(parseFromString(valueAsString)); 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 2cfc0064a..ae64f1f87 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 @@ -107,12 +107,12 @@ public class IntegerListParameter extends AbstractParameter> imple } @Override - public void clearValue() { + public void clear() { this.value.clear(); } @Override - public boolean isValueEmpty() { + public boolean isEmpty() { return this.value.isEmpty(); } 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 1461ce979..b6d0d9706 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 @@ -73,13 +73,18 @@ public class IntegerParameter extends AbstractParameter { /** * Sets the value to 0 * - * @see Parameter#clearValue() + * @see Parameter#clear() */ @Override - public void clearValue() { + public void clear() { this.value = 0; } + @Override + public boolean isEmpty() { + return this.value == 0; + } + @Override public void setValueFromString(String valueAsString) { setValue(parseFromString(valueAsString)); diff --git a/li.strolch.model/src/main/java/li/strolch/model/parameter/ListParameter.java b/li.strolch.model/src/main/java/li/strolch/model/parameter/ListParameter.java index 25a43ff91..64a93111b 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/parameter/ListParameter.java +++ b/li.strolch.model/src/main/java/li/strolch/model/parameter/ListParameter.java @@ -48,12 +48,12 @@ public interface ListParameter extends Parameter> { /** * Clears the list of values, i.e the list of values is empty after this call */ - public void clearValue(); + public void clear(); /** * Returns true if the list of values is empty, false if not * * @returns true if the list of values is empty, false if not */ - public boolean isValueEmpty(); + public boolean isEmpty(); } 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 40ff1f6b2..3187ef34c 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 @@ -107,12 +107,12 @@ public class LongListParameter extends AbstractParameter> implements } @Override - public void clearValue() { + public void clear() { this.value.clear(); } @Override - public boolean isValueEmpty() { + public boolean isEmpty() { return this.value.isEmpty(); } 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 6c6081897..a731016e7 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 @@ -68,13 +68,18 @@ public class LongParameter extends AbstractParameter { /** * Sets the value to 0 * - * @see Parameter#clearValue() + * @see Parameter#clear() */ @Override - public void clearValue() { + public void clear() { this.value = 0L; } + @Override + public boolean isEmpty() { + return this.value == 0L; + } + @Override public void setValueFromString(String valueAsString) { setValue(parseFromString(valueAsString)); 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 d75d98b22..e8256e6e0 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 @@ -45,7 +45,7 @@ public interface Parameter extends StrolchElement, Comparable> { * * @return */ - public U getValue(); + public U getValue(); /** * the value of the parameter @@ -57,7 +57,13 @@ public interface Parameter extends StrolchElement, Comparable> { /** * Clears the value, dependent on the concrete class */ - public void clearValue(); + public void clear(); + + /** + * @return true if the value is empty, i.e. if the value is the same as the value which would be set if + * {@link #clear()} was called + */ + public boolean isEmpty(); /** * get the hidden attribute 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 b59c05169..c40d11d06 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 @@ -107,12 +107,12 @@ public class StringListParameter extends AbstractParameter> impleme } @Override - public void clearValue() { + public void clear() { this.value.clear(); } @Override - public boolean isValueEmpty() { + public boolean isEmpty() { return this.value.isEmpty(); } 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 878feb26f..cf336494d 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 @@ -74,10 +74,10 @@ public class StringParameter extends AbstractParameter { /** * Sets the value to the empty string * - * @see Parameter#clearValue() + * @see Parameter#clear() */ @Override - public void clearValue() { + public void clear() { this.value = ""; } diff --git a/li.strolch.model/src/test/java/li/strolch/model/ModelTest.java b/li.strolch.model/src/test/java/li/strolch/model/ModelTest.java index 5a03ec042..ae4a31480 100644 --- a/li.strolch.model/src/test/java/li/strolch/model/ModelTest.java +++ b/li.strolch.model/src/test/java/li/strolch/model/ModelTest.java @@ -482,7 +482,7 @@ public class ModelTest { assertEquals("a, b", stringListP.getValueAsString()); stringListP.setValueFromString("a,b"); assertEquals("a, b", stringListP.getValueAsString()); - stringListP.clearValue(); + stringListP.clear(); assertEquals("", stringListP.getValueAsString()); stringListP.addValue("a"); assertEquals("a", stringListP.getValueAsString()); @@ -499,7 +499,7 @@ public class ModelTest { assertEquals("4, 45", intListP.getValueAsString()); intListP.setValueFromString("4,45"); assertEquals("4, 45", intListP.getValueAsString()); - intListP.clearValue(); + intListP.clear(); assertEquals("", intListP.getValueAsString()); intListP.addValue(55); assertEquals("55", intListP.getValueAsString()); @@ -516,7 +516,7 @@ public class ModelTest { assertEquals("4.2, 4.1", floatListP.getValueAsString()); floatListP.setValueFromString("4.2,4.1"); assertEquals("4.2, 4.1", floatListP.getValueAsString()); - floatListP.clearValue(); + floatListP.clear(); assertEquals("", floatListP.getValueAsString()); floatListP.addValue(55.5); assertEquals("55.5", floatListP.getValueAsString()); @@ -533,7 +533,7 @@ public class ModelTest { assertEquals("4, 4", longListP.getValueAsString()); longListP.setValueFromString("4,4"); assertEquals("4, 4", longListP.getValueAsString()); - longListP.clearValue(); + longListP.clear(); assertEquals("", longListP.getValueAsString()); longListP.addValue(55L); assertEquals("55", longListP.getValueAsString());