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/FieldEntry.java | 65 ++++++++++++------------------- 1 file changed, 25 insertions(+), 40 deletions(-) (limited to 'src/cuchaz/enigma/mapping/FieldEntry.java') diff --git a/src/cuchaz/enigma/mapping/FieldEntry.java b/src/cuchaz/enigma/mapping/FieldEntry.java index 626af57..6cc9eb7 100644 --- a/src/cuchaz/enigma/mapping/FieldEntry.java +++ b/src/cuchaz/enigma/mapping/FieldEntry.java @@ -14,90 +14,75 @@ import java.io.Serializable; import cuchaz.enigma.Util; -public class FieldEntry implements Entry, Serializable -{ +public class FieldEntry implements Entry, Serializable { + private static final long serialVersionUID = 3004663582802885451L; private ClassEntry m_classEntry; private String m_name; // NOTE: this argument order is important for the MethodReader/MethodWriter - public FieldEntry( ClassEntry classEntry, String name ) - { - if( classEntry == null ) - { - throw new IllegalArgumentException( "Class cannot be null!" ); + public FieldEntry(ClassEntry classEntry, String name) { + if (classEntry == null) { + throw new IllegalArgumentException("Class cannot be null!"); } - if( name == null ) - { - throw new IllegalArgumentException( "Field name cannot be null!" ); + if (name == null) { + throw new IllegalArgumentException("Field name cannot be null!"); } m_classEntry = classEntry; m_name = name; } - public FieldEntry( FieldEntry other ) - { - m_classEntry = new ClassEntry( other.m_classEntry ); + public FieldEntry(FieldEntry other) { + m_classEntry = new ClassEntry(other.m_classEntry); m_name = other.m_name; } - - public FieldEntry( FieldEntry other, String newClassName ) - { - m_classEntry = new ClassEntry( newClassName ); + + public FieldEntry(FieldEntry other, String newClassName) { + m_classEntry = new ClassEntry(newClassName); m_name = other.m_name; } @Override - public ClassEntry getClassEntry( ) - { + public ClassEntry getClassEntry() { return m_classEntry; } @Override - public String getName( ) - { + public String getName() { return m_name; } @Override - public String getClassName( ) - { + public String getClassName() { return m_classEntry.getName(); } @Override - public FieldEntry cloneToNewClass( ClassEntry classEntry ) - { - return new FieldEntry( this, classEntry.getName() ); + public FieldEntry cloneToNewClass(ClassEntry classEntry) { + return new FieldEntry(this, classEntry.getName()); } @Override - public int hashCode( ) - { - return Util.combineHashesOrdered( m_classEntry, m_name ); + public int hashCode() { + return Util.combineHashesOrdered(m_classEntry, m_name); } @Override - public boolean equals( Object other ) - { - if( other instanceof FieldEntry ) - { - return equals( (FieldEntry)other ); + public boolean equals(Object other) { + if (other instanceof FieldEntry) { + return equals((FieldEntry)other); } return false; } - public boolean equals( FieldEntry other ) - { - return m_classEntry.equals( other.m_classEntry ) - && m_name.equals( other.m_name ); + public boolean equals(FieldEntry other) { + return m_classEntry.equals(other.m_classEntry) && m_name.equals(other.m_name); } @Override - public String toString( ) - { + public String toString() { return m_classEntry.getName() + "." + m_name; } } -- cgit v1.2.3