From 79a75f22d6b1e9e3b4135f78644d77b2d0b0b057 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 30 Apr 2014 18:00:11 +0200
Subject: [PATCH] update language level without project reloading

---
 .../LanguageLevelConfigurable.java            |  4 +-
 .../roots/LanguageLevelModuleExtension.java   | 13 +----
 .../LanguageLevelProjectExtensionImpl.java    | 50 ++-----------------
 .../roots/LanguageLevelProjectExtension.java  |  2 +-
 .../CoreLanguageLevelProjectExtension.java    |  2 +-
 .../src/messages/ProjectBundle.properties     |  1 -
 6 files changed, 8 insertions(+), 64 deletions(-)

diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LanguageLevelConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LanguageLevelConfigurable.java
index 76366f4934b0..dfa56b220b4c 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LanguageLevelConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/LanguageLevelConfigurable.java
@@ -49,9 +49,7 @@ public abstract class LanguageLevelConfigurable implements UnnamedConfigurable {
     myPanel.add(new JLabel(ProjectBundle.message("module.module.language.level")),
                 new GridBagConstraints(0, 0, 1, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(12, 6, 12, 0), 0, 0));
     myPanel.add(myLanguageLevelCombo,
-                new GridBagConstraints(1, 0, 1, 1, 0, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(6, 6, 12, 0), 0, 0));
-    myPanel.add(new JLabel(ProjectBundle.message("module.module.language.level.comment")),
-                new GridBagConstraints(2, 0, 1, 1, 1, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(12, 6, 12, 0), 0, 0));
+                new GridBagConstraints(1, 0, 1, 1, 1, 0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(6, 6, 12, 0), 0, 0));
   }
 
   @Override
diff --git a/java/java-analysis-api/src/com/intellij/openapi/roots/LanguageLevelModuleExtension.java b/java/java-analysis-api/src/com/intellij/openapi/roots/LanguageLevelModuleExtension.java
index 5ede20d99350..76ab3643cb79 100644
--- a/java/java-analysis-api/src/com/intellij/openapi/roots/LanguageLevelModuleExtension.java
+++ b/java/java-analysis-api/src/com/intellij/openapi/roots/LanguageLevelModuleExtension.java
@@ -93,19 +93,8 @@ public class LanguageLevelModuleExtension extends ModuleExtension<LanguageLevelM
   @Override
   public void commit() {
     if (mySource != null && mySource.myLanguageLevel != myLanguageLevel) {
-      if (myModule.isLoaded()) { //do not reload project for non-committed modules: j2me|project imports
-        if (mySource.myLanguageLevel != myLanguageLevel) {
-          final LanguageLevelProjectExtension languageLevelProjectExtension =
-            LanguageLevelProjectExtension.getInstance(myModule.getProject());
-          final LanguageLevel projectLanguageLevel = languageLevelProjectExtension.getLanguageLevel();
-          final boolean explicit2ImplicitProjectLevel = myLanguageLevel == null && mySource.myLanguageLevel == projectLanguageLevel;
-          final boolean implicit2ExplicitProjectLevel = mySource.myLanguageLevel == null && myLanguageLevel == projectLanguageLevel;
-          if (!(explicit2ImplicitProjectLevel || implicit2ExplicitProjectLevel)) {
-            languageLevelProjectExtension.reloadProjectOnLanguageLevelChange(myLanguageLevel == null ? projectLanguageLevel : myLanguageLevel, true);
-          }
-        }
-      }
       mySource.myLanguageLevel = myLanguageLevel;
+      LanguageLevelProjectExtension.getInstance(myModule.getProject()).languageLevelsChanged();
     }
   }
 
diff --git a/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java b/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java
index 2d5729979b53..654b4d89845d 100644
--- a/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java
+++ b/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java
@@ -20,14 +20,9 @@
  */
 package com.intellij.openapi.roots.impl;
 
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ProjectBundle;
-import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.roots.LanguageLevelProjectExtension;
 import com.intellij.openapi.roots.ProjectExtension;
-import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.WriteExternalException;
 import com.intellij.pom.java.LanguageLevel;
@@ -42,10 +37,7 @@ public class LanguageLevelProjectExtensionImpl extends LanguageLevelProjectExten
   @NonNls private static final String JDK_15_ATTR = "jdk-15";
 
   private LanguageLevel myLanguageLevel = LanguageLevel.JDK_1_6;
-  private LanguageLevel myOriginalLanguageLevel = myLanguageLevel;
-
   private final Project myProject;
