From 324af846e90ae38886c2298559510aa935b054ee Mon Sep 17 00:00:00 2001 From: Gegy Date: Sun, 12 May 2019 11:04:33 +0200 Subject: Rename in place functionality (#131) * Rename in place functionality * Don't allow rename if renaming is not allowed for the token * Remove redundant 'R' hotkey --- src/main/java/cuchaz/enigma/gui/GuiController.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/main/java/cuchaz/enigma/gui/GuiController.java') diff --git a/src/main/java/cuchaz/enigma/gui/GuiController.java b/src/main/java/cuchaz/enigma/gui/GuiController.java index 5610233..1683333 100644 --- a/src/main/java/cuchaz/enigma/gui/GuiController.java +++ b/src/main/java/cuchaz/enigma/gui/GuiController.java @@ -297,14 +297,7 @@ public class GuiController { * @param reference */ private void showReference(EntryReference, Entry> reference) { - EntryRemapper mapper = this.deobfuscator.getMapper(); - - SourceIndex index = this.currentSource.getIndex(); - Collection tokens = mapper.getObfResolver().resolveReference(reference, ResolutionStrategy.RESOLVE_CLOSEST) - .stream() - .flatMap(r -> index.getReferenceTokens(r).stream()) - .collect(Collectors.toList()); - + Collection tokens = getTokensForReference(reference); if (tokens.isEmpty()) { // DEBUG System.err.println(String.format("WARNING: no tokens found for %s in %s", reference, this.currentSource.getEntry())); @@ -313,6 +306,16 @@ public class GuiController { } } + public Collection getTokensForReference(EntryReference, Entry> reference) { + EntryRemapper mapper = this.deobfuscator.getMapper(); + + SourceIndex index = this.currentSource.getIndex(); + return mapper.getObfResolver().resolveReference(reference, ResolutionStrategy.RESOLVE_CLOSEST) + .stream() + .flatMap(r -> index.getReferenceTokens(r).stream()) + .collect(Collectors.toList()); + } + public void openPreviousReference() { if (hasPreviousReference()) { setReference(gui.referenceHistory.goBack()); -- cgit v1.2.3