MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 15:06:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Java] Remove checkbox for old compilation in parallel boolean field

Browse Source 
IDEA-352162

GitOrigin-RevId: 16c75ec22f8aad23ec085e52b1940254624e2dbe
This commit is contained in:
Georgii Ustinov
2024-07-30 14:35:07 +03:00
committed by intellij-monorepo-bot
parent 79b9bf1b34
commit 2f99f21eef
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurableKt.kt
View File

@@ -40,7 +40,6 @@ class CompilerUIConfigurableKt(val project: Project) : DslConfigurableBase(), Se
private lateinit var cbDisplayNotificationPopup: JCheckBox
private lateinit var cbEnableAutomakeCell: Cell<JCheckBox>
private lateinit var cbEnableAutomake: JCheckBox
private lateinit var cbParallelCompilation: JCheckBox
private lateinit var comboboxJpsParallelCompilation: JComboBox<JpsParallelCompilationOption>
@@ -92,11 +91,6 @@ class CompilerUIConfigurableKt(val project: Project) : DslConfigurableBase(), Se
.comment(JavaCompilerBundle.message("only.works.while.not.running.debugging"))
cbEnableAutomake = cbEnableAutomakeCell.component
}
row {
cbParallelCompilation = checkBox(JavaCompilerBundle.message("settings.compile.independent.modules.in.parallel"))
.comment(JavaCompilerBundle.message("settings.parallel.module.compile.may.require.larger.heap.size"))
.component
}
row {
cbRebuildOnDependencyChange = checkBox(JavaCompilerBundle.message("settings.rebuild.module.on.dependency.change"))
.component
@@ -191,7 +185,7 @@ class CompilerUIConfigurableKt(val project: Project) : DslConfigurableBase(), Se
Setting.AUTO_SHOW_FIRST_ERROR_IN_EDITOR to listOf(cbAutoShowFirstError),
Setting.DISPLAY_NOTIFICATION_POPUP to listOf(cbDisplayNotificationPopup),
Setting.AUTO_MAKE to listOf(cbEnableAutomake),
Setting.PARALLEL_COMPILATION to listOf(cbParallelCompilation, comboboxJpsParallelCompilation),
Setting.PARALLEL_COMPILATION to listOf(comboboxJpsParallelCompilation),
Setting.REBUILD_MODULE_ON_DEPENDENCY_CHANGE to listOf(cbRebuildOnDependencyChange),
Setting.HEAP_SIZE to listOf(heapSizeField, sharedHeapSizeField),
Setting.COMPILER_VM_OPTIONS to listOf(vmOptionsField, sharedVMOptionsField),
@@ -221,9 +215,6 @@ class CompilerUIConfigurableKt(val project: Project) : DslConfigurableBase(), Se
if (!disabledSettings.contains(Setting.AUTO_MAKE)) {
workspaceConfiguration.MAKE_PROJECT_ON_SAVE = cbEnableAutomake.isSelected
}
if (!disabledSettings.contains(Setting.PARALLEL_COMPILATION) && configuration.isParallelCompilationEnabled != cbParallelCompilation.isSelected) {
configuration.isParallelCompilationEnabled = cbParallelCompilation.isSelected
}
if (!disabledSettings.contains(Setting.PARALLEL_COMPILATION)) {
workspaceConfiguration.JPS_PARALLEL_COMPILATION = comboboxJpsParallelCompilation.getItemAt(comboboxJpsParallelCompilation.selectedIndex)
}
@@ -267,7 +258,6 @@ class CompilerUIConfigurableKt(val project: Project) : DslConfigurableBase(), Se
cbClearOutputDirectory.setSelected(workspaceConfiguration.CLEAR_OUTPUT_DIRECTORY)
cbAssertNotNull.setSelected(configuration.isAddNotNullAssertions)
cbEnableAutomake.setSelected(workspaceConfiguration.MAKE_PROJECT_ON_SAVE)
cbParallelCompilation.setSelected(configuration.isParallelCompilationEnabled())
cbRebuildOnDependencyChange.setSelected(workspaceConfiguration.REBUILD_ON_DEPENDENCY_CHANGE)
comboboxJpsParallelCompilation.selectedItem = workspaceConfiguration.JPS_PARALLEL_COMPILATION
val heapSize = workspaceConfiguration.COMPILER_PROCESS_HEAP_SIZE
@@ -301,8 +291,6 @@ class CompilerUIConfigurableKt(val project: Project) : DslConfigurableBase(), Se
&& ComparingUtils.isModified(cbDisplayNotificationPopup, workspaceConfiguration.DISPLAY_NOTIFICATION_POPUP)
isModified = isModified || !disabledSettings.contains(Setting.AUTO_MAKE)
&& ComparingUtils.isModified(cbEnableAutomake, workspaceConfiguration.MAKE_PROJECT_ON_SAVE)
isModified = isModified || !disabledSettings.contains(Setting.PARALLEL_COMPILATION)
&& (ComparingUtils.isModified(cbParallelCompilation, configuration.isParallelCompilationEnabled()))
isModified = isModified || !disabledSettings.contains(Setting.PARALLEL_COMPILATION)
&& (comboboxJpsParallelCompilation.selectedItem != workspaceConfiguration.JPS_PARALLEL_COMPILATION)
isModified = isModified || !disabledSettings.contains(Setting.REBUILD_MODULE_ON_DEPENDENCY_CHANGE)

2
java/compiler/openapi/resources/messages/JavaCompilerBundle.properties
View File

@@ -129,7 +129,7 @@ settings.build.project.automatically=Build project automatically
settings.actions.on.save.page.build.project.on.save.checkbox=Build project
settings.actions.on.save.page.build.project.on.save.checkbox.comment=Not triggered while running/debugging
settings.actions.on.save.page.compiler.settings.link=Compiler settings...
settings.compile.independent.modules.in.parallel=Compile independent modules in parallel
settings.compile.independent.modules.in.parallel=Compile independent modules in parallel:
settings.compile.independent.modules.in.parallel.enabled = Enabled
settings.compile.independent.modules.in.parallel.automatic = Automatic
settings.compile.independent.modules.in.parallel.disabled = Disabled