From 0db6f61c0aee6cd4ced2546d6701f4ca1e24442f Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Tue, 23 Jan 2018 21:01:13 +0300
Subject: [PATCH] DevKit: fix misleading error message

---
 .../org/jetbrains/idea/devkit/DevKitBundle.properties        | 1 +
 plugins/devkit/src/projectRoots/Sandbox.java                 | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/devkit/resources/org/jetbrains/idea/devkit/DevKitBundle.properties b/plugins/devkit/resources/org/jetbrains/idea/devkit/DevKitBundle.properties
index 8f3b8b3a815e..914c8e916afd 100644
--- a/plugins/devkit/resources/org/jetbrains/idea/devkit/DevKitBundle.properties
+++ b/plugins/devkit/resources/org/jetbrains/idea/devkit/DevKitBundle.properties
@@ -38,6 +38,7 @@ success.deployment.message.all=All Plugins Successfully Prepared For Deployment
 
 ##Idea Sdk
 sdk.title=IntelliJ Platform Plugin SDK
+jdk.specification=Please configure JDK
 sandbox.specification=Please configure the sandbox
 sandbox.home=Sandbox Home
 sandbox.home.label=Sandbox Home:
diff --git a/plugins/devkit/src/projectRoots/Sandbox.java b/plugins/devkit/src/projectRoots/Sandbox.java
index c6cf1ac67dcc..b0dffd2c3048 100644
--- a/plugins/devkit/src/projectRoots/Sandbox.java
+++ b/plugins/devkit/src/projectRoots/Sandbox.java
@@ -70,9 +70,12 @@ public class Sandbox implements ValidatableSdkAdditionalData {
 
   @Override
   public void checkValid(SdkModel sdkModel) throws ConfigurationException {
-    if (StringUtil.isEmpty(mySandboxHome) || getJavaSdk() == null) {
+    if (StringUtil.isEmpty(mySandboxHome)) {
       throw new ConfigurationException(DevKitBundle.message("sandbox.specification"));
     }
+    if (getJavaSdk() == null) {
+      throw new ConfigurationException(DevKitBundle.message("jdk.specification"));
+    }
   }
 
   void readExternal(Element element) throws InvalidDataException {