added token highlighting for things outside of the jar

5 files changed, 42 insertions, 6 deletions

diff --git a/src/cuchaz/enigma/analysis/SourceIndex.java b/src/cuchaz/enigma/analysis/SourceIndex.java
index b777f9fd..fb5cc655 100644
--- a/src/cuchaz/enigma/analysis/SourceIndex.java
+++ b/src/cuchaz/enigma/analysis/SourceIndex.java
@@ -77,7 +77,7 @@ public class SourceIndex
                         token.end -= pos + 1;
                 }
                 
-                // HACKHACK: sometimes node regions are off by one
+                /* HACKHACK: sometimes node regions are off by one
                 // I think this is a bug in Procyon, but it's easy to work around
                 if( !Character.isJavaIdentifierStart( m_source.charAt( token.start ) ) )
                 {
@@ -88,6 +88,7 @@ public class SourceIndex
                                 throw new IllegalArgumentException( "Region " + region + " does not describe valid token: '" + m_source.substring( token.start, token.end ) + "'" );
                         }
                 }
+                */
                 
                 return token;
         }
diff --git a/src/cuchaz/enigma/gui/BoxHighlightPainter.java b/src/cuchaz/enigma/gui/BoxHighlightPainter.java
index 30b2b021..df63f5a8 100644
--- a/src/cuchaz/enigma/gui/BoxHighlightPainter.java
+++ b/src/cuchaz/enigma/gui/BoxHighlightPainter.java
@@ -36,8 +36,11 @@ public abstract class BoxHighlightPainter implements Highlighter.HighlightPainte
                 Rectangle bounds = getBounds( text, start, end );
                 
                 // fill the area
-                g.setColor( m_fillColor );
-                g.fillRoundRect( bounds.x, bounds.y, bounds.width, bounds.height, 4, 4 );
+                if( m_fillColor != null )
+                {
+                        g.setColor( m_fillColor );
+                        g.fillRoundRect( bounds.x, bounds.y, bounds.width, bounds.height, 4, 4 );
+                }
                 
                 // draw a box around the area
                 g.setColor( m_borderColor );
diff --git a/src/cuchaz/enigma/gui/Gui.java b/src/cuchaz/enigma/gui/Gui.java
index 1995cb80..5eed728a 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<Token> obfuscatedTokens, Iterable<Token> deobfuscatedTokens )
+        public void setHighlightedTokens( Iterable<Token> obfuscatedTokens, Iterable<Token> deobfuscatedTokens, Iterable<Token> 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();
         }
diff --git a/src/cuchaz/enigma/gui/GuiController.java b/src/cuchaz/enigma/gui/GuiController.java
index 3f54ecd4..bbefe606 100644
--- a/src/cuchaz/enigma/gui/GuiController.java
+++ b/src/cuchaz/enigma/gui/GuiController.java
@@ -367,6 +367,7 @@ public class GuiController
                                 // set the highlighted tokens
                                 List<Token> obfuscatedTokens = Lists.newArrayList();
                                 List<Token> deobfuscatedTokens = Lists.newArrayList();
+                                List<Token> otherTokens = Lists.newArrayList();
                                 for( Token token : m_index.referenceTokens() )
                                 {
                                         EntryReference<Entry,Entry> reference = m_index.getDeobfReference( token );
@@ -378,8 +379,12 @@ public class GuiController
                                         {
                                                 obfuscatedTokens.add( token );
                                         }
+                                        else
+                                        {
+                                                otherTokens.add( token );
+                                        }
                                 }
-                                m_gui.setHighlightedTokens( obfuscatedTokens, deobfuscatedTokens );
+                                m_gui.setHighlightedTokens( obfuscatedTokens, deobfuscatedTokens, otherTokens );
                         }
                 }.start();
         }
diff --git a/src/cuchaz/enigma/gui/OtherHighlightPainter.java b/src/cuchaz/enigma/gui/OtherHighlightPainter.java
new file mode 100644
index 00000000..78de7325
--- /dev/null
+++ b/src/cuchaz/enigma/gui/OtherHighlightPainter.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Jeff Martin.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Public License v3.0
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/gpl.html
+ * 
+ * Contributors:
+ *     Jeff Martin - initial API and implementation
+ ******************************************************************************/
+package cuchaz.enigma.gui;
+
+import java.awt.Color;
+
+public class OtherHighlightPainter extends BoxHighlightPainter
+{
+        public OtherHighlightPainter( )
+        {
+                // grey
+                super( null, new Color( 180, 180, 180 ) );
+        }
+}