summaryrefslogtreecommitdiff
path: root/src/cuchaz/enigma/gui/Gui.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/cuchaz/enigma/gui/Gui.java')
-rw-r--r--src/cuchaz/enigma/gui/Gui.java9
1 files changed, 7 insertions, 2 deletions
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
102 private JPanel m_infoPanel; 102 private JPanel m_infoPanel;
103 private ObfuscatedHighlightPainter m_obfuscatedHighlightPainter; 103 private ObfuscatedHighlightPainter m_obfuscatedHighlightPainter;
104 private DeobfuscatedHighlightPainter m_deobfuscatedHighlightPainter; 104 private DeobfuscatedHighlightPainter m_deobfuscatedHighlightPainter;
105 private OtherHighlightPainter m_otherHighlightPainter;
105 private SelectionHighlightPainter m_selectionHighlightPainter; 106 private SelectionHighlightPainter m_selectionHighlightPainter;
106 private JTree m_inheritanceTree; 107 private JTree m_inheritanceTree;
107 private JTree m_implementationsTree; 108 private JTree m_implementationsTree;
@@ -205,6 +206,7 @@ public class Gui
205 DefaultSyntaxKit.initKit(); 206 DefaultSyntaxKit.initKit();
206 m_obfuscatedHighlightPainter = new ObfuscatedHighlightPainter(); 207 m_obfuscatedHighlightPainter = new ObfuscatedHighlightPainter();
207 m_deobfuscatedHighlightPainter = new DeobfuscatedHighlightPainter(); 208 m_deobfuscatedHighlightPainter = new DeobfuscatedHighlightPainter();
209 m_otherHighlightPainter = new OtherHighlightPainter();
208 m_selectionHighlightPainter = new SelectionHighlightPainter(); 210 m_selectionHighlightPainter = new SelectionHighlightPainter();
209 m_editor = new JEditorPane(); 211 m_editor = new JEditorPane();
210 m_editor.setEditable( false ); 212 m_editor.setEditable( false );
@@ -870,12 +872,11 @@ public class Gui
870 showToken( sortedTokens.get( 0 ) ); 872 showToken( sortedTokens.get( 0 ) );
871 } 873 }
872 874
873 public void setHighlightedTokens( Iterable<Token> obfuscatedTokens, Iterable<Token> deobfuscatedTokens ) 875 public void setHighlightedTokens( Iterable<Token> obfuscatedTokens, Iterable<Token> deobfuscatedTokens, Iterable<Token> otherTokens )
874 { 876 {
875 // remove any old highlighters 877 // remove any old highlighters
876 m_editor.getHighlighter().removeAllHighlights(); 878 m_editor.getHighlighter().removeAllHighlights();
877 879
878
879 // color things based on the index 880 // color things based on the index
880 if( obfuscatedTokens != null ) 881 if( obfuscatedTokens != null )
881 { 882 {
@@ -885,6 +886,10 @@ public class Gui
885 { 886 {
886 setHighlightedTokens( deobfuscatedTokens, m_deobfuscatedHighlightPainter ); 887 setHighlightedTokens( deobfuscatedTokens, m_deobfuscatedHighlightPainter );
887 } 888 }
889 if( otherTokens != null )
890 {
891 setHighlightedTokens( otherTokens, m_otherHighlightPainter );
892 }
888 893
889 redraw(); 894 redraw();
890 } 895 }