diff options
| author | 2016-09-06 12:11:50 +0200 | |
|---|---|---|
| committer | 2016-09-06 12:11:50 +0200 | |
| commit | e0e3141619cecd54c087d964654e6c35511c48f9 (patch) | |
| tree | 9d7750f6abe26b4ca08cc9ffb516222569ebfd0b /src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java | |
| parent | Avoid Engima converter detecting <init> and <clinit> as matchable token (diff) | |
| download | enigma-fork-e0e3141619cecd54c087d964654e6c35511c48f9.tar.gz enigma-fork-e0e3141619cecd54c087d964654e6c35511c48f9.tar.xz enigma-fork-e0e3141619cecd54c087d964654e6c35511c48f9.zip | |
A little bit of clean up
Diffstat (limited to 'src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java')
| -rw-r--r-- | src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java b/src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java index 9e90dae..4383465 100644 --- a/src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java +++ b/src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java | |||
| @@ -287,23 +287,20 @@ public class MemberMatchingGui<T extends Entry> { | |||
| 287 | 287 | ||
| 288 | private void highlightEntries(CodeReader reader, Deobfuscator deobfuscator, Collection<T> obfMatchedEntries, Collection<T> obfUnmatchedEntries) { | 288 | private void highlightEntries(CodeReader reader, Deobfuscator deobfuscator, Collection<T> obfMatchedEntries, Collection<T> obfUnmatchedEntries) { |
| 289 | reader.clearHighlights(); | 289 | reader.clearHighlights(); |
| 290 | SourceIndex index = reader.getSourceIndex(); | ||
| 291 | |||
| 292 | // matched fields | 290 | // matched fields |
| 293 | for (T obfT : obfMatchedEntries) { | 291 | updateHighlighted(obfMatchedEntries, deobfuscator, reader, m_matchedHighlightPainter); |
| 294 | T deobfT = deobfuscator.deobfuscateEntry(obfT); | ||
| 295 | Token token = index.getDeclarationToken(deobfT); | ||
| 296 | if (token != null) { | ||
| 297 | reader.setHighlightedToken(token, m_matchedHighlightPainter); | ||
| 298 | } | ||
| 299 | } | ||
| 300 | |||
| 301 | // unmatched fields | 292 | // unmatched fields |
| 302 | for (T obfT : obfUnmatchedEntries) { | 293 | updateHighlighted(obfUnmatchedEntries, deobfuscator, reader, m_unmatchedHighlightPainter); |
| 294 | } | ||
| 295 | |||
| 296 | private void updateHighlighted(Collection<T> entries, Deobfuscator deobfuscator, CodeReader reader, HighlightPainter painter) | ||
| 297 | { | ||
| 298 | SourceIndex index = reader.getSourceIndex(); | ||
| 299 | for (T obfT : entries) { | ||
| 303 | T deobfT = deobfuscator.deobfuscateEntry(obfT); | 300 | T deobfT = deobfuscator.deobfuscateEntry(obfT); |
| 304 | Token token = index.getDeclarationToken(deobfT); | 301 | Token token = index.getDeclarationToken(deobfT); |
| 305 | if (token != null) { | 302 | if (token != null) { |
| 306 | reader.setHighlightedToken(token, m_unmatchedHighlightPainter); | 303 | reader.setHighlightedToken(token, painter); |
| 307 | } | 304 | } |
| 308 | } | 305 | } |
| 309 | } | 306 | } |