From 358e6b4c2ecc655f840e023f44f4cd5f292fa458 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 13 Oct 2017 12:10:52 +0200
Subject: [PATCH] WEB-11110 Wrong error message "Built-in HTTP Server on custom
 port disabled"

---
 .../builtInWebServer/BuiltInServerConfigurableUi.java        | 5 +++++
 .../org/jetbrains/builtInWebServer/BuiltInServerOptions.java | 2 +-
 .../src/org/jetbrains/ide/BuiltInServerManagerImpl.java      | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/platform/built-in-server/src/org/jetbrains/builtInWebServer/BuiltInServerConfigurableUi.java b/platform/built-in-server/src/org/jetbrains/builtInWebServer/BuiltInServerConfigurableUi.java
index e604be37c3c1..b107c7420d1c 100644
--- a/platform/built-in-server/src/org/jetbrains/builtInWebServer/BuiltInServerConfigurableUi.java
+++ b/platform/built-in-server/src/org/jetbrains/builtInWebServer/BuiltInServerConfigurableUi.java
@@ -17,6 +17,11 @@ class BuiltInServerConfigurableUi implements ConfigurableUi<BuiltInServerOptions
   public BuiltInServerConfigurableUi() {
     portLabel.setLabelFor(builtInServerPort);
     builtInServerPort.setMin(1024);
+    builtInServerPort.addChangeListener(e -> {
+      boolean isEnabled = builtInServerPort.getNumber() != BuiltInServerOptions.DEFAULT_PORT;
+      builtInServerAvailableExternallyCheckBox.setEnabled(isEnabled);
+      builtInServerAvailableExternallyCheckBox.setToolTipText(isEnabled ? null : "Can’t be enabled for default port. Please change it.");
+    });
   }
 
   @Override
diff --git a/platform/built-in-server/src/org/jetbrains/builtInWebServer/BuiltInServerOptions.java b/platform/built-in-server/src/org/jetbrains/builtInWebServer/BuiltInServerOptions.java
index daad0df029cc..7b7b7dc3e820 100644
--- a/platform/built-in-server/src/org/jetbrains/builtInWebServer/BuiltInServerOptions.java
+++ b/platform/built-in-server/src/org/jetbrains/builtInWebServer/BuiltInServerOptions.java
@@ -29,7 +29,7 @@ import java.util.Collections;
   storages = @Storage("other.xml")
 )
 public class BuiltInServerOptions implements PersistentStateComponent<BuiltInServerOptions>, Getter<BuiltInServerOptions> {
-  private static final int DEFAULT_PORT = 63342;
+  public static final int DEFAULT_PORT = 63342;
 
   @Attribute
   public int builtInServerPort = DEFAULT_PORT;
diff --git a/platform/built-in-server/src/org/jetbrains/ide/BuiltInServerManagerImpl.java b/platform/built-in-server/src/org/jetbrains/ide/BuiltInServerManagerImpl.java
index c26d8092e236..99dc7b8f7fb5 100644
--- a/platform/built-in-server/src/org/jetbrains/ide/BuiltInServerManagerImpl.java
+++ b/platform/built-in-server/src/org/jetbrains/ide/BuiltInServerManagerImpl.java
@@ -74,7 +74,7 @@ public class BuiltInServerManagerImpl extends BuiltInServerManager implements Ap
   private static int getDefaultPort() {
     if (System.getProperty(PROPERTY_RPC_PORT) == null) {
       // Default port will be occupied by main idea instance - define the custom default to avoid searching of free port
-      return ApplicationManager.getApplication().isUnitTestMode() ? 64463 : 63342;
+      return ApplicationManager.getApplication().isUnitTestMode() ? 64463 : BuiltInServerOptions.DEFAULT_PORT;
     }
     else {
       return Integer.parseInt(System.getProperty(PROPERTY_RPC_PORT));