diff options
Diffstat (limited to 'src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java')
| -rw-r--r-- | src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java b/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java index 03f76c9..0ac41b3 100644 --- a/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java +++ b/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java | |||
| @@ -45,10 +45,10 @@ public class DecompiledClassSource { | |||
| 45 | private String remapToken(Token token, Token movedToken, Translator translator) { | 45 | private String remapToken(Token token, Token movedToken, Translator translator) { |
| 46 | EntryReference<Entry<?>, Entry<?>> reference = obfuscatedIndex.getReference(token); | 46 | EntryReference<Entry<?>, Entry<?>> reference = obfuscatedIndex.getReference(token); |
| 47 | 47 | ||
| 48 | if (deobfuscator.isRenamable(reference)) { | 48 | Entry<?> entry = reference.getNameableEntry(); |
| 49 | Entry<?> entry = reference.getNameableEntry(); | 49 | Entry<?> translatedEntry = translator.translate(entry); |
| 50 | Entry<?> translatedEntry = translator.translate(entry); | ||
| 51 | 50 | ||
| 51 | if (deobfuscator.isRenamable(reference)) { | ||
| 52 | if (isDeobfuscated(entry, translatedEntry)) { | 52 | if (isDeobfuscated(entry, translatedEntry)) { |
| 53 | highlightToken(movedToken, TokenHighlightType.DEOBFUSCATED); | 53 | highlightToken(movedToken, TokenHighlightType.DEOBFUSCATED); |
| 54 | return translatedEntry.getSourceRemapName(); | 54 | return translatedEntry.getSourceRemapName(); |
| @@ -60,14 +60,14 @@ public class DecompiledClassSource { | |||
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | highlightToken(movedToken, TokenHighlightType.OBFUSCATED); | 62 | highlightToken(movedToken, TokenHighlightType.OBFUSCATED); |
| 63 | |||
| 64 | String defaultName = generateDefaultName(translatedEntry); | ||
| 65 | if (defaultName != null) { | ||
| 66 | return defaultName; | ||
| 67 | } | ||
| 68 | } | 63 | } |
| 69 | } | 64 | } |
| 70 | 65 | ||
| 66 | String defaultName = generateDefaultName(translatedEntry); | ||
| 67 | if (defaultName != null) { | ||
| 68 | return defaultName; | ||
| 69 | } | ||
| 70 | |||
| 71 | return null; | 71 | return null; |
| 72 | } | 72 | } |
| 73 | 73 | ||