7 files changed, 15 insertions, 20 deletions

diff --git a/build.py b/build.py
index bc9561b..f5723e0 100644
--- a/build.py
+++ b/build.py
@@ -18,8 +18,8 @@ import ssjb
 import ssjb.ivy
 
 
-ArtifactStandalone = ssjb.ivy.Dep("cuchaz:enigma:0.6b")
-ArtifactLib = ssjb.ivy.Dep("cuchaz:enigma-lib:0.6b")
+ArtifactStandalone = ssjb.ivy.Dep("cuchaz:enigma:0.7b")
+ArtifactLib = ssjb.ivy.Dep("cuchaz:enigma-lib:0.7b")
 
 # dependencies
 ExtraRepos = [
diff --git a/readme.txt b/readme.txt
index 3844f54..db294cd 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,8 +1,8 @@
 
-Enigma v0.6 beta
+Enigma v0.7 beta
 A tool for deobfuscation of Java bytecode
 
-Copyright Jeff Martin, 2014
+Copyright Jeff Martin, 2015
 
 
 LICENSE
diff --git a/src/cuchaz/enigma/Constants.java b/src/cuchaz/enigma/Constants.java
index a1ba2e9..3bf3999 100644
--- a/src/cuchaz/enigma/Constants.java
+++ b/src/cuchaz/enigma/Constants.java
@@ -12,7 +12,7 @@ package cuchaz.enigma;
 
 public class Constants {
         public static final String Name = "Enigma";
-        public static final String Version = "0.6 beta";
+        public static final String Version = "0.7 beta";
         public static final String Url = "http://www.cuchazinteractive.com/enigma";
         public static final int MiB = 1024 * 1024; // 1 mebibyte
         public static final int KiB = 1024; // 1 kebibyte
diff --git a/src/cuchaz/enigma/TranslatingTypeLoader.java b/src/cuchaz/enigma/TranslatingTypeLoader.java
index 19e3d2a..12cde4b 100644
--- a/src/cuchaz/enigma/TranslatingTypeLoader.java
+++ b/src/cuchaz/enigma/TranslatingTypeLoader.java
@@ -199,7 +199,7 @@ public class TranslatingTypeLoader implements ITypeLoader {
                 assertClassName(c, obfClassEntry);
                 
                 // do all kinds of deobfuscating transformations on the class
-                new BridgeMarker(m_jarIndex.getBridgedMethods()).markBridges(c);
+                new BridgeMarker(m_jarIndex).markBridges(c);
                 new MethodParameterWriter(m_deobfuscatingTranslator).writeMethodArguments(c);
                 new ClassTranslator(m_deobfuscatingTranslator).translate(c);
                 
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;
 import javassist.CtClass;
 import javassist.CtMethod;
 import javassist.bytecode.AccessFlag;
-
-import com.google.common.collect.BiMap;
-
 import cuchaz.enigma.mapping.EntryFactory;
 import cuchaz.enigma.mapping.MethodEntry;
 
 public class BridgeMarker {
         
-        private BiMap<MethodEntry,MethodEntry> m_bridgedMethods;
+        private JarIndex m_jarIndex;
         
-        public BridgeMarker(BiMap<MethodEntry,MethodEntry> bridgedMethods) {
-                m_bridgedMethods = bridgedMethods;
+        public BridgeMarker(JarIndex jarIndex) {
+                m_jarIndex = jarIndex;
         }
         
         public void markBridges(CtClass c) {
@@ -23,7 +20,7 @@ public class BridgeMarker {
                         MethodEntry methodEntry = EntryFactory.getMethodEntry(method);
                         
                         // is this a bridge method?
-                        MethodEntry bridgedMethodEntry = m_bridgedMethods.get(methodEntry);
+                        MethodEntry bridgedMethodEntry = m_jarIndex.getBridgedMethod(methodEntry);
                         if (bridgedMethodEntry != null) {
                                 
                                 // it's a bridge method! add the bridge flag
diff --git a/src/cuchaz/enigma/analysis/JarIndex.java b/src/cuchaz/enigma/analysis/JarIndex.java
index 797deb8..1c74f15 100644
--- a/src/cuchaz/enigma/analysis/JarIndex.java
+++ b/src/cuchaz/enigma/analysis/JarIndex.java
@@ -34,8 +34,6 @@ import javassist.expr.FieldAccess;
 import javassist.expr.MethodCall;
 import javassist.expr.NewExpr;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -66,7 +64,7 @@ public class JarIndex {
         private Multimap<String,String> m_innerClasses;
         private Map<String,String> m_outerClasses;
         private Map<String,BehaviorEntry> m_anonymousClasses;
-        private BiMap<MethodEntry,MethodEntry> m_bridgedMethods;
+        private Map<MethodEntry,MethodEntry> m_bridgedMethods;
         
         public JarIndex() {
                 m_obfClassEntries = Sets.newHashSet();
@@ -79,7 +77,7 @@ public class JarIndex {
                 m_innerClasses = HashMultimap.create();
                 m_outerClasses = Maps.newHashMap();
                 m_anonymousClasses = Maps.newHashMap();
-                m_bridgedMethods = HashBiMap.create();
+                m_bridgedMethods = Maps.newHashMap();
         }
         
         public void indexJar(JarFile jar, boolean buildInnerClasses) {
@@ -758,7 +756,7 @@ public class JarIndex {
                 }
         }
         
-        public BiMap<MethodEntry,MethodEntry> getBridgedMethods() {
-                return m_bridgedMethods;
+        public MethodEntry getBridgedMethod(MethodEntry bridgeMethodEntry) {
+                return m_bridgedMethods.get(bridgeMethodEntry);
         }
 }
diff --git a/test/cuchaz/enigma/TestSourceIndex.java b/test/cuchaz/enigma/TestSourceIndex.java
index 357acb6..96a8923 100644
--- a/test/cuchaz/enigma/TestSourceIndex.java
+++ b/test/cuchaz/enigma/TestSourceIndex.java
@@ -24,7 +24,7 @@ import cuchaz.enigma.mapping.ClassEntry;
 public class TestSourceIndex {
         
         // TEMP
-        //@Test
+        @Test
         public void indexEverything()
         throws Exception {
                 Deobfuscator deobfuscator = new Deobfuscator(new JarFile("input/1.8.jar"));