-  private volatile Runnable myReloadProjectRequest;
 
   public LanguageLevelProjectExtensionImpl(final Project project) {
     myProject = project;
@@ -59,7 +51,6 @@ public class LanguageLevelProjectExtensionImpl extends LanguageLevelProjectExten
     else {
       myLanguageLevel = LanguageLevel.valueOf(level);
     }
-    myOriginalLanguageLevel = myLanguageLevel;
   }
 
   private static LanguageLevel migrateFromIdea7(Element element) {
@@ -97,47 +88,14 @@ public class LanguageLevelProjectExtensionImpl extends LanguageLevelProjectExten
   @Override
   public void setLanguageLevel(@NotNull LanguageLevel languageLevel) {
     if (myLanguageLevel != languageLevel) {
-      reloadProjectOnLanguageLevelChange(languageLevel, false);
-    }
-    myLanguageLevel = languageLevel;
-
-    if (!willReload() && !myProject.isDefault() && DirectoryIndex.getInstance(myProject).isInitialized()) {
-      JavaLanguageLevelPusher.pushLanguageLevel(myProject);
+      myLanguageLevel = languageLevel;
+      languageLevelsChanged();
     }
   }
 
   @Override
-  public void reloadProjectOnLanguageLevelChange(@NotNull final LanguageLevel languageLevel, final boolean forceReload) {
-    if (willReload()) {
-      myReloadProjectRequest = new Runnable() {
-        @Override
-        public void run() {
-          if (myProject.isDisposed()) return;
-          if (myReloadProjectRequest != this) {
-            // obsolete, another request has already replaced this one
-            return;
-          }
-          if (!forceReload && myOriginalLanguageLevel.equals(getLanguageLevel())) {
-            // the question does not make sense now
-            return;
-          }
-          final String _message = ProjectBundle.message("project.language.level.reload.prompt", myProject.getName());
-          if (Messages.showYesNoDialog(myProject, _message, ProjectBundle.message("project.language.level.reload.title"), Messages.getQuestionIcon()) == Messages.YES) {
-            ProjectManager.getInstance().reloadProject(myProject);
-          }
-          myReloadProjectRequest = null;
-        }
-      };
-      ApplicationManager.getApplication().invokeLater(myReloadProjectRequest, ModalityState.NON_MODAL);
-    }
-    else {
-      // if the project is not open, reset the original level to the same value as mylanguageLevel has
-      myOriginalLanguageLevel = languageLevel;
-    }
-  }
-
-  private boolean willReload() {
-    return myProject.isOpen() && !ApplicationManager.getApplication().isUnitTestMode();
+  public void languageLevelsChanged() {
+    JavaLanguageLevelPusher.pushLanguageLevel(myProject);
   }
 
   public static class MyProjectExtension extends ProjectExtension {
diff --git a/java/java-psi-api/src/com/intellij/openapi/roots/LanguageLevelProjectExtension.java b/java/java-psi-api/src/com/intellij/openapi/roots/LanguageLevelProjectExtension.java
index 6509d3d1d674..45ad4e664adb 100644
--- a/java/java-psi-api/src/com/intellij/openapi/roots/LanguageLevelProjectExtension.java
+++ b/java/java-psi-api/src/com/intellij/openapi/roots/LanguageLevelProjectExtension.java
@@ -34,5 +34,5 @@ public abstract class LanguageLevelProjectExtension {
 
   public abstract void setLanguageLevel(@NotNull LanguageLevel languageLevel);
 
-  public abstract void reloadProjectOnLanguageLevelChange(@NotNull LanguageLevel languageLevel, boolean forceReload);
+  public abstract void languageLevelsChanged();
 }
diff --git a/java/java-psi-impl/src/com/intellij/core/CoreLanguageLevelProjectExtension.java b/java/java-psi-impl/src/com/intellij/core/CoreLanguageLevelProjectExtension.java
index 07f42cd5c1b8..6a231f0aeb65 100644
--- a/java/java-psi-impl/src/com/intellij/core/CoreLanguageLevelProjectExtension.java
+++ b/java/java-psi-impl/src/com/intellij/core/CoreLanguageLevelProjectExtension.java
@@ -37,6 +37,6 @@ public class CoreLanguageLevelProjectExtension extends LanguageLevelProjectExten
   }
 
   @Override
-  public void reloadProjectOnLanguageLevelChange(@NotNull LanguageLevel languageLevel, boolean forceReload) {
+  public void languageLevelsChanged() {
   }
 }
diff --git a/platform/projectModel-impl/src/messages/ProjectBundle.properties b/platform/projectModel-impl/src/messages/ProjectBundle.properties
index 4ae433016151..8b325c32304d 100644
--- a/platform/projectModel-impl/src/messages/ProjectBundle.properties
+++ b/platform/projectModel-impl/src/messages/ProjectBundle.properties
@@ -139,7 +139,6 @@ project.sdk.not.defined=Project SDK is not defined
 project.sdk.setup=Setup SDK
 
 module.module.language.level=&Language level:
-module.module.language.level.comment=(effective on project reload)
 module.circular.dependency.warning.short=There is circular dependency between modules {0}
 module.circular.dependency.warning.description=<html><b>There are circular dependencies between modules:</b> {0}</html>
 module.add.error.message=Error adding module to project: {0}