From e0e3141619cecd54c087d964654e6c35511c48f9 Mon Sep 17 00:00:00 2001 From: Thog Date: Tue, 6 Sep 2016 12:11:50 +0200 Subject: A little bit of clean up --- .../java/cuchaz/enigma/gui/MemberMatchingGui.java | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'src/main/java/cuchaz/enigma/gui/MemberMatchingGui.java') 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 { private void highlightEntries(CodeReader reader, Deobfuscator deobfuscator, Collection obfMatchedEntries, Collection obfUnmatchedEntries) { reader.clearHighlights(); - SourceIndex index = reader.getSourceIndex(); - // matched fields - for (T obfT : obfMatchedEntries) { - T deobfT = deobfuscator.deobfuscateEntry(obfT); - Token token = index.getDeclarationToken(deobfT); - if (token != null) { - reader.setHighlightedToken(token, m_matchedHighlightPainter); - } - } - + updateHighlighted(obfMatchedEntries, deobfuscator, reader, m_matchedHighlightPainter); // unmatched fields - for (T obfT : obfUnmatchedEntries) { + updateHighlighted(obfUnmatchedEntries, deobfuscator, reader, m_unmatchedHighlightPainter); + } + + private void updateHighlighted(Collection entries, Deobfuscator deobfuscator, CodeReader reader, HighlightPainter painter) + { + SourceIndex index = reader.getSourceIndex(); + for (T obfT : entries) { T deobfT = deobfuscator.deobfuscateEntry(obfT); Token token = index.getDeclarationToken(deobfT); if (token != null) { - reader.setHighlightedToken(token, m_unmatchedHighlightPainter); + reader.setHighlightedToken(token, painter); } } } -- cgit v1.2.3