OSDN Git Service
(root)
/
mikumikustudio
/
libgdx-mikumikustudio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c7158ad
)
closes #810
author
NathanSweet
<nathan.sweet@gmail.com>
Tue, 8 Oct 2013 11:45:53 +0000
(13:45 +0200)
committer
NathanSweet
<nathan.sweet@gmail.com>
Tue, 8 Oct 2013 11:45:53 +0000
(13:45 +0200)
gdx/src/com/badlogic/gdx/utils/Json.java
patch
|
blob
|
history
diff --git
a/gdx/src/com/badlogic/gdx/utils/Json.java
b/gdx/src/com/badlogic/gdx/utils/Json.java
index
faaa2a4
..
c58eb0b
100644
(file)
--- a/
gdx/src/com/badlogic/gdx/utils/Json.java
+++ b/
gdx/src/com/badlogic/gdx/utils/Json.java
@@
-994,7
+994,7
@@
public class Json {
public FieldMetadata (Field field) {
\r
this.field = field;
\r
int index = (ClassReflection.isAssignableFrom(ObjectMap.class, field.getType()) || ClassReflection.isAssignableFrom(
\r
-
Hash
Map.class, field.getType())) ? 1 : 0;
\r
+ Map.class, field.getType())) ? 1 : 0;
\r
this.elementType = field.getElementType(index);
\r
}
\r
}
\r