From 64c359d3c1d2347001e5c6becb1d7561457f52cc Mon Sep 17 00:00:00 2001 From: lclc98 Date: Sat, 2 Jul 2016 18:04:57 +1000 Subject: Renamed Fields --- .../java/cuchaz/enigma/mapping/ClassEntry.java | 5 +- .../java/cuchaz/enigma/mapping/ClassMapping.java | 6 +- .../java/cuchaz/enigma/mapping/FieldEntry.java | 5 +- .../cuchaz/enigma/mapping/MappingsChecker.java | 2 - .../java/cuchaz/enigma/mapping/MappingsReader.java | 6 +- .../java/cuchaz/enigma/mapping/MappingsWriter.java | 1 - .../java/cuchaz/enigma/mapping/MethodEntry.java | 5 +- .../java/cuchaz/enigma/mapping/MethodMapping.java | 71 +++++++++++----------- 8 files changed, 43 insertions(+), 58 deletions(-) (limited to 'src/main/java/cuchaz/enigma/mapping') diff --git a/src/main/java/cuchaz/enigma/mapping/ClassEntry.java b/src/main/java/cuchaz/enigma/mapping/ClassEntry.java index 2e7711b..c9304d4 100644 --- a/src/main/java/cuchaz/enigma/mapping/ClassEntry.java +++ b/src/main/java/cuchaz/enigma/mapping/ClassEntry.java @@ -67,10 +67,7 @@ public class ClassEntry implements Entry, Serializable { @Override public boolean equals(Object other) { - if (other instanceof ClassEntry) { - return equals((ClassEntry) other); - } - return false; + return other instanceof ClassEntry && equals((ClassEntry) other); } public boolean equals(ClassEntry other) { diff --git a/src/main/java/cuchaz/enigma/mapping/ClassMapping.java b/src/main/java/cuchaz/enigma/mapping/ClassMapping.java index 9258ec7..84fb6dd 100644 --- a/src/main/java/cuchaz/enigma/mapping/ClassMapping.java +++ b/src/main/java/cuchaz/enigma/mapping/ClassMapping.java @@ -403,7 +403,7 @@ public class ClassMapping implements Serializable, Comparable { public boolean renameObfClass(String oldObfClassName, String newObfClassName) { // rename inner classes - for (ClassMapping innerClassMapping : new ArrayList(m_innerClassesByObfSimple.values())) { + for (ClassMapping innerClassMapping : new ArrayList<>(m_innerClassesByObfSimple.values())) { if (innerClassMapping.renameObfClass(oldObfClassName, newObfClassName)) { boolean wasRemoved = m_innerClassesByObfSimple.remove(oldObfClassName) != null; assert (wasRemoved); @@ -413,7 +413,7 @@ public class ClassMapping implements Serializable, Comparable { } // rename field types - for (FieldMapping fieldMapping : new ArrayList(m_fieldsByObf.values())) { + for (FieldMapping fieldMapping : new ArrayList<>(m_fieldsByObf.values())) { String oldFieldKey = getFieldKey(fieldMapping.getObfName(), fieldMapping.getObfType()); if (fieldMapping.renameObfClass(oldObfClassName, newObfClassName)) { boolean wasRemoved = m_fieldsByObf.remove(oldFieldKey) != null; @@ -424,7 +424,7 @@ public class ClassMapping implements Serializable, Comparable { } // rename method signatures - for (MethodMapping methodMapping : new ArrayList(m_methodsByObf.values())) { + for (MethodMapping methodMapping : new ArrayList<>(m_methodsByObf.values())) { String oldMethodKey = getMethodKey(methodMapping.getObfName(), methodMapping.getObfSignature()); if (methodMapping.renameObfClass(oldObfClassName, newObfClassName)) { boolean wasRemoved = m_methodsByObf.remove(oldMethodKey) != null; diff --git a/src/main/java/cuchaz/enigma/mapping/FieldEntry.java b/src/main/java/cuchaz/enigma/mapping/FieldEntry.java index 3de7223..bebc504 100644 --- a/src/main/java/cuchaz/enigma/mapping/FieldEntry.java +++ b/src/main/java/cuchaz/enigma/mapping/FieldEntry.java @@ -80,10 +80,7 @@ public class FieldEntry implements Entry, Serializable { @Override public boolean equals(Object other) { - if (other instanceof FieldEntry) { - return equals((FieldEntry) other); - } - return false; + return other instanceof FieldEntry && equals((FieldEntry) other); } public boolean equals(FieldEntry other) { diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java b/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java index ab68682..5e2b40b 100644 --- a/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java +++ b/src/main/java/cuchaz/enigma/mapping/MappingsChecker.java @@ -90,8 +90,6 @@ public class MappingsChecker { classMapping.removeMethodMapping(methodMapping); m_droppedMethodMappings.put(obfBehaviorEntry, methodMapping); } - - m_relatedMethodChecker.checkMethod(classEntry, methodMapping); } // check inner classes diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsReader.java b/src/main/java/cuchaz/enigma/mapping/MappingsReader.java index 7110d40..b2c3a5c 100644 --- a/src/main/java/cuchaz/enigma/mapping/MappingsReader.java +++ b/src/main/java/cuchaz/enigma/mapping/MappingsReader.java @@ -42,14 +42,14 @@ public class MappingsReader { public void readFile(Mappings mappings, BufferedReader in) throws IOException, MappingParseException { - String builder = ""; + StringBuffer buf = new StringBuffer(); String line = null; while ((line = in.readLine()) != null) { - builder += line; + buf.append(line); } Gson gson = new GsonBuilder().setPrettyPrinting().create(); - JsonClass jsonClass = gson.fromJson(builder, JsonClass.class); + JsonClass jsonClass = gson.fromJson(buf.toString(), JsonClass.class); load(null, jsonClass, mappings); } diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsWriter.java b/src/main/java/cuchaz/enigma/mapping/MappingsWriter.java index 89fee4e..aaab22f 100644 --- a/src/main/java/cuchaz/enigma/mapping/MappingsWriter.java +++ b/src/main/java/cuchaz/enigma/mapping/MappingsWriter.java @@ -24,7 +24,6 @@ import cuchaz.enigma.json.*; public class MappingsWriter { - public void write(File file, Mappings mappings) throws IOException { if (!file.isDirectory()) { return; diff --git a/src/main/java/cuchaz/enigma/mapping/MethodEntry.java b/src/main/java/cuchaz/enigma/mapping/MethodEntry.java index 301da61..01a5c43 100644 --- a/src/main/java/cuchaz/enigma/mapping/MethodEntry.java +++ b/src/main/java/cuchaz/enigma/mapping/MethodEntry.java @@ -85,10 +85,7 @@ public class MethodEntry implements BehaviorEntry, Serializable { @Override public boolean equals(Object other) { - if (other instanceof MethodEntry) { - return equals((MethodEntry) other); - } - return false; + return other instanceof MethodEntry && equals((MethodEntry) other); } public boolean equals(MethodEntry other) { diff --git a/src/main/java/cuchaz/enigma/mapping/MethodMapping.java b/src/main/java/cuchaz/enigma/mapping/MethodMapping.java index d1beddd..ff14ccd 100644 --- a/src/main/java/cuchaz/enigma/mapping/MethodMapping.java +++ b/src/main/java/cuchaz/enigma/mapping/MethodMapping.java @@ -36,62 +36,62 @@ public class MethodMapping implements Serializable, Comparable, M if (obfSignature == null) { throw new IllegalArgumentException("obf signature cannot be null!"); } - m_obfName = obfName; - m_deobfName = NameValidator.validateMethodName(deobfName); - m_obfSignature = obfSignature; - m_arguments = Maps.newTreeMap(); + this.m_obfName = obfName; + this.m_deobfName = NameValidator.validateMethodName(deobfName); + this.m_obfSignature = obfSignature; + this.m_arguments = Maps.newTreeMap(); } public MethodMapping(MethodMapping other, ClassNameReplacer obfClassNameReplacer) { - m_obfName = other.m_obfName; - m_deobfName = other.m_deobfName; - m_obfSignature = new Signature(other.m_obfSignature, obfClassNameReplacer); - m_arguments = Maps.newTreeMap(); + this.m_obfName = other.m_obfName; + this.m_deobfName = other.m_deobfName; + this.m_obfSignature = new Signature(other.m_obfSignature, obfClassNameReplacer); + this.m_arguments = Maps.newTreeMap(); for (Entry entry : other.m_arguments.entrySet()) { - m_arguments.put(entry.getKey(), new ArgumentMapping(entry.getValue())); + this.m_arguments.put(entry.getKey(), new ArgumentMapping(entry.getValue())); } } @Override public String getObfName() { - return m_obfName; + return this.m_obfName; } public void setObfName(String val) { - m_obfName = NameValidator.validateMethodName(val); + this.m_obfName = NameValidator.validateMethodName(val); } public String getDeobfName() { - return m_deobfName; + return this.m_deobfName; } public void setDeobfName(String val) { - m_deobfName = NameValidator.validateMethodName(val); + this.m_deobfName = NameValidator.validateMethodName(val); } public Signature getObfSignature() { - return m_obfSignature; + return this.m_obfSignature; } public void setObfSignature(Signature val) { - m_obfSignature = val; + this.m_obfSignature = val; } public Iterable arguments() { - return m_arguments.values(); + return this.m_arguments.values(); } public boolean isConstructor() { - return m_obfName.startsWith("<"); + return this.m_obfName.startsWith("<"); } public void addArgumentMapping(ArgumentMapping argumentMapping) { - boolean wasAdded = m_arguments.put(argumentMapping.getIndex(), argumentMapping) == null; + boolean wasAdded = this.m_arguments.put(argumentMapping.getIndex(), argumentMapping) == null; assert (wasAdded); } public String getObfArgumentName(int index) { - ArgumentMapping argumentMapping = m_arguments.get(index); + ArgumentMapping argumentMapping = this.m_arguments.get(index); if (argumentMapping != null) { return argumentMapping.getName(); } @@ -100,7 +100,7 @@ public class MethodMapping implements Serializable, Comparable, M } public String getDeobfArgumentName(int index) { - ArgumentMapping argumentMapping = m_arguments.get(index); + ArgumentMapping argumentMapping = this.m_arguments.get(index); if (argumentMapping != null) { return argumentMapping.getName(); } @@ -109,10 +109,10 @@ public class MethodMapping implements Serializable, Comparable, M } public void setArgumentName(int index, String name) { - ArgumentMapping argumentMapping = m_arguments.get(index); + ArgumentMapping argumentMapping = this.m_arguments.get(index); if (argumentMapping == null) { argumentMapping = new ArgumentMapping(index, name); - boolean wasAdded = m_arguments.put(index, argumentMapping) == null; + boolean wasAdded = this.m_arguments.put(index, argumentMapping) == null; assert (wasAdded); } else { argumentMapping.setName(name); @@ -120,7 +120,7 @@ public class MethodMapping implements Serializable, Comparable, M } public void removeArgumentName(int index) { - boolean wasRemoved = m_arguments.remove(index) != null; + boolean wasRemoved = this.m_arguments.remove(index) != null; assert (wasRemoved); } @@ -136,7 +136,7 @@ public class MethodMapping implements Serializable, Comparable, M buf.append(m_obfSignature); buf.append("\n"); buf.append("\tArguments:\n"); - for (ArgumentMapping argumentMapping : m_arguments.values()) { + for (ArgumentMapping argumentMapping : this.m_arguments.values()) { buf.append("\t\t"); buf.append(argumentMapping.getIndex()); buf.append(" -> "); @@ -148,31 +148,28 @@ public class MethodMapping implements Serializable, Comparable, M @Override public int compareTo(MethodMapping other) { - return (m_obfName + m_obfSignature).compareTo(other.m_obfName + other.m_obfSignature); + return (this.m_obfName + this.m_obfSignature).compareTo(other.m_obfName + other.m_obfSignature); } public boolean renameObfClass(final String oldObfClassName, final String newObfClassName) { // rename obf classes in the signature - Signature newSignature = new Signature(m_obfSignature, new ClassNameReplacer() { - @Override - public String replace(String className) { - if (className.equals(oldObfClassName)) { - return newObfClassName; - } - return null; + Signature newSignature = new Signature(this.m_obfSignature, className -> { + if (className.equals(oldObfClassName)) { + return newObfClassName; } + return null; }); - if (!newSignature.equals(m_obfSignature)) { - m_obfSignature = newSignature; + if (!newSignature.equals(this.m_obfSignature)) { + this.m_obfSignature = newSignature; return true; } return false; } public boolean containsArgument(String name) { - for (ArgumentMapping argumentMapping : m_arguments.values()) { + for (ArgumentMapping argumentMapping : this.m_arguments.values()) { if (argumentMapping.getName().equals(name)) { return true; } @@ -183,9 +180,9 @@ public class MethodMapping implements Serializable, Comparable, M @Override public BehaviorEntry getObfEntry(ClassEntry classEntry) { if (isConstructor()) { - return new ConstructorEntry(classEntry, m_obfSignature); + return new ConstructorEntry(classEntry, this.m_obfSignature); } else { - return new MethodEntry(classEntry, m_obfName, m_obfSignature); + return new MethodEntry(classEntry, this.m_obfName, this.m_obfSignature); } } } -- cgit v1.2.3