[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2807] trunk/org.rubypeople.rdt.core/src/org/ rubypeople/rdt/internal

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

Revision: 2807
          http://svn.sourceforge.net/rubyeclipse/?rev=2807&view=rev
Author:   cawilliams
Date:     2007-07-20 08:24:38 -0700 (Fri, 20 Jul 2007)

Log Message:
-----------
fix null pointer

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/SelectionEngine.java
    trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/ASTUtil.java

Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/SelectionEngine.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/SelectionEngine.java	2007-07-20 13:52:02 UTC (rev 2806)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/codeassist/SelectionEngine.java	2007-07-20 15:24:38 UTC (rev 2807)
@@ -178,6 +178,7 @@
 			
 			
 			String typeName = ASTUtil.getNameReflectively(receiver);
+			if (typeName == null) typeName = "Object";
 			CollectingSearchRequestor requestor = new CollectingSearchRequestor();
 			SearchPattern pattern = SearchPattern.createPattern(
 					IRubyElement.TYPE, typeName,

Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/ASTUtil.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/ASTUtil.java	2007-07-20 13:52:02 UTC (rev 2806)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/ASTUtil.java	2007-07-20 15:24:38 UTC (rev 2807)
@@ -154,6 +154,7 @@
 	 * @return name or null
 	 */
 	public static String getNameReflectively(Node node) {
+		if (node == null) return "";
 		if (node instanceof ClassNode) {
 			ClassNode classNode = (ClassNode) node;
 			return getNameReflectively(classNode.getCPath());


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