diff --git a/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java b/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java index 04668d5aa60d..01fa24239dff 100644 --- a/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java +++ b/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java @@ -123,11 +123,10 @@ public class GlobalJavaInspectionContextImpl extends GlobalJavaInspectionContext } for (Module module : modules) { final ModuleRootManager rootManager = ModuleRootManager.getInstance(module); - final Sdk jdk = rootManager.getSdk(); final OrderEntry[] entries = rootManager.getOrderEntries(); for (OrderEntry entry : entries) { if (entry instanceof JdkOrderEntry) { - if (jdk == null) { + if (!ModuleType.get(module).isValidSdk(module, null)) { System.err.println(InspectionsBundle.message("offline.inspections.module.jdk.not.found", ((JdkOrderEntry)entry).getJdkName(), module.getName())); return false; diff --git a/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java b/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java index a35b82298679..4f6b6579fc28 100644 --- a/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java +++ b/platform/lang-api/src/com/intellij/openapi/module/ModuleType.java @@ -18,9 +18,10 @@ package com.intellij.openapi.module; import com.intellij.ide.util.projectWizard.ModuleBuilder; import com.intellij.ide.util.projectWizard.ModuleWizardStep; import com.intellij.ide.util.projectWizard.WizardContext; -import com.intellij.openapi.roots.ui.configuration.ModulesProvider; import com.intellij.openapi.projectRoots.Sdk; +import com.intellij.openapi.roots.ui.configuration.ModulesProvider; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -80,7 +81,7 @@ public abstract class ModuleType { } } - public boolean isValidSdk(final Module module, final Sdk projectSdk) { + public boolean isValidSdk(final Module module, @Nullable final Sdk projectSdk) { return true; } diff --git a/platform/platform-resources-en/src/messages/InspectionsBundle.properties b/platform/platform-resources-en/src/messages/InspectionsBundle.properties index 3aa700283a3a..ca405515cc61 100644 --- a/platform/platform-resources-en/src/messages/InspectionsBundle.properties +++ b/platform/platform-resources-en/src/messages/InspectionsBundle.properties @@ -601,7 +601,7 @@ inspection.annotate.quickfix.overridden.method.warning=Overridden Method Warning inspection.annotate.quickfix.implements=implements inspection.annotate.quickfix.overrides=overrides offline.inspections.jdk.not.found={0} not found -offline.inspections.module.jdk.not.found=Please, specify jdk ''{0}'' for module ''{1}'' +offline.inspections.module.jdk.not.found=Please, specify sdk ''{0}'' for module ''{1}'' inconsistent.resource.bundle.display.name=Inconsistent Resource Bundle inconsistent.bundle.property.error=Inconsistent property ''{0}''. Must be defined in the parent file ''{1}''. inconsistent.bundle.untranslated.property.error=Untranslated property ''{0}''. Should be overridden in the ''{1}''.