From ad59e46740ef636b95667615e3881fcee6fbbcb9 Mon Sep 17 00:00:00 2001 From: liach Date: Fri, 8 Nov 2019 16:35:19 -0600 Subject: Allow multiple services for enigma (#168) * Allow multiple services for enigma Signed-off-by: liach * Delete bad dummy Signed-off-by: liach --- src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java') diff --git a/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java b/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java index 44f70f8..c1b163d 100644 --- a/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java +++ b/src/main/java/cuchaz/enigma/gui/DecompiledClassSource.java @@ -80,19 +80,15 @@ public class DecompiledClassSource { private Optional proposeName(EnigmaProject project, Entry entry) { EnigmaServices services = project.getEnigma().getServices(); - return services.get(NameProposalService.TYPE).flatMap(nameProposalService -> { - EntryResolver resolver = project.getMapper().getObfResolver(); - - Collection> resolved = resolver.resolveEntry(entry, ResolutionStrategy.RESOLVE_ROOT); + return services.get(NameProposalService.TYPE).stream().flatMap(nameProposalService -> { EntryRemapper mapper = project.getMapper(); + Collection> resolved = mapper.getObfResolver().resolveEntry(entry, ResolutionStrategy.RESOLVE_ROOT); - Stream proposals = resolved.stream() + return resolved.stream() .map(e -> nameProposalService.proposeName(e, mapper)) .filter(Optional::isPresent) .map(Optional::get); - - return proposals.findFirst(); - }); + }).findFirst(); } @Nullable -- cgit v1.2.3