Snapshot dc8d47d344cb8e7b04ed2af7a93fd95627f38ee0 from master branch of git://git.jetbrains.org/idea/community.git

Change-Id: I7d6b4a705cb79fae78d9e845acad2d50fa3f4402

2 files changed, 0 insertions, 51 deletions

diff --git a/java/idea-ui/src/com/intellij/ide/actions/ShowStructureSettingsAction.java b/java/idea-ui/src/com/intellij/ide/actions/ShowStructureSettingsAction.java
index cd4131363ddf..777105f840ba 100644
--- a/java/idea-ui/src/com/intellij/ide/actions/ShowStructureSettingsAction.java
+++ b/java/idea-ui/src/com/intellij/ide/actions/ShowStructureSettingsAction.java
@@ -15,20 +15,15 @@
  */
 package com.intellij.ide.actions;
 
-import com.intellij.facet.Facet;
-import com.intellij.facet.FacetManager;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
-import com.intellij.openapi.module.Module;
-import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.options.ShowSettingsUtil;
 import com.intellij.openapi.options.newEditor.OptionsEditorDialog;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.roots.ui.configuration.ProjectStructureConfigurable;
-import com.intellij.openapi.ui.Messages;
 
 public class ShowStructureSettingsAction extends AnAction implements DumbAware {
   public void actionPerformed(AnActionEvent e) {
@@ -37,37 +32,6 @@ public class ShowStructureSettingsAction extends AnAction implements DumbAware {
       project = ProjectManager.getInstance().getDefaultProject();
     }
 
-    // TEMPORARY HACK! DO NOT MERGE INTO INTELLIJ. This just works around a lot
-    // of confusion caused by the fact that the structure dialog lets you edit
-    // project state which is ignored by gradle, so temporarily disable this
-    // dialog for Android-Gradle-based projects.
-    if (isGradleProject(project)) {
-      showDisabledProjectStructureDialogMessage();
-    }
-
     ShowSettingsUtil.getInstance().editConfigurable(project, OptionsEditorDialog.DIMENSION_KEY, ProjectStructureConfigurable.getInstance(project));
   }
-
-  public static void showDisabledProjectStructureDialogMessage() {
-    Messages.showInfoMessage(
-      "We will provide a UI to configure project settings later. " +
-      "Until then, please manually edit your build.gradle file to " +
-      "configure source folders, libraries and dependencies.\n\n" +
-      "NOTE THAT EDITS MADE IN THE FOLLOWING DIALOG DO NOT AFFECT THE GRADLE BUILD.\n" +
-      "The dialog can be used for temporary adjustments to SDKs etc.",
-      "Project Structure");
-  }
-
-  public static boolean isGradleProject(Project project) {
-    ModuleManager moduleManager = ModuleManager.getInstance(project);
-    for (Module module : moduleManager.getModules()) {
-      FacetManager facetManager = FacetManager.getInstance(module);
-      for (Facet facet : facetManager.getAllFacets()) {
-        if ("android-gradle".equals(facet.getType().getStringId())) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
 }
\ No newline at end of file
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/IdeaProjectSettingsService.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/IdeaProjectSettingsService.java
index 612399ade011..e654eab22bcd 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/IdeaProjectSettingsService.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/IdeaProjectSettingsService.java
@@ -16,7 +16,6 @@
 package com.intellij.openapi.roots.ui.configuration;
 
 import com.intellij.compiler.actions.ArtifactAwareProjectSettingsService;
-import com.intellij.ide.actions.ShowStructureSettingsAction;
 import com.intellij.ide.projectView.impl.ModuleGroup;
 import com.intellij.ide.util.projectWizard.JdkChooserPanel;
 import com.intellij.openapi.module.Module;
@@ -66,7 +65,6 @@ public class IdeaProjectSettingsService extends ProjectSettingsService implement
 
   @Override
   public void openLibrary(@NotNull final Library library) {
-    warnIfGradleProject();
     final ProjectStructureConfigurable config = ProjectStructureConfigurable.getInstance(myProject);
     ShowSettingsUtil.getInstance().editConfigurable(myProject, config, new Runnable() {
       @Override
@@ -83,7 +81,6 @@ public class IdeaProjectSettingsService extends ProjectSettingsService implement
 
   @Override
   public void openModuleSettings(final Module module) {
-    warnIfGradleProject();
     ModulesConfigurator.showDialog(myProject, module.getName(), null);
   }
 
@@ -94,7 +91,6 @@ public class IdeaProjectSettingsService extends ProjectSettingsService implement
 
   @Override
   public void openModuleLibrarySettings(final Module module) {
-    warnIfGradleProject();
     ModulesConfigurator.showDialog(myProject, module.getName(), ClasspathEditor.NAME);
   }
 
@@ -105,7 +101,6 @@ public class IdeaProjectSettingsService extends ProjectSettingsService implement
 
   @Override
   public void openContentEntriesSettings(final Module module) {
-    warnIfGradleProject();
     ModulesConfigurator.showDialog(myProject, module.getName(), ContentEntriesEditor.NAME);
   }
 
@@ -116,7 +111,6 @@ public class IdeaProjectSettingsService extends ProjectSettingsService implement
 
   @Override
   public void openModuleDependenciesSettings(@NotNull final Module module, @Nullable final OrderEntry orderEntry) {
-    warnIfGradleProject();
     ShowSettingsUtil.getInstance().editConfigurable(myProject, ProjectStructureConfigurable.getInstance(myProject), new Runnable() {
       @Override
       public void run() {
@@ -132,7 +126,6 @@ public class IdeaProjectSettingsService extends ProjectSettingsService implement
 
   @Override
   public void openLibraryOrSdkSettings(@NotNull final OrderEntry orderEntry) {
-    warnIfGradleProject();
     final ProjectStructureConfigurable config = ProjectStructureConfigurable.getInstance(myProject);
     ShowSettingsUtil.getInstance().editConfigurable(myProject, config, new Runnable() {
       @Override
@@ -173,14 +166,6 @@ public class IdeaProjectSettingsService extends ProjectSettingsService implement
 
   @Override
   public void openArtifactSettings(@Nullable Artifact artifact) {
-    warnIfGradleProject();
     ModulesConfigurator.showArtifactSettings(myProject, artifact);
   }
-
-  // TEMPORARY HACK!! REMOVE ME ASAP!
-  private void warnIfGradleProject() {
-    if (ShowStructureSettingsAction.isGradleProject(myProject)) {
-      ShowStructureSettingsAction.showDisabledProjectStructureDialogMessage();
-    }
-  }
 }