From a32d580f656ff5231222d600e146fdd7cd009e74 Mon Sep 17 00:00:00 2001 From: Yanis48 Date: Wed, 7 Apr 2021 12:23:29 +0200 Subject: Simplify toString() implementations --- .../java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java | 4 +--- .../main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java | 6 ++---- .../cuchaz/enigma/translation/representation/entry/FieldEntry.java | 2 +- .../cuchaz/enigma/translation/representation/entry/MethodEntry.java | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) (limited to 'enigma/src') diff --git a/enigma/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java b/enigma/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java index b09f7ac..4633ace 100644 --- a/enigma/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java +++ b/enigma/src/main/java/cuchaz/enigma/analysis/MethodImplementationsTreeNode.java @@ -60,9 +60,7 @@ public class MethodImplementationsTreeNode extends DefaultMutableTreeNode { @Override public String toString() { MethodEntry translatedEntry = translator.translate(entry); - String className = translatedEntry.getParent().getFullName(); - String methodName = translatedEntry.getName(); - return className + "." + methodName + "()"; + return translatedEntry.getFullName() + "()"; } public void load(JarIndex index) { diff --git a/enigma/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java b/enigma/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java index 7bee4dc..455456f 100644 --- a/enigma/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java +++ b/enigma/src/main/java/cuchaz/enigma/analysis/MethodInheritanceTreeNode.java @@ -62,13 +62,11 @@ public class MethodInheritanceTreeNode extends DefaultMutableTreeNode { @Override public String toString() { MethodEntry translatedEntry = translator.translate(entry); - String className = translatedEntry.getContainingClass().getFullName(); if (!this.implemented) { - return className; + return translatedEntry.getParent().getFullName(); } else { - String methodName = translatedEntry.getName(); - return className + "." + methodName + "()"; + return translatedEntry.getFullName() + "()"; } } diff --git a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java index 3c54468..5ddd33d 100644 --- a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java +++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/FieldEntry.java @@ -93,7 +93,7 @@ public class FieldEntry extends ParentedEntry implements Comparable< @Override public String toString() { - return this.parent.getFullName() + "." + this.name + ":" + this.desc; + return this.getFullName() + ":" + this.desc; } @Override diff --git a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/MethodEntry.java b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/MethodEntry.java index 4698aa4..864a580 100644 --- a/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/MethodEntry.java +++ b/enigma/src/main/java/cuchaz/enigma/translation/representation/entry/MethodEntry.java @@ -102,7 +102,7 @@ public class MethodEntry extends ParentedEntry implements Comparable @Override public String toString() { - return this.parent.getFullName() + "." + this.name + this.descriptor; + return this.getFullName() + this.descriptor; } @Override -- cgit v1.2.3