From 88d6cf73e9d5ac7496a5edfb3a183f41aa1d4cd2 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Thu, 1 Jul 2010 17:31:24 +0400 Subject: [PATCH] inspections test fixed --- .../internal/InternalInspectionToolsProvider.java | 7 +++++-- plugins/devkit/src/DevKitInspectionToolProvider.java | 7 ++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/internal/InternalInspectionToolsProvider.java b/java/java-impl/src/com/intellij/codeInspection/internal/InternalInspectionToolsProvider.java index 19770ddf3914..ca418c30c5b4 100644 --- a/java/java-impl/src/com/intellij/codeInspection/internal/InternalInspectionToolsProvider.java +++ b/java/java-impl/src/com/intellij/codeInspection/internal/InternalInspectionToolsProvider.java @@ -16,7 +16,6 @@ package com.intellij.codeInspection.internal; import com.intellij.codeInspection.InspectionToolProvider; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.util.ArrayUtil; @@ -26,6 +25,10 @@ public class InternalInspectionToolsProvider implements InspectionToolProvider { @Override public Class[] getInspectionClasses() { if (!ApplicationManagerEx.getApplicationEx().isInternal()) return ArrayUtil.EMPTY_CLASS_ARRAY; - return new Class[] { UndesirableClassUsageInspection.class }; + return getPublicClasses(); + } + + public static Class[] getPublicClasses() { + return new Class[] { UndesirableClassUsageInspection.class }; } } diff --git a/plugins/devkit/src/DevKitInspectionToolProvider.java b/plugins/devkit/src/DevKitInspectionToolProvider.java index 8408289a1566..fee7c6643b3f 100644 --- a/plugins/devkit/src/DevKitInspectionToolProvider.java +++ b/plugins/devkit/src/DevKitInspectionToolProvider.java @@ -16,7 +16,8 @@ package org.jetbrains.idea.devkit; import com.intellij.codeInspection.InspectionToolProvider; -import com.intellij.codeInspection.internal.UndesirableClassUsageInspection; +import com.intellij.codeInspection.internal.InternalInspectionToolsProvider; +import com.intellij.util.ArrayUtil; import org.jetbrains.idea.devkit.inspections.ComponentNotRegisteredInspection; import org.jetbrains.idea.devkit.inspections.InspectionDescriptionNotFoundInspection; import org.jetbrains.idea.devkit.inspections.IntentionDescriptionNotFoundInspection; @@ -27,14 +28,14 @@ import org.jetbrains.idea.devkit.inspections.PluginXmlDomInspection; */ public class DevKitInspectionToolProvider implements InspectionToolProvider { public Class[] getInspectionClasses() { - return new Class[] { + Class[] result = { //RegistrationProblemsInspection.class, PluginXmlDomInspection.class, ComponentNotRegisteredInspection.class, InspectionDescriptionNotFoundInspection.class, IntentionDescriptionNotFoundInspection.class, - UndesirableClassUsageInspection.class }; + return ArrayUtil.mergeArrays(result, InternalInspectionToolsProvider.getPublicClasses(), Class.class); } }