From f83875bee98cb70eeff2a597fc9379b150af98ba Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Wed, 8 May 2019 14:27:39 +0200
Subject: [PATCH] IDEA-210281 Cleanup Gradle settings: UseQualifiedModuleNames
 hidden + CreateEmptyContentRootDirectories dropped

* UseQualifiedModuleNames restored backward and forward compatibility.

GitOrigin-RevId: 25c423fcb2f41b8c696d214b7e8ead113a77b7cc
---
 .../externalSystem/settings/ExternalProjectSettings.java  | 8 +++++++-
 .../project/wizard/AbstractExternalModuleBuilder.java     | 1 +
 .../settings/AbstractImportFromExternalSystemControl.java | 2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/ExternalProjectSettings.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/ExternalProjectSettings.java
index b9cea5f1e5a6..61e7ea1b7f93 100644
--- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/ExternalProjectSettings.java
+++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/settings/ExternalProjectSettings.java
@@ -1,6 +1,7 @@
 // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.openapi.externalSystem.settings;
 
+import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil;
 import com.intellij.openapi.util.Comparing;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -29,11 +30,16 @@ public abstract class ExternalProjectSettings implements Comparable<ExternalProj
   }
 
   private boolean myUseAutoImport;
-  private boolean myUseQualifiedModuleNames = true;
+  private boolean myUseQualifiedModuleNames = !ExternalSystemApiUtil.isJavaCompatibleIde(); // backward-compatible defaults
 
   @SuppressWarnings("DeprecatedIsStillUsed") @Deprecated // left for settings backward-compatibility
   private boolean myCreateEmptyContentRootDirectories;
 
+  // Used to gradually migrate new project to the new defaults.
+  public void setupNewProjectDefault() {
+    myUseQualifiedModuleNames = true;
+  }
+
   public String getExternalProjectPath() {
     return myExternalProjectPath;
   }
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalModuleBuilder.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalModuleBuilder.java
index fd507d1209e2..642a0143b762 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalModuleBuilder.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalModuleBuilder.java
@@ -25,6 +25,7 @@ public abstract class AbstractExternalModuleBuilder<S extends ExternalProjectSet
                                           @NotNull final S externalProjectSettings) {
     myExternalSystemId = externalSystemId;
     myExternalProjectSettings = externalProjectSettings;
+    externalProjectSettings.setupNewProjectDefault();
     Icon icon = ExternalSystemUiUtil.getUiAware(externalSystemId).getProjectIcon();
     myIcon = icon == null ? super.getNodeIcon() : icon;
   }
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/settings/AbstractImportFromExternalSystemControl.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/settings/AbstractImportFromExternalSystemControl.java
index f0d7ca5f7bd0..d2db8a09f16d 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/settings/AbstractImportFromExternalSystemControl.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/settings/AbstractImportFromExternalSystemControl.java
@@ -81,6 +81,8 @@ public abstract class AbstractImportFromExternalSystemControl<
     myExternalSystemId = externalSystemId;
     mySystemSettings = systemSettings;
     myProjectSettings = projectSettings;
+    myProjectSettings.setupNewProjectDefault();
+
     myProjectSettingsControl = createProjectSettingsControl(projectSettings);
     mySystemSettingsControl = createSystemSettingsControl(systemSettings);
     myShowProjectFormatPanel = showProjectFormatPanel;