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 985be8de7..dea399f44 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 @@ -1,12 +1,12 @@ /* * Copyright 2013 Robert von Burg - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -38,10 +38,13 @@ public class BooleanParameter extends AbstractParameter { /** * Default constructors - * - * @param id the id - * @param name the name - * @param value the value + * + * @param id + * the id + * @param name + * the name + * @param value + * the value */ public BooleanParameter(String id, String name, Boolean value) { super(id, name); @@ -73,7 +76,7 @@ public class BooleanParameter extends AbstractParameter { /** * Sets the value to false - * + * * @see Parameter#clear() */ @Override @@ -92,6 +95,11 @@ public class BooleanParameter extends AbstractParameter { return StrolchValueType.BOOLEAN.getType(); } + @Override + public StrolchValueType getValueType() { + return StrolchValueType.BOOLEAN; + } + @Override public BooleanParameter getClone() { BooleanParameter clone = new BooleanParameter(); @@ -118,8 +126,4 @@ public class BooleanParameter extends AbstractParameter { return this.getValue().compareTo(((BooleanParameter) o).getValue()); } - @Override - public StrolchValueType getValueType() { - return StrolchValueType.BOOLEAN; - } } 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 5cc3053a6..297c5754b 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 @@ -98,6 +98,11 @@ public class DateParameter extends AbstractParameter { return StrolchValueType.DATE.getType(); } + @Override + public StrolchValueType getValueType() { + return StrolchValueType.DATE; + } + @Override public DateParameter getClone() { DateParameter clone = new DateParameter(); @@ -124,8 +129,4 @@ public class DateParameter extends AbstractParameter { return this.getValue().compareTo(((DateParameter) o).getValue()); } - @Override - public StrolchValueType getValueType() { - return StrolchValueType.DATE; - } } 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 51b442cd8..912135b14 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 @@ -95,6 +95,11 @@ public class DurationParameter extends AbstractParameter { return StrolchValueType.DURATION.getType(); } + @Override + public StrolchValueType getValueType() { + return StrolchValueType.DURATION; + } + @Override public DurationParameter getClone() { DurationParameter clone = new DurationParameter(); @@ -121,8 +126,4 @@ public class DurationParameter extends AbstractParameter { return this.getValue().compareTo(((DurationParameter) o).getValue()); } - @Override - public StrolchValueType getValueType() { - return StrolchValueType.DURATION; - } } 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 bdd3c10c3..81da84ec7 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 @@ -134,6 +134,11 @@ public class FloatListParameter extends AbstractParameter> implemen return StrolchValueType.FLOAT_LIST.getType(); } + @Override + public StrolchValueType getValueType() { + return StrolchValueType.FLOAT_LIST; + } + @Override public FloatListParameter getClone() { FloatListParameter clone = new FloatListParameter(); @@ -174,8 +179,4 @@ public class FloatListParameter extends AbstractParameter> implemen return Integer.compare(this.getValue().size(), ((FloatListParameter) o).getValue().size()); } - @Override - public StrolchValueType getValueType() { - return StrolchValueType.FLOAT_LIST; - } } 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 2ee6d6efe..1bdbbe4d4 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 @@ -96,6 +96,11 @@ public class FloatParameter extends AbstractParameter { return StrolchValueType.FLOAT.getType(); } + @Override + public StrolchValueType getValueType() { + return StrolchValueType.FLOAT; + } + @Override public FloatParameter getClone() { FloatParameter clone = new FloatParameter(); @@ -122,8 +127,4 @@ public class FloatParameter extends AbstractParameter { return this.getValue().compareTo(((FloatParameter) o).getValue()); } - @Override - public StrolchValueType getValueType() { - return StrolchValueType.FLOAT; - } } 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 d6e8fc08b..d55acf6e1 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 @@ -134,6 +134,11 @@ public class IntegerListParameter extends AbstractParameter> imple return StrolchValueType.INTEGER_LIST.getType(); } + @Override + public StrolchValueType getValueType() { + return StrolchValueType.INTEGER_LIST; + } + @Override public IntegerListParameter getClone() { IntegerListParameter clone = new IntegerListParameter(); @@ -174,8 +179,4 @@ public class IntegerListParameter extends AbstractParameter> imple return Integer.compare(this.getValue().size(), ((IntegerListParameter) o).getValue().size()); } - @Override - public StrolchValueType getValueType() { - return StrolchValueType.INTEGER_LIST; - } } 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 e94f3ce93..e63241f70 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 @@ -55,6 +55,11 @@ public class IntegerParameter extends AbstractParameter { return StrolchValueType.INTEGER.getType(); } + @Override + public StrolchValueType getValueType() { + return StrolchValueType.INTEGER; + } + @Override public String getValueAsString() { return Integer.toString(this.value); @@ -120,8 +125,4 @@ public class IntegerParameter extends AbstractParameter { return this.getValue().compareTo(((IntegerParameter) o).getValue()); } - @Override - public StrolchValueType getValueType() { - return StrolchValueType.INTEGER; - } } 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 5381b0eb6..ae16bcc40 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 @@ -134,6 +134,11 @@ public class LongListParameter extends AbstractParameter> implements return StrolchValueType.LONG_LIST.getType(); } + @Override + public StrolchValueType getValueType() { + return StrolchValueType.LONG_LIST; + } + @Override public LongListParameter getClone() { LongListParameter clone = new LongListParameter(); @@ -174,8 +179,4 @@ public class LongListParameter extends AbstractParameter> implements return Integer.compare(this.getValue().size(), ((LongListParameter) o).getValue().size()); } - @Override - public StrolchValueType getValueType() { - return StrolchValueType.LONG_LIST; - } } 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 8889cff8b..07acfb094 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 @@ -94,6 +94,11 @@ public class LongParameter extends AbstractParameter { return StrolchValueType.LONG.getType(); } + @Override + public StrolchValueType getValueType() { + return StrolchValueType.LONG; + } + @Override public LongParameter getClone() { LongParameter clone = new LongParameter(); @@ -120,8 +125,4 @@ public class LongParameter extends AbstractParameter { return this.getValue().compareTo(((LongParameter) o).getValue()); } - @Override - public StrolchValueType getValueType() { - return StrolchValueType.LONG; - } } 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 79a5f3b20..6c669083b 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 @@ -134,6 +134,11 @@ public class StringListParameter extends AbstractParameter> impleme return StrolchValueType.STRING_LIST.getType(); } + @Override + public StrolchValueType getValueType() { + return StrolchValueType.STRING_LIST; + } + @Override public StringListParameter getClone() { StringListParameter clone = new StringListParameter(); @@ -174,8 +179,4 @@ public class StringListParameter extends AbstractParameter> impleme return Integer.compare(this.getValue().size(), ((StringListParameter) o).getValue().size()); } - @Override - public StrolchValueType getValueType() { - return StrolchValueType.STRING_LIST; - } } 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 1f762f739..3dc03f2a6 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 @@ -55,6 +55,11 @@ public class StringParameter extends AbstractParameter { return StrolchValueType.STRING.getType(); } + @Override + public StrolchValueType getValueType() { + return StrolchValueType.STRING; + } + @SuppressWarnings("unchecked") @Override public String getValue() { @@ -118,8 +123,4 @@ public class StringParameter extends AbstractParameter { return this.getValue().compareToIgnoreCase(((StringParameter) o).getValue()); } - @Override - public StrolchValueType getValueType() { - return StrolchValueType.STRING; - } }