konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.7.5: replaced all uses of java reflection with LibGDX reflection

Browse Source
This commit is contained in:
Evan Debenham
2019-09-28 11:37:56 -04:00
parent 0724717abf
commit 48d2fc77fe
48 changed files with 440 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
SPD-classes/src/main/java/com/watabou/utils/Bundle.java
View File

@@ -97,13 +97,8 @@ public class Bundle {
if (aliases.containsKey( clName )) {
clName = aliases.get( clName );
}
try {
Class cl = Class.forName( clName );
return cl;
} catch (ClassNotFoundException e) {
Game.reportException(e);
return null;
}
return Reflection.forName( clName );
}
return null;
}
@@ -114,30 +109,24 @@ public class Bundle {
private Bundlable get() {
if (data == null) return null;
try {
String clName = getString( CLASS_NAME );
if (aliases.containsKey( clName )) {
clName = aliases.get( clName );
}
Class<?> cl = Class.forName( clName );
if (cl != null && (!cl.isMemberClass() || Modifier.isStatic(cl.getModifiers()))) {
Bundlable object = (Bundlable)cl.newInstance();
object.restoreFromBundle( this );
return object;
} else {
return null;
}
} catch (ClassNotFoundException e ) {
Game.reportException(e);
return null;
} catch (InstantiationException e ) {
Game.reportException(e);
return null;
} catch (IllegalAccessException e ) {
Game.reportException(e);
return null;
String clName = getString( CLASS_NAME );
if (aliases.containsKey( clName )) {
clName = aliases.get( clName );
}
Class<?> cl = Reflection.forName( clName );
//Skip none-static inner classes as they can't be instantiated through bundle restoring
//Classes which make use of none-static inner classes must manage instantiation manually
if (cl != null && (!Reflection.isMemberClass(cl) || Reflection.isStatic(cl))) {
Bundlable object = (Bundlable) Reflection.newInstance(cl);
if (object != null) {
object.restoreFromBundle(this);
return object;
}
}
return null;
}
public Bundlable get( String key ) {
@@ -226,13 +215,8 @@ public class Bundle {
if (aliases.containsKey( clName )) {
clName = aliases.get( clName );
}
try {
Class cl = Class.forName( clName );
result[i] = cl;
} catch (ClassNotFoundException e) {
Game.reportException(e);
result[i] = null;
}
Class cl = Reflection.forName( clName );
result[i] = cl;
}
return result;
} catch (JSONException e) {
@@ -404,7 +388,7 @@ public class Bundle {
//Classes which make use of none-static inner classes must manage instantiation manually
if (object != null) {
Class cl = object.getClass();
if (!cl.isMemberClass() || Modifier.isStatic(cl.getModifiers())) {
if ((!Reflection.isMemberClass(cl) || Reflection.isStatic(cl))) {
Bundle bundle = new Bundle();
bundle.put(CLASS_NAME, cl.getName());
object.storeInBundle(bundle);