Integrated review comments.

(cherry picked from commit 76d1db1)
scala-ide · Nov 10, 2011 · 7d856bf · 7d856bf
1 parent 726dd67
commit 7d856bf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/org.scala-ide.sdt.core/src/scala/tools/eclipse/ScalaPlugin.scala b/org.scala-ide.sdt.core/src/scala/tools/eclipse/ScalaPlugin.scala
@@ -189,7 +189,8 @@ class ScalaPlugin extends AbstractUIPlugin with IResourceChangeListener with IEl
     }
   }
 
-  def isScalaProject(project: IJavaProject): Boolean = isScalaProject(project.getProject)
+  def isScalaProject(project: IJavaProject): Boolean = 
+    (project ne null) && isScalaProject(project.getProject)
 
   def isScalaProject(project: IProject): Boolean =
     try {

diff --git a/org.scala-ide.sdt.core/src/scala/tools/eclipse/javaelements/ScalaClassFileProvider.scala b/org.scala-ide.sdt.core/src/scala/tools/eclipse/javaelements/ScalaClassFileProvider.scala
@@ -29,7 +29,7 @@ class ScalaClassFileProvider extends IClassFileProvider with HasLogger {
     }
 
   override def isInteresting(classFile: IClassFile): Boolean = {
-    val res = ScalaPlugin.plugin.isScalaProject(Option(classFile.getJavaProject()).map(_.getProject()).getOrElse(null))
+    val res = ScalaPlugin.plugin.isScalaProject(classFile.getJavaProject())
     if (!res) 
       logger.debug("Not interested in %s in project %s".format(classFile, classFile.getJavaProject()))
     res