diff options
| author |  gegy1000 | 2019-02-18 22:32:48 +0200 |
|---|---|---|
| committer | gegy1000 | 2019-02-18 22:32:48 +0200 |
| commit | e8253a7b3ec0cd2c944524521d367f829dfd88e6 (patch) | |
| tree | a069fedf3e7156ad579f85385edc1be29ff515a8 /src | |
| parent | Fix NPE dropping mappings (diff) | |
| download | enigma-e8253a7b3ec0cd2c944524521d367f829dfd88e6.tar.gz enigma-e8253a7b3ec0cd2c944524521d367f829dfd88e6.tar.xz enigma-e8253a7b3ec0cd2c944524521d367f829dfd88e6.zip | |
Match token navigation reference resolution to match source index
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/cuchaz/enigma/gui/GuiController.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/cuchaz/enigma/gui/GuiController.java b/src/main/java/cuchaz/enigma/gui/GuiController.java index 03e17682..357d812b 100644 --- a/src/main/java/cuchaz/enigma/gui/GuiController.java +++ b/src/main/java/cuchaz/enigma/gui/GuiController.java | |||
| @@ -260,14 +260,14 @@ public class GuiController { | |||
| 260 | EntryRemapper mapper = this.deobfuscator.getMapper(); | 260 | EntryRemapper mapper = this.deobfuscator.getMapper(); |
| 261 | 261 | ||
| 262 | SourceIndex index = this.currentSource.getIndex(); | 262 | SourceIndex index = this.currentSource.getIndex(); |
| 263 | Collection<Token> tokens = mapper.getObfResolver().resolveReference(reference, ResolutionStrategy.RESOLVE_ROOT) | 263 | Collection<Token> tokens = mapper.getObfResolver().resolveReference(reference, ResolutionStrategy.RESOLVE_CLOSEST) |
| 264 | .stream() | 264 | .stream() |
| 265 | .flatMap(r -> index.getReferenceTokens(r).stream()) | 265 | .flatMap(r -> index.getReferenceTokens(r).stream()) |
| 266 | .collect(Collectors.toList()); | 266 | .collect(Collectors.toList()); |
| 267 | 267 | ||
| 268 | if (tokens.isEmpty()) { | 268 | if (tokens.isEmpty()) { |
| 269 | // DEBUG | 269 | // DEBUG |
| 270 | System.err.println(String.format("WARNING: no tokens found for %s in %s", tokens, this.currentSource.getEntry())); | 270 | System.err.println(String.format("WARNING: no tokens found for %s in %s", reference, this.currentSource.getEntry())); |
| 271 | } else { | 271 | } else { |
| 272 | this.gui.showTokens(tokens); | 272 | this.gui.showTokens(tokens); |
| 273 | } | 273 | } |