Reformatting code

1 files changed, 23 insertions, 26 deletions

diff --git a/src/main/java/cuchaz/enigma/mapping/FieldMapping.java b/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
index 3f5a382..19d68a9 100644
--- a/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/FieldMapping.java
@@ -16,67 +16,64 @@ public class FieldMapping implements Serializable, Comparable<FieldMapping>, Mem
 
     private static final long serialVersionUID = 8610742471440861315L;
 
-    private String m_obfName;
-    private String m_deobfName;
-    private Type m_obfType;
+    private String obfName;
+    private String deobfName;
+    private Type obfType;
 
     public FieldMapping(String obfName, Type obfType, String deobfName) {
-        m_obfName = obfName;
-        m_deobfName = NameValidator.validateFieldName(deobfName);
-        m_obfType = obfType;
+        this.obfName = obfName;
+        this.deobfName = NameValidator.validateFieldName(deobfName);
+        this.obfType = obfType;
     }
 
     public FieldMapping(FieldMapping other, ClassNameReplacer obfClassNameReplacer) {
-        m_obfName = other.m_obfName;
-        m_deobfName = other.m_deobfName;
-        m_obfType = new Type(other.m_obfType, obfClassNameReplacer);
+        this.obfName = other.obfName;
+        this.deobfName = other.deobfName;
+        this.obfType = new Type(other.obfType, obfClassNameReplacer);
     }
 
     @Override
     public String getObfName() {
-        return m_obfName;
+        return this.obfName;
     }
 
     public void setObfName(String val) {
-        m_obfName = NameValidator.validateFieldName(val);
+        this.obfName = NameValidator.validateFieldName(val);
     }
 
     public String getDeobfName() {
-        return m_deobfName;
+        return this.deobfName;
     }
 
     public void setDeobfName(String val) {
-        m_deobfName = NameValidator.validateFieldName(val);
+        this.deobfName = NameValidator.validateFieldName(val);
     }
 
     public Type getObfType() {
-        return m_obfType;
+        return this.obfType;
     }
 
     public void setObfType(Type val) {
-        m_obfType = val;
+        this.obfType = val;
     }
 
     @Override
     public int compareTo(FieldMapping other) {
-        return (m_obfName + m_obfType).compareTo(other.m_obfName + other.m_obfType);
+        return (this.obfName + this.obfType).compareTo(other.obfName + other.obfType);
     }
 
     public boolean renameObfClass(final String oldObfClassName, final String newObfClassName) {
 
         // rename obf classes in the type
-        Type newType = new Type(m_obfType, new ClassNameReplacer() {
-            @Override
-            public String replace(String className) {
-                if (className.equals(oldObfClassName)) {
-                    return newObfClassName;
-                }
-                return null;
+        Type newType = new Type(this.obfType, className -> {
+            if (className.equals(oldObfClassName)) {
+                return newObfClassName;
             }
+            return null;
         });
 
-        if (!newType.equals(m_obfType)) {
-            m_obfType = newType;
+        if (!newType.equals(this.obfType)) {
+            this.obfType = newType;
             return true;
         }
         return false;
@@ -84,6 +81,6 @@ public class FieldMapping implements Serializable, Comparable<FieldMapping>, Mem
 
     @Override
     public FieldEntry getObfEntry(ClassEntry classEntry) {
-        return new FieldEntry(classEntry, m_obfName, new Type(m_obfType));
+        return new FieldEntry(classEntry, this.obfName, new Type(this.obfType));
     }
 }