From aa74e60f4405ae48f49cdde756025c396abd8de9 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Tue, 12 May 2020 10:10:36 +0200 Subject: [PATCH] JsonIO: fix arrays and para type --- src/be/nikiroo/fanfix/data/JsonIO.java | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/be/nikiroo/fanfix/data/JsonIO.java b/src/be/nikiroo/fanfix/data/JsonIO.java index fee60ce2..1f70f0a8 100644 --- a/src/be/nikiroo/fanfix/data/JsonIO.java +++ b/src/be/nikiroo/fanfix/data/JsonIO.java @@ -16,6 +16,7 @@ public class JsonIO { } JSONObject json = new JSONObject(); + put(json, "", MetaData.class.getName()); put(json, "luid", meta.getLuid()); put(json, "title", meta.getTitle()); @@ -30,6 +31,7 @@ public class JsonIO { put(json, "subject", meta.getSubject()); put(json, "type", meta.getType()); put(json, "uuid", meta.getUuid()); + put(json, "resume", toJson(meta.getResume())); put(json, "tags", new JSONArray(meta.getTags())); @@ -52,6 +54,7 @@ public class JsonIO { } MetaData meta = new MetaData(); + meta.setLuid(getString(json, "luid")); meta.setTitle(getString(json, "title")); meta.setAuthor(getString(json, "author")); @@ -105,7 +108,7 @@ public class JsonIO { } Story story = new Story(); - story.setMeta(toMetaData(getJson(json,"meta"))); + story.setMeta(toMetaData(getJson(json, "meta"))); story.setChapters(toListChapter(getJsonArr(json, "chapters"))); return story; @@ -148,6 +151,7 @@ public class JsonIO { Chapter chap = new Chapter(getInt(json, "number", 0), getString(json, "name")); chap.setWords(getLong(json, "words", 0)); + chap.setParagraphs(toListParagraph(getJsonArr(json, "paragraphs"))); return chap; @@ -160,11 +164,13 @@ public class JsonIO { } JSONObject json = new JSONObject(); + put(json, "", Paragraph.class.getName()); - put(json, "type", para.getType()); put(json, "content", para.getContent()); put(json, "words", para.getWords()); + put(json, "type", para.getType().toString()); + return json; } @@ -193,8 +199,8 @@ public class JsonIO { static public List toListString(JSONArray array) { if (array != null) { List values = new ArrayList(); - for (Object value : array.toList()) { - values.add(value == null ? null : value.toString()); + for (int i = 0; i < array.length(); i++) { + values.add(array.getString(i)); } return values; } @@ -205,9 +211,9 @@ public class JsonIO { static public List toListParagraph(JSONArray array) { if (array != null) { List values = new ArrayList(); - for (Object value : array.toList()) { - values.add( - value instanceof Paragraph ? (Paragraph) value : null); + for (int i = 0; i < array.length(); i++) { + JSONObject value = array.getJSONObject(i); + values.add(toParagraph(value)); } return values; } @@ -218,8 +224,9 @@ public class JsonIO { private static List toListChapter(JSONArray array) { if (array != null) { List values = new ArrayList(); - for (Object value : array.toList()) { - values.add(value instanceof Chapter ? (Chapter) value : null); + for (int i = 0; i < array.length(); i++) { + JSONObject value = array.getJSONObject(i); + values.add(toChapter(value)); } return values; } -- 2.27.0