From b9cd60649647ad1a5c0f03715de9b1cdc8950036 Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 1 Dec 2009 10:15:00 +0300 Subject: [PATCH] IDEADEV-41663: Artifacts: deleting of java EE facet added to artifact causes NPE at ArtifactErrorPanel.showError() --- .../packaging/impl/ui/ArtifactProblemsHolderBase.java | 8 +------- .../com/intellij/packaging/ui/ArtifactProblemsHolder.java | 6 ++---- .../artifacts/ArtifactProblemsHolderImpl.java | 6 +++--- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/ui/ArtifactProblemsHolderBase.java b/java/compiler/impl/src/com/intellij/packaging/impl/ui/ArtifactProblemsHolderBase.java index 102bd9ad3f81..357bd3d1e1b4 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/ui/ArtifactProblemsHolderBase.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/ui/ArtifactProblemsHolderBase.java @@ -15,11 +15,9 @@ */ package com.intellij.packaging.impl.ui; -import com.intellij.packaging.ui.ArtifactProblemsHolder; import com.intellij.packaging.ui.ArtifactEditorContext; -import com.intellij.packaging.ui.ArtifactProblemQuickFix; +import com.intellij.packaging.ui.ArtifactProblemsHolder; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; /** * @author nik @@ -38,8 +36,4 @@ public abstract class ArtifactProblemsHolderBase implements ArtifactProblemsHold public void registerError(@NotNull String message) { registerError(message, null); } - - public void registerError(@NotNull String message, @Nullable ArtifactProblemQuickFix quickFix) { - registerError(message, null, quickFix); - } } diff --git a/java/compiler/openapi/src/com/intellij/packaging/ui/ArtifactProblemsHolder.java b/java/compiler/openapi/src/com/intellij/packaging/ui/ArtifactProblemsHolder.java index 575292ece6c3..1fa2d6a4f3ba 100644 --- a/java/compiler/openapi/src/com/intellij/packaging/ui/ArtifactProblemsHolder.java +++ b/java/compiler/openapi/src/com/intellij/packaging/ui/ArtifactProblemsHolder.java @@ -30,9 +30,7 @@ public interface ArtifactProblemsHolder { void registerError(@NotNull String message); - void registerError(@NotNull String message, @Nullable ArtifactProblemQuickFix quickFix); + void registerError(@NotNull String message, @Nullable List> pathToPlace, @NotNull ArtifactProblemQuickFix... quickFixes); - void registerError(@NotNull String message, @Nullable List> pathToPlace, ArtifactProblemQuickFix... quickFixes); - - void registerWarning(@NotNull String message, @Nullable List> pathToPlace, ArtifactProblemQuickFix... quickFixes); + void registerWarning(@NotNull String message, @Nullable List> pathToPlace, @NotNull ArtifactProblemQuickFix... quickFixes); } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactProblemsHolderImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactProblemsHolderImpl.java index 4ad1ad75b3b8..43aa20ed5ec6 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactProblemsHolderImpl.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactProblemsHolderImpl.java @@ -38,18 +38,18 @@ public class ArtifactProblemsHolderImpl extends ArtifactProblemsHolderBase { myProblemsHolder = problemsHolder; } - public void registerError(@NotNull String message, @Nullable List> pathToPlace, @Nullable ArtifactProblemQuickFix... quickFixes) { + public void registerError(@NotNull String message, @Nullable List> pathToPlace, @NotNull ArtifactProblemQuickFix... quickFixes) { registerProblem(message, pathToPlace, ProjectStructureProblemDescription.Severity.ERROR, quickFixes); } private void registerProblem(@NotNull String message, @Nullable List> pathToPlace, - final ProjectStructureProblemDescription.Severity severity, @Nullable ArtifactProblemQuickFix... quickFixes) { + final ProjectStructureProblemDescription.Severity severity, @NotNull ArtifactProblemQuickFix... quickFixes) { myProblemsHolder.registerProblem(new ArtifactProblemDescription(message, severity, pathToPlace, Arrays.asList(quickFixes))); } public void registerWarning(@NotNull String message, @Nullable List> pathToPlace, - ArtifactProblemQuickFix... quickFixes) { + @NotNull ArtifactProblemQuickFix... quickFixes) { registerProblem(message, pathToPlace, ProjectStructureProblemDescription.Severity.WARNING, quickFixes); } }