From 959cb5fd4f9586ec3bd265b452fe25fe1db82e3f Mon Sep 17 00:00:00 2001 From: jeff Date: Tue, 13 Jan 2015 23:25:04 -0500 Subject: source format change don't hate me too much if you were planning a big merge. =P --- src/cuchaz/enigma/mapping/MethodMapping.java | 168 +++++++++++---------------- 1 file changed, 69 insertions(+), 99 deletions(-) (limited to 'src/cuchaz/enigma/mapping/MethodMapping.java') diff --git a/src/cuchaz/enigma/mapping/MethodMapping.java b/src/cuchaz/enigma/mapping/MethodMapping.java index c51b011..4dab3c6 100644 --- a/src/cuchaz/enigma/mapping/MethodMapping.java +++ b/src/cuchaz/enigma/mapping/MethodMapping.java @@ -16,8 +16,8 @@ import java.util.TreeMap; import cuchaz.enigma.mapping.SignatureUpdater.ClassNameUpdater; -public class MethodMapping implements Serializable, Comparable -{ +public class MethodMapping implements Serializable, Comparable { + private static final long serialVersionUID = -4409570216084263978L; private String m_obfName; @@ -25,165 +25,135 @@ public class MethodMapping implements Serializable, Comparable private String m_obfSignature; private Map m_arguments; - public MethodMapping( String obfName, String obfSignature ) - { - this( obfName, obfSignature, null ); + public MethodMapping(String obfName, String obfSignature) { + this(obfName, obfSignature, null); } - public MethodMapping( String obfName, String obfSignature, String deobfName ) - { - if( obfName == null ) - { - throw new IllegalArgumentException( "obf name cannot be null!" ); + public MethodMapping(String obfName, String obfSignature, String deobfName) { + if (obfName == null) { + throw new IllegalArgumentException("obf name cannot be null!"); } - if( obfSignature == null ) - { - throw new IllegalArgumentException( "obf signature cannot be null!" ); + if (obfSignature == null) { + throw new IllegalArgumentException("obf signature cannot be null!"); } m_obfName = obfName; - m_deobfName = NameValidator.validateMethodName( deobfName ); + m_deobfName = NameValidator.validateMethodName(deobfName); m_obfSignature = obfSignature; m_arguments = new TreeMap(); } - - public String getObfName( ) - { + + public String getObfName() { return m_obfName; } - public String getDeobfName( ) - { + public String getDeobfName() { return m_deobfName; } - public void setDeobfName( String val ) - { - m_deobfName = NameValidator.validateMethodName( val ); + + public void setDeobfName(String val) { + m_deobfName = NameValidator.validateMethodName(val); } - public String getObfSignature( ) - { + public String getObfSignature() { return m_obfSignature; } - public Iterable arguments( ) - { + public Iterable arguments() { return m_arguments.values(); } - public boolean isConstructor( ) - { - return m_obfName.startsWith( "<" ); + public boolean isConstructor() { + return m_obfName.startsWith("<"); } - public void addArgumentMapping( ArgumentMapping argumentMapping ) - { - boolean wasAdded = m_arguments.put( argumentMapping.getIndex(), argumentMapping ) == null; - assert( wasAdded ); + public void addArgumentMapping(ArgumentMapping argumentMapping) { + boolean wasAdded = m_arguments.put(argumentMapping.getIndex(), argumentMapping) == null; + assert (wasAdded); } - public String getObfArgumentName( int index ) - { - ArgumentMapping argumentMapping = m_arguments.get( index ); - if( argumentMapping != null ) - { + public String getObfArgumentName(int index) { + ArgumentMapping argumentMapping = m_arguments.get(index); + if (argumentMapping != null) { return argumentMapping.getName(); } return null; } - public String getDeobfArgumentName( int index ) - { - ArgumentMapping argumentMapping = m_arguments.get( index ); - if( argumentMapping != null ) - { + public String getDeobfArgumentName(int index) { + ArgumentMapping argumentMapping = m_arguments.get(index); + if (argumentMapping != null) { return argumentMapping.getName(); } return null; } - public void setArgumentName( int index, String name ) - { - ArgumentMapping argumentMapping = m_arguments.get( index ); - if( argumentMapping == null ) - { - argumentMapping = new ArgumentMapping( index, name ); - boolean wasAdded = m_arguments.put( index, argumentMapping ) == null; - assert( wasAdded ); - } - else - { - argumentMapping.setName( name ); + public void setArgumentName(int index, String name) { + ArgumentMapping argumentMapping = m_arguments.get(index); + if (argumentMapping == null) { + argumentMapping = new ArgumentMapping(index, name); + boolean wasAdded = m_arguments.put(index, argumentMapping) == null; + assert (wasAdded); + } else { + argumentMapping.setName(name); } } - public void removeArgumentName( int index ) - { - boolean wasRemoved = m_arguments.remove( index ) != null; - assert( wasRemoved ); + public void removeArgumentName(int index) { + boolean wasRemoved = m_arguments.remove(index) != null; + assert (wasRemoved); } @Override - public String toString( ) - { + public String toString() { StringBuilder buf = new StringBuilder(); - buf.append( "\t" ); - buf.append( m_obfName ); - buf.append( " <-> " ); - buf.append( m_deobfName ); - buf.append( "\n" ); - buf.append( "\t" ); - buf.append( m_obfSignature ); - buf.append( "\n" ); - buf.append( "\tArguments:\n" ); - for( ArgumentMapping argumentMapping : m_arguments.values() ) - { - buf.append( "\t\t" ); - buf.append( argumentMapping.getIndex() ); - buf.append( " -> " ); - buf.append( argumentMapping.getName() ); - buf.append( "\n" ); + buf.append("\t"); + buf.append(m_obfName); + buf.append(" <-> "); + buf.append(m_deobfName); + buf.append("\n"); + buf.append("\t"); + buf.append(m_obfSignature); + buf.append("\n"); + buf.append("\tArguments:\n"); + for (ArgumentMapping argumentMapping : m_arguments.values()) { + buf.append("\t\t"); + buf.append(argumentMapping.getIndex()); + buf.append(" -> "); + buf.append(argumentMapping.getName()); + buf.append("\n"); } return buf.toString(); } @Override - public int compareTo( MethodMapping other ) - { - return ( m_obfName + m_obfSignature ).compareTo( other.m_obfName + other.m_obfSignature ); + public int compareTo(MethodMapping other) { + return (m_obfName + m_obfSignature).compareTo(other.m_obfName + other.m_obfSignature); } - - public boolean renameObfClass( final String oldObfClassName, final String newObfClassName ) - { + + public boolean renameObfClass(final String oldObfClassName, final String newObfClassName) { // rename obf classes in the signature - String newSignature = SignatureUpdater.update( m_obfSignature, new ClassNameUpdater( ) - { + String newSignature = SignatureUpdater.update(m_obfSignature, new ClassNameUpdater() { @Override - public String update( String className ) - { - if( className.equals( oldObfClassName ) ) - { + public String update(String className) { + if (className.equals(oldObfClassName)) { return newObfClassName; } return className; } - } ); + }); - if( newSignature != m_obfSignature ) - { + if (newSignature != m_obfSignature) { m_obfSignature = newSignature; return true; } return false; } - - public boolean containsArgument( String name ) - { - for( ArgumentMapping argumentMapping : m_arguments.values() ) - { - if( argumentMapping.getName().equals( name ) ) - { + + public boolean containsArgument(String name) { + for (ArgumentMapping argumentMapping : m_arguments.values()) { + if (argumentMapping.getName().equals(name)) { return true; } } -- cgit v1.2.3