Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Fix] Resource.getTimedState returns List<StrolchTimedState<? extends IValue<?>>>

This commit is contained in:
Robert von Burg 2019-05-23 22:17:19 +02:00
parent b654fd4bf7
commit 0067bb7074
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
li.strolch.model/src/main/java/li/strolch/model/Resource.java
View File

@ -144,7 +144,7 @@ public class Resource extends AbstractStrolchRootElement implements StrolchRootE
return new HashSet<>(this.timedStateMap.keySet());
}
public List<StrolchTimedState<IValue<?>>> getTimedStates() {
public List<StrolchTimedState<? extends IValue<?>>> getTimedStates() {
if (this.timedStateMap == null) {
return Collections.emptyList();
}

10
li.strolch.model/src/main/java/li/strolch/model/xml/StrolchElementToSaxWriterVisitor.java
View File

@ -230,10 +230,10 @@ public class StrolchElementToSaxWriterVisitor implements StrolchRootElementVisit
}
protected void writeTimedStates(Resource resource) throws XMLStreamException {
List<StrolchTimedState<IValue<?>>> timedStates = resource.getTimedStates();
for (StrolchTimedState<IValue<?>> timedState : timedStates) {
ITimeVariable<IValue<?>> timeEvolution = timedState.getTimeEvolution();
SortedSet<ITimeValue<IValue<?>>> values = timeEvolution.getValues();
List<StrolchTimedState<? extends IValue<?>>> timedStates = resource.getTimedStates();
for (StrolchTimedState<? extends IValue<?>> timedState : timedStates) {
ITimeVariable<? extends IValue<?>> timeEvolution = timedState.getTimeEvolution();
SortedSet<? extends ITimeValue<? extends IValue<?>>> values = timeEvolution.getValues();
writeStartStrolchElement(Tags.TIMED_STATE, values.isEmpty(), timedState);
@ -246,7 +246,7 @@ public class StrolchElementToSaxWriterVisitor implements StrolchRootElementVisit
if (timedState.getIndex() != 0)
this.writer.writeAttribute(Tags.INDEX, Integer.toString(timedState.getIndex()));
for (ITimeValue<IValue<?>> timeValue : values) {
for (ITimeValue<? extends IValue<?>> timeValue : values) {
this.writer.writeEmptyElement(Tags.VALUE);
this.writer
.writeAttribute(Tags.TIME, ISO8601FormatFactory.getInstance().formatDate(timeValue.getTime()));