From cf004e5577d80a05549216eca8144a3f0130f02c Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 8 Jul 2015 07:47:46 +0200 Subject: [PATCH] [Minor] Changed TimeState Type from BooleanState to Boolean, etc. - See StrolchValueType for the types of values which Strolch knows about --- .../test/resources/transienttest/data/Resources.xml | 8 ++++---- .../main/java/li/strolch/model/StrolchValueType.java | 6 +++++- .../src/test/resources/svctest/data/Resources.xml | 12 ++++++------ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/li.strolch.agent/src/test/resources/transienttest/data/Resources.xml b/li.strolch.agent/src/test/resources/transienttest/data/Resources.xml index 1bae4b526..6a550eb7e 100644 --- a/li.strolch.agent/src/test/resources/transienttest/data/Resources.xml +++ b/li.strolch.agent/src/test/resources/transienttest/data/Resources.xml @@ -10,12 +10,12 @@ - + - + @@ -23,7 +23,7 @@ - + @@ -31,7 +31,7 @@ - + diff --git a/li.strolch.model/src/main/java/li/strolch/model/StrolchValueType.java b/li.strolch.model/src/main/java/li/strolch/model/StrolchValueType.java index 160731a7d..a46e18b43 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/StrolchValueType.java +++ b/li.strolch.model/src/main/java/li/strolch/model/StrolchValueType.java @@ -359,8 +359,12 @@ public enum StrolchValueType { } public static StrolchValueType parse(String value) { + + // TODO this is for backwards compatibility where we still had States of type BooleanState instead of Boolean + String strippedValue = value.replace("State", ""); + for (StrolchValueType type : StrolchValueType.values()) { - if (type.type.equals(value)) + if (type.type.equals(strippedValue)) return type; } throw new IllegalArgumentException("Type " + value + " does not exist!"); diff --git a/li.strolch.service/src/test/resources/svctest/data/Resources.xml b/li.strolch.service/src/test/resources/svctest/data/Resources.xml index da0c7ee5a..08ae7a1c0 100644 --- a/li.strolch.service/src/test/resources/svctest/data/Resources.xml +++ b/li.strolch.service/src/test/resources/svctest/data/Resources.xml @@ -5,22 +5,22 @@ - - + + - - + + - - + +