[Minor] Changed TimeState Type from BooleanState to Boolean, etc.
- See StrolchValueType for the types of values which Strolch knows about
This commit is contained in:
parent
5fe84b1d02
commit
cf004e5577
|
@ -10,12 +10,12 @@
|
|||
<Parameter Id="@param2" Name="Float Param" Type="Float" Value="44.3" />
|
||||
<Parameter Id="@param1" Name="Boolean Param" Type="Boolean" Value="true" />
|
||||
</ParameterBag>
|
||||
<TimedState Id="@booleanState" Name="Boolean State" Type="BooleanState">
|
||||
<TimedState Id="@booleanState" Name="Boolean State" Type="Boolean">
|
||||
<Value Time="1970-01-01T00:00:00.000+01:00" Value="false" />
|
||||
<Value Time="1970-01-01T00:01:00.000+01:00" Value="true" />
|
||||
<Value Time="1970-01-01T00:02:00.000+01:00" Value="false" />
|
||||
</TimedState>
|
||||
<TimedState Id="@integerState" Name="Integer State" Type="IntegerState">
|
||||
<TimedState Id="@integerState" Name="Integer State" Type="Integer">
|
||||
<Value Time="1970-01-01T00:00:00.000+01:00" Value="1" />
|
||||
<Value Time="1970-01-01T00:01:00.000+01:00" Value="2" />
|
||||
<Value Time="1970-01-01T00:02:00.000+01:00" Value="3" />
|
||||
|
@ -23,7 +23,7 @@
|
|||
<Value Time="1970-01-01T00:04:00.000+01:00" Value="1" />
|
||||
<Value Time="1970-01-01T00:05:00.000+01:00" Value="0" />
|
||||
</TimedState>
|
||||
<TimedState Id="@floatState" Name="Float State" Type="FloatState">
|
||||
<TimedState Id="@floatState" Name="Float State" Type="Float">
|
||||
<Value Time="1970-01-01T00:00:00.000+01:00" Value="1.1" />
|
||||
<Value Time="1970-01-01T00:01:00.000+01:00" Value="2.2" />
|
||||
<Value Time="1970-01-01T00:02:00.000+01:00" Value="3.3" />
|
||||
|
@ -31,7 +31,7 @@
|
|||
<Value Time="1970-01-01T00:04:00.000+01:00" Value="1.1" />
|
||||
<Value Time="1970-01-01T00:05:00.000+01:00" Value="0.0" />
|
||||
</TimedState>
|
||||
<TimedState Id="@stringSetState" Name="StringSet State" Type="StringSetState">
|
||||
<TimedState Id="@stringSetState" Name="StringSet State" Type="StringSet">
|
||||
<Value Time="1970-01-01T00:00:00.000+01:00" Value="foo" />
|
||||
<Value Time="1970-01-01T00:01:00.000+01:00" Value="foo, bar" />
|
||||
<Value Time="1970-01-01T00:02:00.000+01:00" Value="bar" />
|
||||
|
|
|
@ -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!");
|
||||
|
|
|
@ -5,22 +5,22 @@
|
|||
<Parameter Id="owner" Name="Owner" Type="String" Value="eitch" />
|
||||
</ParameterBag>
|
||||
<ParameterBag Id="something" Name="Something" Type="Something" />
|
||||
<TimedState Id="@state1" Name="State" Type="FloatState" />
|
||||
<TimedState Id="@state2" Name="State" Type="FloatState">
|
||||
<TimedState Id="@state1" Name="State" Type="Float" />
|
||||
<TimedState Id="@state2" Name="State" Type="Float">
|
||||
<Value Time="1970-01-01T00:00:00.000+01:00" Value="0.0" />
|
||||
<Value Time="1970-01-01T00:01:00.000+01:00" Value="1.0" />
|
||||
<Value Time="1970-01-01T00:02:00.000+01:00" Value="2.0" />
|
||||
<Value Time="1970-01-01T00:03:00.000+01:00" Value="1.0" />
|
||||
</TimedState>
|
||||
<TimedState Id="@state3" Name="State" Type="IntegerState" />
|
||||
<TimedState Id="@state4" Name="State" Type="IntegerState">
|
||||
<TimedState Id="@state3" Name="State" Type="Integer" />
|
||||
<TimedState Id="@state4" Name="State" Type="Integer">
|
||||
<Value Time="1970-01-01T00:00:00.000+01:00" Value="0" />
|
||||
<Value Time="1970-01-01T00:01:00.000+01:00" Value="1" />
|
||||
<Value Time="1970-01-01T00:02:00.000+01:00" Value="2" />
|
||||
<Value Time="1970-01-01T00:03:00.000+01:00" Value="1" />
|
||||
</TimedState>
|
||||
<TimedState Id="@state5" Name="State" Type="BooleanState" />
|
||||
<TimedState Id="@state6" Name="State" Type="BooleanState">
|
||||
<TimedState Id="@state5" Name="State" Type="Boolean" />
|
||||
<TimedState Id="@state6" Name="State" Type="Boolean">
|
||||
<Value Time="1970-01-01T00:00:00.000+01:00" Value="false" />
|
||||
<Value Time="1970-01-01T00:01:00.000+01:00" Value="true" />
|
||||
<Value Time="1970-01-01T00:02:00.000+01:00" Value="false" />
|
||||
|
|
Loading…
Reference in New Issue