Allow multiple services for enigma (#168)

* Allow multiple services for enigma

Signed-off-by: liach <liach@users.noreply.github.com>

* Delete bad dummy

Signed-off-by: liach <liach@users.noreply.github.com>

1 files changed, 4 insertions, 8 deletions

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<String> proposeName(EnigmaProject project, Entry<?> entry) {
                 EnigmaServices services = project.getEnigma().getServices();
 
-                return services.get(NameProposalService.TYPE).flatMap(nameProposalService -> {
-                        EntryResolver resolver = project.getMapper().getObfResolver();
-
-                        Collection<Entry<?>> resolved = resolver.resolveEntry(entry, ResolutionStrategy.RESOLVE_ROOT);
+                return services.get(NameProposalService.TYPE).stream().flatMap(nameProposalService -> {
                         EntryRemapper mapper = project.getMapper();
+                        Collection<Entry<?>> resolved = mapper.getObfResolver().resolveEntry(entry, ResolutionStrategy.RESOLVE_ROOT);
 
-                        Stream<String> proposals = resolved.stream()
+                        return resolved.stream()
                                         .map(e -> nameProposalService.proposeName(e, mapper))
                                         .filter(Optional::isPresent)
                                         .map(Optional::get);
-
-                        return proposals.findFirst();
-                });
+                }).findFirst();
         }
 
         @Nullable