projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch from GPLv2 to GPLv2+
[fw/altos]
/
altoslib
/
AltosJson.java
diff --git
a/altoslib/AltosJson.java
b/altoslib/AltosJson.java
index 80d83e48c94c89cb9621d327a04b56dcff543910..22f81d037c06ef43907fb633e8fa3a5c5bf46877 100644
(file)
--- a/
altoslib/AltosJson.java
+++ b/
altoslib/AltosJson.java
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-1063,7
+1064,7
@@
public class AltosJson extends JsonUtil {
} else {
object = c.newInstance();
}
} else {
object = c.newInstance();
}
- for (; c !=
null
; c = c.getSuperclass()) {
+ for (; c !=
Object.class
; c = c.getSuperclass()) {
for (Field field : c.getDeclaredFields()) {
String fieldName = field.getName();
Class fieldClass = field.getType();
for (Field field : c.getDeclaredFields()) {
String fieldName = field.getName();
Class fieldClass = field.getType();
@@
-1080,17
+1081,27
@@
public class AltosJson extends JsonUtil {
field.set(object, val);
}
} catch (IllegalAccessException ie) {
field.set(object, val);
}
} catch (IllegalAccessException ie) {
+ System.out.printf("%s:%s %s\n",
+ c.getName(), fieldName, ie.toString());
}
}
}
ret = object;
} catch (InvocationTargetException ie) {
}
}
}
ret = object;
} catch (InvocationTargetException ie) {
+ System.out.printf("%s: %s\n",
+ c.getName(), ie.toString());
ret = null;
} catch (NoSuchMethodException ie) {
ret = null;
} catch (NoSuchMethodException ie) {
+ System.out.printf("%s: %s\n",
+ c.getName(), ie.toString());
ret = null;
} catch (InstantiationException ie) {
ret = null;
} catch (InstantiationException ie) {
+ System.out.printf("%s: %s\n",
+ c.getName(), ie.toString());
ret = null;
} catch (IllegalAccessException ie) {
ret = null;
} catch (IllegalAccessException ie) {
+ System.out.printf("%s: %s\n",
+ c.getName(), ie.toString());
ret = null;
}
}
ret = null;
}
}
@@
-1198,7
+1209,7
@@
public class AltosJson extends JsonUtil {
}
} else {
assert_hash(true);
}
} else {
assert_hash(true);
- for (Class c = object.getClass(); c !=
null
; c = c.getSuperclass()) {
+ for (Class c = object.getClass(); c !=
Object.class
; c = c.getSuperclass()) {
for (Field field : c.getDeclaredFields()) {
String fieldName = field.getName();
for (Field field : c.getDeclaredFields()) {
String fieldName = field.getName();
@@
-1223,6
+1234,8
@@
public class AltosJson extends JsonUtil {
put(fieldName, json);
}
} catch (IllegalAccessException ie) {
put(fieldName, json);
}
} catch (IllegalAccessException ie) {
+ System.out.printf("%s:%s %s\n",
+ c.getName(), fieldName, ie.toString());
}
}
}
}
}
}