From 0f47403d0220757fed189b76e2071e25b1025cb8 Mon Sep 17 00:00:00 2001 From: Runemoro Date: Wed, 3 Jun 2020 13:39:42 -0400 Subject: Split GUI code to separate module (#242) * Split into modules * Post merge compile fixes Co-authored-by: modmuss50 --- .../java/cuchaz/enigma/ProposingTranslator.java | 53 ---------------------- 1 file changed, 53 deletions(-) delete mode 100644 src/main/java/cuchaz/enigma/ProposingTranslator.java (limited to 'src/main/java/cuchaz/enigma/ProposingTranslator.java') diff --git a/src/main/java/cuchaz/enigma/ProposingTranslator.java b/src/main/java/cuchaz/enigma/ProposingTranslator.java deleted file mode 100644 index 018fbfd..0000000 --- a/src/main/java/cuchaz/enigma/ProposingTranslator.java +++ /dev/null @@ -1,53 +0,0 @@ -package cuchaz.enigma; - -import cuchaz.enigma.api.service.NameProposalService; -import cuchaz.enigma.translation.Translatable; -import cuchaz.enigma.translation.Translator; -import cuchaz.enigma.translation.mapping.EntryRemapper; -import cuchaz.enigma.translation.mapping.ResolutionStrategy; -import cuchaz.enigma.translation.representation.entry.Entry; - -import java.util.Arrays; -import java.util.Optional; - -public class ProposingTranslator implements Translator { - private final EntryRemapper mapper; - private final NameProposalService[] nameProposalServices; - - public ProposingTranslator(EntryRemapper mapper, NameProposalService[] nameProposalServices) { - this.mapper = mapper; - this.nameProposalServices = nameProposalServices; - } - - @Override - @SuppressWarnings("unchecked") - public T translate(T translatable) { - if (translatable == null) { - return null; - } - - T deobfuscated = mapper.deobfuscate(translatable); - - if (translatable instanceof Entry && ((Entry) deobfuscated).getName().equals(((Entry) translatable).getName())) { - return mapper.getObfResolver() - .resolveEntry((Entry) translatable, ResolutionStrategy.RESOLVE_ROOT) - .stream() - .map(this::proposeName) - .filter(Optional::isPresent) - .map(Optional::get) - .findFirst() - .map(newName -> (T) ((Entry) deobfuscated).withName(newName)) - .orElse(deobfuscated); - } - - return deobfuscated; - } - - private Optional proposeName(Entry entry) { - return Arrays.stream(nameProposalServices) - .map(service -> service.proposeName(entry, mapper)) - .filter(Optional::isPresent) - .map(Optional::get) - .findFirst(); - } -} -- cgit v1.2.3