From 499728358ee1f5dfd30d4bdad94e946d0689c7d8 Mon Sep 17 00:00:00 2001 From: Jeroen Ketelaar Date: Fri, 19 Dec 2014 03:44:30 +0100 Subject: [PATCH 1/4] Create .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..dff5f3a --- /dev/null +++ b/.travis.yml @@ -0,0 +1 @@ +language: java From df105665198f7bd723bf8fc974b35b8e8e7705fa Mon Sep 17 00:00:00 2001 From: Jeroen Ketelaar Date: Fri, 19 Dec 2014 03:53:52 +0100 Subject: [PATCH 2/4] Delete .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index dff5f3a..0000000 --- a/.travis.yml +++ /dev/null @@ -1 +0,0 @@ -language: java From efcb4dbb00bc352025ca1bccc96810cf5146a737 Mon Sep 17 00:00:00 2001 From: Clisprail Date: Thu, 25 Dec 2014 13:37:54 +0100 Subject: [PATCH 3/4] cg > node --- .../org/parabot/core/asm/adapters/AddInterfaceAdapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parabotv2/src/org/parabot/core/asm/adapters/AddInterfaceAdapter.java b/parabotv2/src/org/parabot/core/asm/adapters/AddInterfaceAdapter.java index de1b577..b4d7bff 100644 --- a/parabotv2/src/org/parabot/core/asm/adapters/AddInterfaceAdapter.java +++ b/parabotv2/src/org/parabot/core/asm/adapters/AddInterfaceAdapter.java @@ -42,8 +42,8 @@ public class AddInterfaceAdapter implements Injectable { addInterface(node, accessorPackage + interfaceClass); } - protected static void addInterface(ClassNode cg, String i) { - cg.interfaces.add(i); + protected static void addInterface(ClassNode node, String i) { + node.interfaces.add(i); } @Override From bd612718f58cfbea7c3a107d32d92c981d026efa Mon Sep 17 00:00:00 2001 From: Clisprail Date: Thu, 25 Dec 2014 13:39:13 +0100 Subject: [PATCH 4/4] Make classes public --- .../core/asm/adapters/AddInterfaceAdapter.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/parabotv2/src/org/parabot/core/asm/adapters/AddInterfaceAdapter.java b/parabotv2/src/org/parabot/core/asm/adapters/AddInterfaceAdapter.java index b4d7bff..5835daf 100644 --- a/parabotv2/src/org/parabot/core/asm/adapters/AddInterfaceAdapter.java +++ b/parabotv2/src/org/parabot/core/asm/adapters/AddInterfaceAdapter.java @@ -1,5 +1,8 @@ package org.parabot.core.asm.adapters; +import java.lang.reflect.Modifier; + +import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.ClassNode; import org.parabot.core.Core; import org.parabot.core.asm.ASMUtils; @@ -43,6 +46,15 @@ public class AddInterfaceAdapter implements Injectable { } protected static void addInterface(ClassNode node, String i) { + 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; + } node.interfaces.add(i); }