PsiElement.getProject() won't fail with NPE anymore even if element is invalid. null will be returned instead.

This commit is contained in:
Maxim Shafirov
2005-02-12 22:00:41 +03:00
parent c89c1ebfe1
commit 02714dbd42
3 changed files with 6 additions and 3 deletions
@@ -125,7 +125,8 @@ public abstract class PsiElementBase extends ElementBase implements PsiElement,N
}
public Project getProject() {
return getManager().getProject();
final PsiManager manager = getManager();
return manager != null ? manager.getProject() : null;
}
public Language getLanguage() {
@@ -237,7 +237,8 @@ public abstract class CompositePsiElement extends CompositeElement implements Ps
}
public Project getProject() {
return getManager().getProject();
final PsiManager manager = getManager();
return manager != null ? manager.getProject() : null;
}
public Language getLanguage() {
@@ -184,7 +184,8 @@ public class LeafPsiElement extends LeafElementImpl implements PsiElement {
}
public Project getProject() {
return getManager().getProject();
final PsiManager manager = getManager();
return manager != null ? manager.getProject() : null;
}
public Language getLanguage() {