summaryrefslogtreecommitdiff
path: root/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
diff options
context:
space:
mode:
authorGravatar lclc982016-07-02 18:04:57 +1000
committerGravatar lclc982016-07-02 18:04:57 +1000
commit64c359d3c1d2347001e5c6becb1d7561457f52cc (patch)
treebc2f37325b770475237437d204e95254dbfa0b3d /src/main/java/cuchaz/enigma/mapping/ClassMapping.java
parentFixed Null.json and #4 (diff)
downloadenigma-fork-64c359d3c1d2347001e5c6becb1d7561457f52cc.tar.gz
enigma-fork-64c359d3c1d2347001e5c6becb1d7561457f52cc.tar.xz
enigma-fork-64c359d3c1d2347001e5c6becb1d7561457f52cc.zip
Renamed Fields
Diffstat (limited to 'src/main/java/cuchaz/enigma/mapping/ClassMapping.java')
-rw-r--r--src/main/java/cuchaz/enigma/mapping/ClassMapping.java6
1 files changed, 3 insertions, 3 deletions
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<ClassMapping> {
403 public boolean renameObfClass(String oldObfClassName, String newObfClassName) { 403 public boolean renameObfClass(String oldObfClassName, String newObfClassName) {
404 404
405 // rename inner classes 405 // rename inner classes
406 for (ClassMapping innerClassMapping : new ArrayList<ClassMapping>(m_innerClassesByObfSimple.values())) { 406 for (ClassMapping innerClassMapping : new ArrayList<>(m_innerClassesByObfSimple.values())) {
407 if (innerClassMapping.renameObfClass(oldObfClassName, newObfClassName)) { 407 if (innerClassMapping.renameObfClass(oldObfClassName, newObfClassName)) {
408 boolean wasRemoved = m_innerClassesByObfSimple.remove(oldObfClassName) != null; 408 boolean wasRemoved = m_innerClassesByObfSimple.remove(oldObfClassName) != null;
409 assert (wasRemoved); 409 assert (wasRemoved);
@@ -413,7 +413,7 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
413 } 413 }
414 414
415 // rename field types 415 // rename field types
416 for (FieldMapping fieldMapping : new ArrayList<FieldMapping>(m_fieldsByObf.values())) { 416 for (FieldMapping fieldMapping : new ArrayList<>(m_fieldsByObf.values())) {
417 String oldFieldKey = getFieldKey(fieldMapping.getObfName(), fieldMapping.getObfType()); 417 String oldFieldKey = getFieldKey(fieldMapping.getObfName(), fieldMapping.getObfType());
418 if (fieldMapping.renameObfClass(oldObfClassName, newObfClassName)) { 418 if (fieldMapping.renameObfClass(oldObfClassName, newObfClassName)) {
419 boolean wasRemoved = m_fieldsByObf.remove(oldFieldKey) != null; 419 boolean wasRemoved = m_fieldsByObf.remove(oldFieldKey) != null;
@@ -424,7 +424,7 @@ public class ClassMapping implements Serializable, Comparable<ClassMapping> {
424 } 424 }
425 425
426 // rename method signatures 426 // rename method signatures
427 for (MethodMapping methodMapping : new ArrayList<MethodMapping>(m_methodsByObf.values())) { 427 for (MethodMapping methodMapping : new ArrayList<>(m_methodsByObf.values())) {
428 String oldMethodKey = getMethodKey(methodMapping.getObfName(), methodMapping.getObfSignature()); 428 String oldMethodKey = getMethodKey(methodMapping.getObfName(), methodMapping.getObfSignature());
429 if (methodMapping.renameObfClass(oldObfClassName, newObfClassName)) { 429 if (methodMapping.renameObfClass(oldObfClassName, newObfClassName)) {
430 boolean wasRemoved = m_methodsByObf.remove(oldMethodKey) != null; 430 boolean wasRemoved = m_methodsByObf.remove(oldMethodKey) != null;