diff options
Diffstat (limited to 'src/cuchaz/enigma/analysis/BridgeMarker.java')
| -rw-r--r-- | src/cuchaz/enigma/analysis/BridgeMarker.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/cuchaz/enigma/analysis/BridgeMarker.java b/src/cuchaz/enigma/analysis/BridgeMarker.java index e80f87d..28e3517 100644 --- a/src/cuchaz/enigma/analysis/BridgeMarker.java +++ b/src/cuchaz/enigma/analysis/BridgeMarker.java | |||
| @@ -3,18 +3,15 @@ package cuchaz.enigma.analysis; | |||
| 3 | import javassist.CtClass; | 3 | import javassist.CtClass; |
| 4 | import javassist.CtMethod; | 4 | import javassist.CtMethod; |
| 5 | import javassist.bytecode.AccessFlag; | 5 | import javassist.bytecode.AccessFlag; |
| 6 | |||
| 7 | import com.google.common.collect.BiMap; | ||
| 8 | |||
| 9 | import cuchaz.enigma.mapping.EntryFactory; | 6 | import cuchaz.enigma.mapping.EntryFactory; |
| 10 | import cuchaz.enigma.mapping.MethodEntry; | 7 | import cuchaz.enigma.mapping.MethodEntry; |
| 11 | 8 | ||
| 12 | public class BridgeMarker { | 9 | public class BridgeMarker { |
| 13 | 10 | ||
| 14 | private BiMap<MethodEntry,MethodEntry> m_bridgedMethods; | 11 | private JarIndex m_jarIndex; |
| 15 | 12 | ||
| 16 | public BridgeMarker(BiMap<MethodEntry,MethodEntry> bridgedMethods) { | 13 | public BridgeMarker(JarIndex jarIndex) { |
| 17 | m_bridgedMethods = bridgedMethods; | 14 | m_jarIndex = jarIndex; |
| 18 | } | 15 | } |
| 19 | 16 | ||
| 20 | public void markBridges(CtClass c) { | 17 | public void markBridges(CtClass c) { |
| @@ -23,7 +20,7 @@ public class BridgeMarker { | |||
| 23 | MethodEntry methodEntry = EntryFactory.getMethodEntry(method); | 20 | MethodEntry methodEntry = EntryFactory.getMethodEntry(method); |
| 24 | 21 | ||
| 25 | // is this a bridge method? | 22 | // is this a bridge method? |
| 26 | MethodEntry bridgedMethodEntry = m_bridgedMethods.get(methodEntry); | 23 | MethodEntry bridgedMethodEntry = m_jarIndex.getBridgedMethod(methodEntry); |
| 27 | if (bridgedMethodEntry != null) { | 24 | if (bridgedMethodEntry != null) { |
| 28 | 25 | ||
| 29 | // it's a bridge method! add the bridge flag | 26 | // it's a bridge method! add the bridge flag |