[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2977] trunk/org.rubypeople.rdt.ui/src/org/ rubypeople/rdt/internal/ui/text/ruby/hover/RiDocHoverProvider.java

[<caw...@us...>]

Revision: 2977
          http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=2977&view=rev
Author:   cawilliams
Date:     2007-08-15 07:03:04 -0700 (Wed, 15 Aug 2007)

Log Message:
-----------
try to avoid null pointer

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/hover/RiDocHoverProvider.java

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/hover/RiDocHoverProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/hover/RiDocHoverProvider.java	2007-08-15 14:02:58 UTC (rev 2976)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/hover/RiDocHoverProvider.java	2007-08-15 14:03:04 UTC (rev 2977)
@@ -56,7 +56,8 @@
 			}
 		}
 		try {
-			IDocument doc = textViewer.getDocument();				
+			IDocument doc = textViewer.getDocument();		
+			if (doc == null) return null;
 			String contentType = null;
 			if (doc instanceof IDocumentExtension3) {
 				IDocumentExtension3 extension = (IDocumentExtension3) doc;		
@@ -68,8 +69,8 @@
 			}
 			if (contentType != null && !contentType.equals(IRubyPartitions.RUBY_DEFAULT)) {
 				return null;
-			}
-			String symbol = textViewer.getDocument().get(hoverRegion.getOffset(), hoverRegion.getLength());	
+			}			
+			String symbol = doc.get(hoverRegion.getOffset(), hoverRegion.getLength());	
 			if (symbol != null && (symbol.startsWith("@") || symbol.startsWith("$") || symbol.startsWith(":"))) return null; // don't try class/instance/global variables or symbols
 			return getRIResult(symbol);
 		} catch (BadLocationException e) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.