1 files changed, 22 insertions, 12 deletions

diff --git a/src/cuchaz/enigma/mapping/ClassMapping.java b/src/cuchaz/enigma/mapping/ClassMapping.java
index 88006cf..b551d71 100644
--- a/src/cuchaz/enigma/mapping/ClassMapping.java
+++ b/src/cuchaz/enigma/mapping/ClassMapping.java
@@ -139,6 +139,16 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping>
                 return m_fieldsByObf.values();
         }
         
+        public boolean containsObfField( String obfName )
+        {
+                return m_fieldsByObf.containsKey( obfName );
+        }
+        
+        public boolean containsDeobfField( String deobfName )
+        {
+                return m_fieldsByDeobf.containsKey( deobfName );
+        }
+        
         public void addFieldMapping( FieldMapping fieldMapping )
         {
                 if( m_fieldsByObf.containsKey( fieldMapping.getObfName() ) )
@@ -214,6 +224,16 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping>
                 return m_methodsByObf.values();
         }
         
+        public boolean containsObfMethod( String obfName, String obfSignature )
+        {
+                return m_methodsByObf.containsKey( getMethodKey( obfName, obfSignature ) );
+        }
+        
+        public boolean containsDeobfMethod( String deobfName, String deobfSignature )
+        {
+                return m_methodsByDeobf.containsKey( getMethodKey( deobfName, deobfSignature ) );
+        }
+        
         public void addMethodMapping( MethodMapping methodMapping )
         {
                 String obfKey = getMethodKey( methodMapping.getObfName(), methodMapping.getObfSignature() );
@@ -375,19 +395,9 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping>
                 return false;
         }
 
-        public boolean containsDeobfField( String name )
-        {
-                return m_fieldsByDeobf.containsKey( name );
-        }
-
-        public boolean containsDeobfMethod( String name, String signature )
-        {
-                return m_methodsByDeobf.containsKey( getMethodKey( name, signature ) );
-        }
-
-        public boolean containsArgument( MethodEntry obfMethodEntry, String name )
+        public boolean containsArgument( BehaviorEntry obfBehaviorEntry, String name )
         {
-                MethodMapping methodMapping = m_methodsByObf.get( getMethodKey( obfMethodEntry.getName(), obfMethodEntry.getSignature() ) );
+                MethodMapping methodMapping = m_methodsByObf.get( getMethodKey( obfBehaviorEntry.getName(), obfBehaviorEntry.getSignature() ) );
                 if( methodMapping != null )
                 {
                         return methodMapping.containsArgument( name );