fixed recursion of field reference nodes

tweaked scroll into view for showing tokens

3 files changed, 19 insertions, 4 deletions

diff --git a/src/cuchaz/enigma/analysis/FieldReferenceTreeNode.java b/src/cuchaz/enigma/analysis/FieldReferenceTreeNode.java
index 645e682..94d0da7 100644
--- a/src/cuchaz/enigma/analysis/FieldReferenceTreeNode.java
+++ b/src/cuchaz/enigma/analysis/FieldReferenceTreeNode.java
@@ -86,6 +86,10 @@ public class FieldReferenceTreeNode extends DefaultMutableTreeNode implements Re
                                 {
                                         ((BehaviorReferenceTreeNode)node).load( index, true );
                                 }
+                                else if( node instanceof FieldReferenceTreeNode )
+                                {
+                                        ((FieldReferenceTreeNode)node).load( index, true );
+                                }
                         }
                 }
         }
diff --git a/src/cuchaz/enigma/gui/BoxHighlightPainter.java b/src/cuchaz/enigma/gui/BoxHighlightPainter.java
index 2c11834..30b2b02 100644
--- a/src/cuchaz/enigma/gui/BoxHighlightPainter.java
+++ b/src/cuchaz/enigma/gui/BoxHighlightPainter.java
@@ -61,7 +61,8 @@ public abstract class BoxHighlightPainter implements Highlighter.HighlightPainte
                 }
                 catch( BadLocationException ex )
                 {
-                        throw new Error( ex );
+                        // don't care... just return something
+                        return new Rectangle( 0, 0, 0, 0 );
                 }
         }
 }
diff --git a/src/cuchaz/enigma/gui/Gui.java b/src/cuchaz/enigma/gui/Gui.java
index 914359b..dd82b8e 100644
--- a/src/cuchaz/enigma/gui/Gui.java
+++ b/src/cuchaz/enigma/gui/Gui.java
@@ -54,6 +54,7 @@ import javax.swing.JTextField;
 import javax.swing.JTree;
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
+import javax.swing.SwingUtilities;
 import javax.swing.Timer;
 import javax.swing.WindowConstants;
 import javax.swing.event.CaretEvent;
@@ -776,9 +777,16 @@ public class Gui
                         // make sure the token is visible in the scroll window
                         Rectangle start = m_editor.modelToView( token.start );
                         Rectangle end = m_editor.modelToView( token.end );
-                        Rectangle show = start.union( end );
-                        show.grow( 0, start.height*6 );
-                        m_editor.scrollRectToVisible( show );
+                        final Rectangle show = start.union( end );
+                        show.grow( start.width*10, start.height*6 );
+                        SwingUtilities.invokeLater( new Runnable( )
+                        {
+                                @Override
+                                public void run( )
+                                {
+                                        m_editor.scrollRectToVisible( show );
+                                }
+                        } );
                 }
                 catch( BadLocationException ex )
                 {
@@ -818,6 +826,8 @@ public class Gui
                         }
                 } );
                 timer.start();
+                
+                redraw();
         }
         
         public void showTokens( Collection<Token> tokens )