lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
wentch
2015-12-21 10:55:18 +08:00
parent 52a327ea41
commit 2ae8161d10
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/redkale/util/Creator.java
View File

@@ -49,7 +49,7 @@ public interface Creator<T> {
} }
Constructor<T> constructor = null; Constructor<T> constructor = null;
for (Constructor c : clazz.getConstructors()) { for (Constructor c : clazz.getConstructors()) {
if (c.getParameterCount() == 0) { if (c.getParameterTypes().length == 0) { //为了兼容android 而不使用 getParameterCount()
constructor = c; constructor = c;
break; break;
} }
@@ -93,8 +93,8 @@ public interface Creator<T> {
mv.visitTypeInsn(NEW, interName); mv.visitTypeInsn(NEW, interName);
mv.visitInsn(DUP); mv.visitInsn(DUP);
//--------------------------------------- //---------------------------------------
Class[] params = constructor.getParameterTypes();
{ {
Parameter[] params = constructor.getParameters();
final int[] iconsts = {ICONST_0, ICONST_1, ICONST_2, ICONST_3, ICONST_4, ICONST_5}; final int[] iconsts = {ICONST_0, ICONST_1, ICONST_2, ICONST_3, ICONST_4, ICONST_5};
for (int i = 0; i < params.length; i++) { for (int i = 0; i < params.length; i++) {
mv.visitVarInsn(ALOAD, 1); mv.visitVarInsn(ALOAD, 1);
@@ -104,7 +104,7 @@ public interface Creator<T> {
mv.visitIntInsn(BIPUSH, i); mv.visitIntInsn(BIPUSH, i);
} }
mv.visitInsn(AALOAD); mv.visitInsn(AALOAD);
final Class ct = params[i].getType(); final Class ct = params[i];
if (ct.isPrimitive()) { if (ct.isPrimitive()) {
final Class bigct = Array.get(Array.newInstance(ct, 1), 0).getClass(); final Class bigct = Array.get(Array.newInstance(ct, 1), 0).getClass();
mv.visitTypeInsn(CHECKCAST, bigct.getName().replace('.', '/')); mv.visitTypeInsn(CHECKCAST, bigct.getName().replace('.', '/'));
@@ -122,7 +122,7 @@ public interface Creator<T> {
//--------------------------------------- //---------------------------------------
mv.visitMethodInsn(INVOKESPECIAL, interName, "<init>", Type.getConstructorDescriptor(constructor), false); mv.visitMethodInsn(INVOKESPECIAL, interName, "<init>", Type.getConstructorDescriptor(constructor), false);
mv.visitInsn(ARETURN); mv.visitInsn(ARETURN);
mv.visitMaxs((constructor.getParameterCount() > 0 ? (constructor.getParameterCount() + 3) : 2), 2); mv.visitMaxs((params.length > 0 ? (params.length + 3) : 2), 2);
mv.visitEnd(); mv.visitEnd();
} }
{ //虚拟 create 方法 { //虚拟 create 方法

2
src/org/redkale/util/Reproduce.java
View File

@@ -72,7 +72,7 @@ public interface Reproduce<D, S> {
for (java.lang.reflect.Method getter : srcClass.getMethods()) { for (java.lang.reflect.Method getter : srcClass.getMethods()) {
if (Modifier.isStatic(getter.getModifiers())) continue; if (Modifier.isStatic(getter.getModifiers())) continue;
if (getter.getParameterCount() > 0) continue; if (getter.getParameterTypes().length > 0) continue; //为了兼容android 而不使用 getParameterCount()
if ("getClass".equals(getter.getName())) continue; if ("getClass".equals(getter.getName())) continue;
if (!getter.getName().startsWith("get") && !getter.getName().startsWith("is")) continue; if (!getter.getName().startsWith("get") && !getter.getName().startsWith("is")) continue;
java.lang.reflect.Method setter; java.lang.reflect.Method setter;

2
src/org/redkale/util/TypeToken.java
View File

@@ -116,7 +116,7 @@ public abstract class TypeToken<T> {
boolean first = true; boolean first = true;
for (Type t : actualTypeArguments) { for (Type t : actualTypeArguments) {
if (!first) sb.append(", "); if (!first) sb.append(", ");
sb.append(t.getTypeName()); sb.append(t);
first = false; first = false;
} }
sb.append(">"); sb.append(">");