From 7289dccdfc1d5e0d9ca8ed5a2ae576172a6eb04c Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Tue, 19 Nov 2013 22:54:25 +0100 Subject: [PATCH] [New] added parseFromString()-methods to all Parameter implementations --- .../model/parameter/BooleanParameter.java | 6 ++++- .../model/parameter/DateParameter.java | 6 ++++- .../model/parameter/FloatParameter.java | 6 ++++- .../model/parameter/IntegerParameter.java | 6 ++++- .../model/parameter/LongParameter.java | 13 +++++++---- .../model/parameter/StringListParameter.java | 23 ++++++++++--------- 6 files changed, 41 insertions(+), 19 deletions(-) diff --git a/src/main/java/li/strolch/model/parameter/BooleanParameter.java b/src/main/java/li/strolch/model/parameter/BooleanParameter.java index 4975ad326..206fd6d47 100644 --- a/src/main/java/li/strolch/model/parameter/BooleanParameter.java +++ b/src/main/java/li/strolch/model/parameter/BooleanParameter.java @@ -72,7 +72,7 @@ public class BooleanParameter extends AbstractParameter { throw new StrolchException(msg); } - setValue(Boolean.valueOf(valueS)); + setValue(parseFromString(valueS)); } @Override @@ -106,4 +106,8 @@ public class BooleanParameter extends AbstractParameter { return clone; } + + public static Boolean parseFromString(String valueS) { + return Boolean.valueOf(valueS); + } } diff --git a/src/main/java/li/strolch/model/parameter/DateParameter.java b/src/main/java/li/strolch/model/parameter/DateParameter.java index 8c040c7bf..1e8f0b7e8 100644 --- a/src/main/java/li/strolch/model/parameter/DateParameter.java +++ b/src/main/java/li/strolch/model/parameter/DateParameter.java @@ -75,7 +75,7 @@ public class DateParameter extends AbstractParameter { throw new StrolchException(msg); } - setValue(ISO8601FormatFactory.getInstance().getDateFormat().parse(valueS)); + setValue(parseFromString(valueS)); } @Override @@ -109,4 +109,8 @@ public class DateParameter extends AbstractParameter { return clone; } + + public static Date parseFromString(String valueS) { + return ISO8601FormatFactory.getInstance().getDateFormat().parse(valueS); + } } diff --git a/src/main/java/li/strolch/model/parameter/FloatParameter.java b/src/main/java/li/strolch/model/parameter/FloatParameter.java index 7fef5a73d..fce922d55 100644 --- a/src/main/java/li/strolch/model/parameter/FloatParameter.java +++ b/src/main/java/li/strolch/model/parameter/FloatParameter.java @@ -75,7 +75,7 @@ public class FloatParameter extends AbstractParameter { throw new StrolchException(msg); } - setValue(Double.valueOf(valueS)); + setValue(parseFromString(valueS)); } @Override @@ -109,4 +109,8 @@ public class FloatParameter extends AbstractParameter { return clone; } + + public static Double parseFromString(String valueS) { + return Double.valueOf(valueS); + } } diff --git a/src/main/java/li/strolch/model/parameter/IntegerParameter.java b/src/main/java/li/strolch/model/parameter/IntegerParameter.java index 6fa09c79c..4a6c8e825 100644 --- a/src/main/java/li/strolch/model/parameter/IntegerParameter.java +++ b/src/main/java/li/strolch/model/parameter/IntegerParameter.java @@ -74,7 +74,7 @@ public class IntegerParameter extends AbstractParameter { throw new StrolchException(msg); } - setValue(Integer.valueOf(valueS)); + setValue(parseFromString(valueS)); } @Override @@ -108,4 +108,8 @@ public class IntegerParameter extends AbstractParameter { return clone; } + + public static Integer parseFromString(String valueS) { + return Integer.valueOf(valueS); + } } diff --git a/src/main/java/li/strolch/model/parameter/LongParameter.java b/src/main/java/li/strolch/model/parameter/LongParameter.java index 63c0af082..9f6f8d228 100644 --- a/src/main/java/li/strolch/model/parameter/LongParameter.java +++ b/src/main/java/li/strolch/model/parameter/LongParameter.java @@ -23,10 +23,11 @@ package li.strolch.model.parameter; import java.text.MessageFormat; -import org.w3c.dom.Element; - import li.strolch.exception.StrolchException; import li.strolch.model.Tags; + +import org.w3c.dom.Element; + import ch.eitchnet.utils.helper.StringHelper; /** @@ -56,7 +57,7 @@ public class LongParameter extends AbstractParameter { */ public LongParameter(String id, String name, Long value) { super(id, name); - setValue(Long.valueOf(value)); + setValue(value); } /** @@ -73,7 +74,7 @@ public class LongParameter extends AbstractParameter { throw new StrolchException(msg); } - setValue(Long.valueOf(valueS)); + setValue(parseFromString(valueS)); } @Override @@ -107,4 +108,8 @@ public class LongParameter extends AbstractParameter { return clone; } + + public static Long parseFromString(String valueS) { + return Long.valueOf(valueS); + } } diff --git a/src/main/java/li/strolch/model/parameter/StringListParameter.java b/src/main/java/li/strolch/model/parameter/StringListParameter.java index 673a59c79..3bf996a51 100644 --- a/src/main/java/li/strolch/model/parameter/StringListParameter.java +++ b/src/main/java/li/strolch/model/parameter/StringListParameter.java @@ -28,11 +28,12 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.w3c.dom.Element; - import li.strolch.exception.StrolchException; import li.strolch.model.StrolchElement; import li.strolch.model.Tags; + +import org.w3c.dom.Element; + import ch.eitchnet.utils.helper.StringHelper; /** @@ -79,15 +80,7 @@ public class StringListParameter extends AbstractParameter> impleme throw new StrolchException(msg); } - setValue(parse(valueS)); - } - - private List parse(String value) { - if (value.isEmpty()) - return Collections.emptyList(); - - String[] valueArr = value.split(VALUE_SEPARATOR); - return Arrays.asList(valueArr); + setValue(parseFromString(valueS)); } @Override @@ -147,4 +140,12 @@ public class StringListParameter extends AbstractParameter> impleme return clone; } + + public static List parseFromString(String value) { + if (value.isEmpty()) + return Collections.emptyList(); + + String[] valueArr = value.split(VALUE_SEPARATOR); + return Arrays.asList(valueArr); + } }