2006-Scape/Parabot
1
0
Fork 0
mirror of https://github.com/2006-Scape/Parabot.git synced 2026-07-07 08:39:12 +00:00
Code Issues 2 Packages Projects Releases 3 Wiki Activity

Merge branch 'master' of github.com:Parabot/Parabot

Browse Source
This commit is contained in:
JKetelaar
2014-12-25 14:51:32 +01:00
parent 2a7e1e8ef5 07c1812251
commit 10080277f8
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parabotv2/src/org/parabot/core/asm/ASMUtils.java
+12
View File
@@ -140,5 +140,17 @@ public class ASMUtils implements Opcodes {
node.access = node.access | Opcodes.ACC_PUBLIC; node.access = node.access | Opcodes.ACC_PUBLIC;
} }
} }
public static void makePublic(FieldNode node) {
if (!Modifier.isPublic(node.access)) {
if (Modifier.isPrivate(node.access)) {
node.access = node.access & (~Opcodes.ACC_PRIVATE);
}
if (Modifier.isProtected(node.access)) {
node.access = node.access & (~Opcodes.ACC_PROTECTED);
}
node.access = node.access | Opcodes.ACC_PUBLIC;
}
}
} }
parabotv2/src/org/parabot/core/asm/adapters/AddGetterAdapter.java
+1 -10
View File
@@ -129,16 +129,7 @@ public class AddGetterAdapter implements Opcodes, Injectable {
method.visitVarInsn(ALOAD, 0); method.visitVarInsn(ALOAD, 0);
} }
if(staticField) { if(staticField) {
if (!Modifier.isPublic(fieldNode.access)) { ASMUtils.makePublic(fieldNode);
if (Modifier.isPrivate(fieldNode.access)) {
fieldNode.access = fieldNode.access & (~ACC_PRIVATE);
}
if (Modifier.isProtected(fieldNode.access)) {
fieldNode.access = fieldNode.access & (~ACC_PROTECTED);
}
fieldNode.access = fieldNode.access | ACC_PUBLIC;
//mn.access = mn.access | ACC_SYNCHRONIZED;
}
} }
method.visitFieldInsn(staticField ? GETSTATIC : GETFIELD, method.visitFieldInsn(staticField ? GETSTATIC : GETFIELD,
fieldLocation.name, fieldNode.name, fieldNode.desc); fieldLocation.name, fieldNode.name, fieldNode.desc);