From 57b53fc267aa606ee4d1bde5512632c82cbab9c5 Mon Sep 17 00:00:00 2001 From: jeff Date: Sat, 20 Sep 2014 21:44:50 -0400 Subject: added token highlighting for things outside of the jar --- src/cuchaz/enigma/gui/Gui.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/cuchaz/enigma/gui/Gui.java') diff --git a/src/cuchaz/enigma/gui/Gui.java b/src/cuchaz/enigma/gui/Gui.java index 1995cb8..5eed728 100644 --- a/src/cuchaz/enigma/gui/Gui.java +++ b/src/cuchaz/enigma/gui/Gui.java @@ -102,6 +102,7 @@ public class Gui private JPanel m_infoPanel; private ObfuscatedHighlightPainter m_obfuscatedHighlightPainter; private DeobfuscatedHighlightPainter m_deobfuscatedHighlightPainter; + private OtherHighlightPainter m_otherHighlightPainter; private SelectionHighlightPainter m_selectionHighlightPainter; private JTree m_inheritanceTree; private JTree m_implementationsTree; @@ -205,6 +206,7 @@ public class Gui DefaultSyntaxKit.initKit(); m_obfuscatedHighlightPainter = new ObfuscatedHighlightPainter(); m_deobfuscatedHighlightPainter = new DeobfuscatedHighlightPainter(); + m_otherHighlightPainter = new OtherHighlightPainter(); m_selectionHighlightPainter = new SelectionHighlightPainter(); m_editor = new JEditorPane(); m_editor.setEditable( false ); @@ -870,12 +872,11 @@ public class Gui showToken( sortedTokens.get( 0 ) ); } - public void setHighlightedTokens( Iterable obfuscatedTokens, Iterable deobfuscatedTokens ) + public void setHighlightedTokens( Iterable obfuscatedTokens, Iterable deobfuscatedTokens, Iterable otherTokens ) { // remove any old highlighters m_editor.getHighlighter().removeAllHighlights(); - // color things based on the index if( obfuscatedTokens != null ) { @@ -885,6 +886,10 @@ public class Gui { setHighlightedTokens( deobfuscatedTokens, m_deobfuscatedHighlightPainter ); } + if( otherTokens != null ) + { + setHighlightedTokens( otherTokens, m_otherHighlightPainter ); + } redraw(); } -- cgit v1.2.3