From 871c690670b243b62893d6ca1d12093047541ea1 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Thu, 3 Dec 2009 16:04:46 +0300
Subject: [PATCH] NPE fixed

---
 .../src/com/intellij/codeInspection/ProblemsHolder.java   | 8 ++++----
 .../inspection/ClassHasNoToStringMethodInspection.java    | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/platform/lang-api/src/com/intellij/codeInspection/ProblemsHolder.java b/platform/lang-api/src/com/intellij/codeInspection/ProblemsHolder.java
index e625833667ba..a17963e0c47a 100644
--- a/platform/lang-api/src/com/intellij/codeInspection/ProblemsHolder.java
+++ b/platform/lang-api/src/com/intellij/codeInspection/ProblemsHolder.java
@@ -46,11 +46,11 @@ public class ProblemsHolder {
     myOnTheFly = onTheFly;
   }
 
-  public void registerProblem(PsiElement psiElement, @Nls String descriptionTemplate, LocalQuickFix... fixes) {
+  public void registerProblem(@NotNull PsiElement psiElement, @Nls String descriptionTemplate, LocalQuickFix... fixes) {
     registerProblem(psiElement, descriptionTemplate, ProblemHighlightType.GENERIC_ERROR_OR_WARNING, fixes);
   }
 
-  public void registerProblem(PsiElement psiElement,
+  public void registerProblem(@NotNull PsiElement psiElement,
                               String descriptionTemplate,
                               ProblemHighlightType highlightType,
                               LocalQuickFix... fixes) {
@@ -79,7 +79,7 @@ public class ProblemsHolder {
     return ArrayUtil.indexOf(myFile.getPsiRoots(), file) != -1;
   }
 
-  public void registerProblem(PsiReference reference, String descriptionTemplate, ProblemHighlightType highlightType) {
+  public void registerProblem(@NotNull PsiReference reference, String descriptionTemplate, ProblemHighlightType highlightType) {
     LocalQuickFix[] fixes = null;
     if (reference instanceof LocalQuickFixProvider) {
       fixes = ((LocalQuickFixProvider)reference).getQuickFixes();
@@ -89,7 +89,7 @@ public class ProblemsHolder {
                                                       myOnTheFly, fixes));
   }
 
-  public void registerProblem(PsiReference reference) {
+  public void registerProblem(@NotNull PsiReference reference) {
     assert reference instanceof EmptyResolveMessageProvider;
     registerProblem(reference, ((EmptyResolveMessageProvider)reference).getUnresolvedMessagePattern(), ProblemHighlightType.LIKE_UNKNOWN_SYMBOL);
   }
diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/inspection/ClassHasNoToStringMethodInspection.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/inspection/ClassHasNoToStringMethodInspection.java
index d6a038f3d443..eb6085aff51b 100644
--- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/inspection/ClassHasNoToStringMethodInspection.java
+++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/inspection/ClassHasNoToStringMethodInspection.java
@@ -143,7 +143,10 @@ public class ClassHasNoToStringMethodInspection extends AbstractToStringInspecti
                 if (toStringMethod == null) {
                     // a toString() method is missing
                     if (log.isDebugEnabled()) log.debug("Class does not overwrite toString() method: " + clazz.getQualifiedName());
-                    holder.registerProblem(clazz.getNameIdentifier(), "Class '" + clazz.getName() + "' does not overwrite toString() method", ProblemHighlightType.GENERIC_ERROR_OR_WARNING, fix);
+                  PsiIdentifier element = clazz.getNameIdentifier();
+                  if (element != null) {
+                    holder.registerProblem(element, "Class '" + clazz.getName() + "' does not overwrite toString() method", ProblemHighlightType.GENERIC_ERROR_OR_WARNING, fix);
+                  }
                 }
             }
         };