From 39fee69bd03c32098664d9cf69ffd4b0deff4140 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Thu, 21 Jun 2018 17:54:42 +0200 Subject: [PATCH] [Major] fixed typo in StrolchRootElementToJsonVisitor.ignoreBagParameterTyp --- .../model/json/StrolchElementToJsonVisitor.java | 15 ++++++++++----- .../json/StrolchRootElementToJsonVisitor.java | 10 ++++++++-- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java b/li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java index 52b97169c..1511708ea 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java +++ b/li.strolch.model/src/main/java/li/strolch/model/json/StrolchElementToJsonVisitor.java @@ -31,7 +31,7 @@ import li.strolch.utils.iso8601.ISO8601FormatFactory; public class StrolchElementToJsonVisitor implements StrolchElementVisitor { private MapOfSets ignoredKeys; - private Set ignoredStates; + private Set ignoredTimedStates; private Set ignoredBagTypes; private BiConsumer resourceHook; @@ -47,7 +47,7 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor(); - this.ignoredStates = new HashSet<>(); + this.ignoredTimedStates = new HashSet<>(); this.ignoredBagTypes = new HashSet<>(); } @@ -112,7 +112,12 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor> state = element.getTimedState(stateKey); @@ -584,7 +589,7 @@ public class StrolchElementToJsonVisitor implements StrolchElementVisitor> state = element.getTimedState(stateKey); diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/StrolchRootElementToJsonVisitor.java b/li.strolch.model/src/main/java/li/strolch/model/json/StrolchRootElementToJsonVisitor.java index 2a964ced6..d6588de5e 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/json/StrolchRootElementToJsonVisitor.java +++ b/li.strolch.model/src/main/java/li/strolch/model/json/StrolchRootElementToJsonVisitor.java @@ -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; }