update Guava, show proper constructor tree node, fix AccessFlags.toString

1 files changed, 26 insertions, 1 deletions

diff --git a/src/main/java/cuchaz/enigma/bytecode/AccessFlags.java b/src/main/java/cuchaz/enigma/bytecode/AccessFlags.java
index 0bfc59b..31c8691 100644
--- a/src/main/java/cuchaz/enigma/bytecode/AccessFlags.java
+++ b/src/main/java/cuchaz/enigma/bytecode/AccessFlags.java
@@ -1,5 +1,6 @@
 package cuchaz.enigma.bytecode;
 
+import cuchaz.enigma.analysis.Access;
 import org.objectweb.asm.Opcodes;
 
 import java.lang.reflect.Modifier;
@@ -35,6 +36,10 @@ public class AccessFlags {
                 return (flags & Opcodes.ACC_ENUM) != 0;
         }
 
+        public boolean isBridge() {
+                return (flags & Opcodes.ACC_BRIDGE) != 0;
+        }
+
         public AccessFlags setPrivate() {
                 this.setVisibility(Opcodes.ACC_PRIVATE);
                 return this;
@@ -50,11 +55,16 @@ public class AccessFlags {
                 return this;
         }
 
-        public AccessFlags setBridged() {
+        public AccessFlags setBridge() {
                 flags |= Opcodes.ACC_BRIDGE;
                 return this;
         }
 
+        @Deprecated
+        public AccessFlags setBridged() {
+                return setBridge();
+        }
+
         public void setVisibility(int visibility) {
                 this.resetVisibility();
                 this.flags |= visibility;
@@ -77,4 +87,19 @@ public class AccessFlags {
         public int hashCode() {
                 return flags;
         }
+
+        @Override
+        public String toString() {
+                StringBuilder builder = new StringBuilder(Access.get(this).toString().toLowerCase());
+                if (isStatic()) {
+                        builder.append(" static");
+                }
+                if (isSynthetic()) {
+                        builder.append(" synthetic");
+                }
+                if (isBridge()) {
+                        builder.append(" bridge");
+                }
+                return builder.toString();
+        }
 }