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

IDEADEV-41663: Artifacts: deleting of java EE facet added to artifact causes NPE at ArtifactErrorPanel.showError()

Browse Source
This commit is contained in:
nik
2009-12-01 10:15:00 +03:00
parent 8fc454d37f
commit b9cd606496
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/packaging/impl/ui/ArtifactProblemsHolderBase.java
+1 -7
View File
@@ -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);
}
}
java/compiler/openapi/src/com/intellij/packaging/ui/ArtifactProblemsHolder.java
+2 -4
View File
@@ -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<PackagingElement<?>> pathToPlace, @NotNull ArtifactProblemQuickFix... quickFixes);
void registerError(@NotNull String message, @Nullable List<PackagingElement<?>> pathToPlace, ArtifactProblemQuickFix... quickFixes);
void registerWarning(@NotNull String message, @Nullable List<PackagingElement<?>> pathToPlace, ArtifactProblemQuickFix... quickFixes);
void registerWarning(@NotNull String message, @Nullable List<PackagingElement<?>> pathToPlace, @NotNull ArtifactProblemQuickFix... quickFixes);
}
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactProblemsHolderImpl.java
+3 -3
View File
@@ -38,18 +38,18 @@ public class ArtifactProblemsHolderImpl extends ArtifactProblemsHolderBase {
myProblemsHolder = problemsHolder;
}
public void registerError(@NotNull String message, @Nullable List<PackagingElement<?>> pathToPlace, @Nullable ArtifactProblemQuickFix... quickFixes) {
public void registerError(@NotNull String message, @Nullable List<PackagingElement<?>> pathToPlace, @NotNull ArtifactProblemQuickFix... quickFixes) {
registerProblem(message, pathToPlace, ProjectStructureProblemDescription.Severity.ERROR, quickFixes);
}
private void registerProblem(@NotNull String message, @Nullable List<PackagingElement<?>> 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<PackagingElement<?>> pathToPlace,
ArtifactProblemQuickFix... quickFixes) {
@NotNull ArtifactProblemQuickFix... quickFixes) {
registerProblem(message, pathToPlace, ProjectStructureProblemDescription.Severity.WARNING, quickFixes);
}
}