From 831aa13ae4b50fa7ee99d32b58d536d2494d9dba Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 8 Jan 2018 18:52:02 +0100 Subject: [PATCH] various APIs: don't return null to avoid @Nullable being inferred if IDEA-173618 is fixed --- .../intellij/debugger/ui/tree/render/NodeRendererImpl.java | 3 +-- .../codeInspection/ex/GlobalInspectionContextBase.java | 3 +-- .../src/com/intellij/openapi/progress/ProgressManager.java | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/NodeRendererImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/NodeRendererImpl.java index 135433489ff7..eb0f624d70aa 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/NodeRendererImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/NodeRendererImpl.java @@ -112,9 +112,8 @@ public abstract class NodeRendererImpl implements NodeRenderer{ return cloned; } catch (CloneNotSupportedException e) { - LOG.error(e); + throw new RuntimeException(e); } - return null; } @Override diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java index 560111635f6d..e1e5a856d828 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java @@ -122,8 +122,7 @@ public class GlobalInspectionContextBase extends UserDataHolderBase implements G final String[] availableProfileNames = profileManager.getAvailableProfileNames(); if (availableProfileNames.length == 0) { - //can't be - return null; + throw new IllegalStateException("There should be at least one inspection profile"); } profile = profileManager.getProfile(availableProfileNames[0], true); } diff --git a/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java b/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java index ec3a35c1de56..d2130c60cd40 100644 --- a/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java +++ b/platform/core-api/src/com/intellij/openapi/progress/ProgressManager.java @@ -60,9 +60,7 @@ public abstract class ProgressManager extends ProgressIndicatorProvider { public abstract T runProcess(@NotNull Computable process, @Nullable ProgressIndicator progress) throws ProcessCanceledException; @Override - public ProgressIndicator getProgressIndicator() { - return null; - } + public abstract ProgressIndicator getProgressIndicator(); public static void progress(@NotNull String text) throws ProcessCanceledException { progress(text, "");