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

[Major] fixed typo in StrolchRootElementToJsonVisitor.ignoreBagParameterTyp

This commit is contained in:
Robert von Burg 2018-06-21 17:54:42 +02:00
parent d3375455d6
commit 39fee69bd0
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java
View File

@ -31,7 +31,7 @@ import li.strolch.utils.iso8601.ISO8601FormatFactory;
public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonElement> {
private MapOfSets<String, String> ignoredKeys;
private Set<String> ignoredStates;
private Set<String> ignoredTimedStates;
private Set<String> ignoredBagTypes;
private BiConsumer<Resource, JsonObject> resourceHook;
@ -47,7 +47,7 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
public StrolchElementToJsonVisitor() {
this.ignoredKeys = new MapOfSets<>();
this.ignoredStates = new HashSet<>();
this.ignoredTimedStates = new HashSet<>();
this.ignoredBagTypes = new HashSet<>();
}
@ -112,7 +112,12 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
return this;
}
public StrolchElementToJsonVisitor ignoreBagParameterTyp(String type) {
public StrolchElementToJsonVisitor ignoreTimeState(String timeStateId) {
this.ignoredTimedStates.add(timeStateId);
return this;
}
public StrolchElementToJsonVisitor ignoreBagByType(String type) {
this.ignoredBagTypes.add(type);
return this;
}
@ -568,7 +573,7 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
for (String stateKey : element.getTimedStateKeySet()) {
// see if we have to ignore this state
if (this.ignoredStates.contains(stateKey))
if (this.ignoredTimedStates.contains(stateKey))
continue;
StrolchTimedState<IValue<?>> state = element.getTimedState(stateKey);
@ -584,7 +589,7 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor<JsonEl
for (String stateKey : element.getTimedStateKeySet()) {
// see if we have to ignore this state
if (this.ignoredStates.contains(stateKey))
if (this.ignoredTimedStates.contains(stateKey))
continue;
StrolchTimedState<IValue<?>> state = element.getTimedState(stateKey);

10
li.strolch.model/src/main/java/li/strolch/model/json/StrolchRootElementToJsonVisitor.java
View File

@ -57,6 +57,7 @@ public class StrolchRootElementToJsonVisitor implements StrolchRootElementVisito
this.visitor.withoutElementName();
return this;
}
public StrolchRootElementToJsonVisitor withElementName() {
this.visitor.withElementName();
return this;
@ -92,8 +93,13 @@ public class StrolchRootElementToJsonVisitor implements StrolchRootElementVisito
return this;
}
public StrolchRootElementToJsonVisitor ignoreBagParameterTyp(String type) {
this.visitor.ignoreBagParameterTyp(type);
public StrolchRootElementToJsonVisitor ignoreTimeState(String timeStateId) {
this.visitor.ignoreTimeState(timeStateId);
return this;
}
public StrolchRootElementToJsonVisitor ignoreBagByType(String type) {
this.visitor.ignoreBagByType(type);
return this;
}