summaryrefslogtreecommitdiff
path: root/src/main/java/cuchaz/enigma/gui/GuiController.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/cuchaz/enigma/gui/GuiController.java')
-rw-r--r--src/main/java/cuchaz/enigma/gui/GuiController.java19
1 files changed, 11 insertions, 8 deletions
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 {
297 * @param reference 297 * @param reference
298 */ 298 */
299 private void showReference(EntryReference<Entry<?>, Entry<?>> reference) { 299 private void showReference(EntryReference<Entry<?>, Entry<?>> reference) {
300 EntryRemapper mapper = this.deobfuscator.getMapper(); 300 Collection<Token> tokens = getTokensForReference(reference);
301
302 SourceIndex index = this.currentSource.getIndex();
303 Collection<Token> tokens = mapper.getObfResolver().resolveReference(reference, ResolutionStrategy.RESOLVE_CLOSEST)
304 .stream()
305 .flatMap(r -> index.getReferenceTokens(r).stream())
306 .collect(Collectors.toList());
307
308 if (tokens.isEmpty()) { 301 if (tokens.isEmpty()) {
309 // DEBUG 302 // DEBUG
310 System.err.println(String.format("WARNING: no tokens found for %s in %s", reference, this.currentSource.getEntry())); 303 System.err.println(String.format("WARNING: no tokens found for %s in %s", reference, this.currentSource.getEntry()));
@@ -313,6 +306,16 @@ public class GuiController {
313 } 306 }
314 } 307 }
315 308
309 public Collection<Token> getTokensForReference(EntryReference<Entry<?>, Entry<?>> reference) {
310 EntryRemapper mapper = this.deobfuscator.getMapper();
311
312 SourceIndex index = this.currentSource.getIndex();
313 return mapper.getObfResolver().resolveReference(reference, ResolutionStrategy.RESOLVE_CLOSEST)
314 .stream()
315 .flatMap(r -> index.getReferenceTokens(r).stream())
316 .collect(Collectors.toList());
317 }
318
316 public void openPreviousReference() { 319 public void openPreviousReference() {
317 if (hasPreviousReference()) { 320 if (hasPreviousReference()) {
318 setReference(gui.referenceHistory.goBack()); 321 setReference(gui.referenceHistory.goBack());