X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fdata%2FJsonIO.java;h=501a0d9daedb8b0bf2674c8b1abc3da49ef2f8ea;hb=877a44c78f1c4985aa362f6cdce385a4f860b51d;hp=db81db65a03b93555445a7ac4254b19707aa9c1f;hpb=f433d15308b70e23280a65cef8c54002a7a971ce;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/data/JsonIO.java b/src/be/nikiroo/fanfix/data/JsonIO.java
deleted file mode 100644
index db81db6..0000000
--- a/src/be/nikiroo/fanfix/data/JsonIO.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package be.nikiroo.fanfix.data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-public class JsonIO {
-	static public JSONObject toJson(MetaData meta) {
-		if (meta == null) {
-			return null;
-		}
-
-		JSONObject json = new JSONObject();
-		put(json, "", MetaData.class.getName());
-		put(json, "luid", meta.getLuid());
-		put(json, "title", meta.getTitle());
-		put(json, "author", meta.getAuthor());
-		put(json, "source", meta.getSource());
-		put(json, "url", meta.getUrl());
-		put(json, "words", meta.getWords());
-		put(json, "creation_date", meta.getCreationDate());
-		put(json, "date", meta.getDate());
-		put(json, "lang", meta.getLang());
-		put(json, "publisher", meta.getPublisher());
-		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()));
-
-		return json;
-	}
-
-	/**
-	 * 
-	 * @param json
-	 * 
-	 * @return
-	 * 
-	 * @throws JSONException
-	 *             when it cannot be converted
-	 */
-	static public MetaData toMetaData(JSONObject json) {
-		if (json == null) {
-			return null;
-		}
-
-		MetaData meta = new MetaData();
-		meta.setLuid(getString(json, "luid"));
-		meta.setTitle(getString(json, "title"));
-		meta.setAuthor(getString(json, "author"));
-		meta.setSource(getString(json, "source"));
-		meta.setUrl(getString(json, "url"));
-		meta.setWords(getLong(json, "words", 0));
-		meta.setCreationDate(getString(json, "creation_date"));
-		meta.setDate(getString(json, "date"));
-		meta.setLang(getString(json, "lang"));
-		meta.setPublisher(getString(json, "publisher"));
-		meta.setSubject(getString(json, "subject"));
-		meta.setType(getString(json, "type"));
-		meta.setUuid(getString(json, "uuid"));
-
-		meta.setResume(toChapter(getJson(json, "resume")));
-		meta.setTags(toListString(getJsonArr(json, "tags")));
-
-		return meta;
-	}
-
-	static public JSONObject toJson(Chapter chap) {
-		if (chap == null) {
-			return null;
-		}
-
-		JSONObject json = new JSONObject();
-
-		// TODO
-
-		return json;
-	}
-
-	/**
-	 * 
-	 * @param json
-	 * 
-	 * @return
-	 * 
-	 * @throws JSONException
-	 *             when it cannot be converted
-	 */
-	static public Chapter toChapter(JSONObject json) {
-		if (json == null) {
-			return null;
-		}
-
-		Chapter chap = new Chapter(0, "");
-
-		// TODO
-
-		return chap;
-	}
-
-	static public List<String> toListString(JSONArray array) {
-		if (array != null) {
-			List<String> values = new ArrayList<String>();
-			for (Object value : array.toList()) {
-				values.add(value == null ? null : value.toString());
-			}
-			return values;
-		}
-
-		return null;
-	}
-
-	static private void put(JSONObject json, String key, Object o) {
-		json.put(key, o == null ? JSONObject.NULL : o);
-	}
-
-	static String getString(JSONObject json, String key) {
-		if (json.has(key)) {
-			Object o = json.get(key);
-			if (o instanceof String) {
-				return (String) o;
-			}
-		}
-
-		return null;
-	}
-
-	static long getLong(JSONObject json, String key, long def) {
-		if (json.has(key)) {
-			Object o = json.get(key);
-			if (o instanceof Long) {
-				return (Long) o;
-			}
-		}
-
-		return def;
-	}
-
-	static JSONObject getJson(JSONObject json, String key) {
-		if (json.has(key)) {
-			Object o = json.get(key);
-			if (o instanceof JSONObject) {
-				return (JSONObject) o;
-			}
-		}
-
-		return null;
-	}
-
-	static JSONArray getJsonArr(JSONObject json, String key) {
-		if (json.has(key)) {
-			Object o = json.get(key);
-			if (o instanceof JSONArray) {
-				return (JSONArray) o;
-			}
-		}
-
-		return null;
-	}
-}