experimental: set "allow automake while running app" to be always false

This commit is contained in:
Eugene Zhuravlev
2012-06-27 20:18:22 +02:00
parent 3ab3af0ba0
commit c3e8617698
3 changed files with 6 additions and 2 deletions
@@ -57,6 +57,7 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura
"<b>/</b> &mdash; path separator; <b>/**/</b> &mdash; any number of directories; " +
"<i>&lt;dir_name&gt;</i>:<i>&lt;pattern&gt;</i> &mdash; restrict to source roots with the specified name" +
"</html>");
myCbAllowAutomakeWhileRunningApplication.setVisible(false);
myCbUseCompileServer.addItemListener(new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
@@ -180,7 +181,7 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura
isModified |= ComparingUtils.isModified(myCbAutoShowFirstError, workspaceConfiguration.AUTO_SHOW_ERRORS_IN_EDITOR);
isModified |= ComparingUtils.isModified(myCbUseCompileServer, workspaceConfiguration.USE_COMPILE_SERVER);
isModified |= ComparingUtils.isModified(myCbMakeProjectOnSave, workspaceConfiguration.MAKE_PROJECT_ON_SAVE);
isModified |= ComparingUtils.isModified(myCbAllowAutomakeWhileRunningApplication, workspaceConfiguration.ALLOW_AUTOMAKE_WHILE_RUNNING_APPLICATION);
isModified |= ComparingUtils.isModified(myCbAllowAutomakeWhileRunningApplication, workspaceConfiguration.allowAutoMakeWhileRunningApplication());
final CompilerConfigurationImpl compilerConfiguration = (CompilerConfigurationImpl)CompilerConfiguration.getInstance(myProject);
isModified |= ComparingUtils.isModified(myCbAssertNotNull, compilerConfiguration.isAddNotNullAssertions());
@@ -294,7 +294,7 @@ public class BuildManager implements ApplicationComponent{
if (!config.useOutOfProcessBuild() || !config.MAKE_PROJECT_ON_SAVE) {
continue;
}
if (!config.ALLOW_AUTOMAKE_WHILE_RUNNING_APPLICATION) {
if (!config.allowAutoMakeWhileRunningApplication()) {
final RunContentManager contentManager = ExecutionManager.getInstance(project).getContentManager();
boolean hasRunningProcesses = false;
for (RunContentDescriptor descriptor : contentManager.getAllDescriptors()) {
@@ -58,4 +58,7 @@ public class CompilerWorkspaceConfiguration implements PersistentStateComponent<
public static boolean useServerlessOutOfProcessBuild() {
return true/*!Registry.is("compiler.out-of-process.as-server")*/;
}
public boolean allowAutoMakeWhileRunningApplication() {
return false;/*ALLOW_AUTOMAKE_WHILE_RUNNING_APPLICATION*/
}
}