diff options
Diffstat (limited to 'java/compiler/impl/src/com/intellij/compiler')
-rw-r--r-- | java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java | 1 | ||||
-rw-r--r-- | java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java index 74ed9e1ae075..934f83db31ea 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java @@ -100,6 +100,7 @@ public class AnnotationProcessorsConfigurable implements SearchableConfigurable, } public void disposeUIResources() { + myMainPanel = null; } } diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java index 01da3bc62541..c40135db7c5f 100644 --- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java +++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java @@ -25,7 +25,6 @@ import com.intellij.execution.ExecutionManager; import com.intellij.execution.configurations.GeneralCommandLine; import com.intellij.execution.configurations.RunProfile; import com.intellij.execution.process.*; -import com.intellij.execution.ui.RunContentDescriptor; import com.intellij.ide.DataManager; import com.intellij.ide.PowerSaveMode; import com.intellij.ide.file.BatchFileChangeListener; @@ -101,8 +100,7 @@ import org.jetbrains.jps.cmdline.ClasspathBootstrap; import org.jetbrains.jps.incremental.Utils; import org.jetbrains.jps.model.serialization.JpsGlobalLoader; -import javax.tools.JavaCompiler; -import javax.tools.ToolProvider; +import javax.tools.*; import java.awt.*; import java.io.File; import java.io.IOException; @@ -516,9 +514,8 @@ public class BuildManager implements ApplicationComponent{ } private static boolean hasRunningProcess(Project project) { - for (RunContentDescriptor descriptor : ExecutionManager.getInstance(project).getContentManager().getAllDescriptors()) { - final ProcessHandler handler = descriptor.getProcessHandler(); - if (handler != null && !handler.isProcessTerminated() && !ALLOW_AUTOMAKE.get(handler, Boolean.FALSE)) { // active process + for (ProcessHandler handler : ExecutionManager.getInstance(project).getRunningProcesses()) { + if (!handler.isProcessTerminated() && !ALLOW_AUTOMAKE.get(handler, Boolean.FALSE)) { // active process return true; } } |