StephanRichter/Web4Rail
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

refactoring of load/save processes

Browse Source
This commit is contained in:
Stephan Richter
2020-12-03 22:55:02 +01:00
parent 827c89a550
commit 500af0a547
9 changed files with 195 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/de/srsoftware/web4rail/conditions/ConditionList.java
View File

@@ -18,6 +18,7 @@ import de.srsoftware.web4rail.tags.Input;
public class ConditionList extends Condition implements Iterable<Condition>{
private static final String CONDITIONS = "conditions";
private Vector<Condition> conditions = new Vector<Condition>();
public ConditionList add(Condition condition) {
@@ -53,13 +54,10 @@ public class ConditionList extends Condition implements Iterable<Condition>{
@Override
public JSONObject json() {
String cls = getClass().getSimpleName();
throw new UnsupportedOperationException(cls+".json() not supported, use "+cls+".jsonArray instead!");
}
public JSONArray jsonArray() {
JSONArray json = new JSONArray();
for (Condition condition : conditions) json.put(condition.json());
JSONObject json = super.json();
JSONArray jConditions = new JSONArray();
conditions.stream().map(Condition::json).forEach(js -> jConditions.put(js));
json.put(CONDITIONS, jConditions);
return json;
}
@@ -89,13 +87,17 @@ public class ConditionList extends Condition implements Iterable<Condition>{
}
public ConditionList load(JSONArray arr) {
for (int i=0; i<arr.length(); i++) {
JSONObject json = arr.getJSONObject(i);
Condition condition = Condition.create(json.getString(TYPE));
if (condition != null) {
condition.parent(this);
conditions.add(condition.load(json));
@Override
public Condition load(JSONObject json) {
super.load(json);
if (json.has(CONDITIONS)) {
JSONArray jConditions = json.getJSONArray(CONDITIONS);
for (Object o : jConditions) {
if (o instanceof JSONObject) {
JSONObject jo = (JSONObject) o;
Condition condition = Condition.create(jo.getString(TYPE));
if (isSet(condition)) add(condition.load(jo));
}
}
}
return this;