MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

NPE fixed

Browse Source
This commit is contained in:
Dmitry Avdeev
2009-12-03 16:04:46 +03:00
parent 1356a7b634
commit 871c690670
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/codeInspection/ProblemsHolder.java
+4 -4
View File
@@ -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);
}
plugins/generate-tostring/src/org/jetbrains/generate/tostring/inspection/ClassHasNoToStringMethodInspection.java
+4 -1
View File
@@ -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);
}
}
}
};