From: Niki Roo <niki@nikiroo.be>
Date: Thu, 14 May 2020 13:35:20 +0000 (+0200)
Subject: Merge branch 'subtree'
X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=commitdiff_plain;h=14c0debd37e7de3fa8b5acb81c234f96452ec2a2;hp=e247c76b6ae8c21b9d4af979b972140e9283dfbe

Merge branch 'subtree'
---

diff --git a/src/be/nikiroo/fanfix/data/JsonIO.java b/src/be/nikiroo/fanfix/data/JsonIO.java
index beff342..524f99a 100644
--- a/src/be/nikiroo/fanfix/data/JsonIO.java
+++ b/src/be/nikiroo/fanfix/data/JsonIO.java
@@ -287,9 +287,14 @@ public class JsonIO {
 	static long getLong(JSONObject json, String key, long def) {
 		if (json.has(key)) {
 			Object o = json.get(key);
-			if (o instanceof Long) {
+			if (o instanceof Byte)
+				return (Byte) o;
+			if (o instanceof Short)
+				return (Short) o;
+			if (o instanceof Integer)
+				return (Integer) o;
+			if (o instanceof Long)
 				return (Long) o;
-			}
 		}
 
 		return def;
@@ -309,8 +314,17 @@ public class JsonIO {
 	static int getInt(JSONObject json, String key, int def) {
 		if (json.has(key)) {
 			Object o = json.get(key);
-			if (o instanceof Integer) {
+			if (o instanceof Byte)
+				return (Byte) o;
+			if (o instanceof Short)
+				return (Short) o;
+			if (o instanceof Integer)
 				return (Integer) o;
+			if (o instanceof Long) {
+				try {
+					return (int) (long) ((Long) o);
+				} catch (Exception e) {
+				}
 			}
 		}