azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Configuration: Fix behavior of "output directory" control

Browse Source 
#KT-17088 Fixed
This commit is contained in:
Alexey Sedunov
2017-03-27 15:56:27 +03:00
parent 72436c1738
commit 3f7b28d840
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.form
+1 -1
View File
@@ -74,7 +74,7 @@
<text value="lib"/> <text value="lib"/>
</properties> </properties>
</component> </component>
<component id="97317" class="com.intellij.util.ui.ThreeStateCheckBox" binding="copyRuntimeFilesCheckBox"> <component id="97317" class="com.intellij.util.ui.ThreeStateCheckBox" binding="copyRuntimeFilesCheckBox" custom-create="true">
<constraints> <constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/> <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints> </constraints>
idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
+13 -11
View File
@@ -56,8 +56,6 @@ import org.jetbrains.kotlin.idea.facet.KotlinFacet;
import org.jetbrains.kotlin.idea.util.application.ApplicationUtilsKt; import org.jetbrains.kotlin.idea.util.application.ApplicationUtilsKt;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.util.Arrays; import java.util.Arrays;
@@ -154,13 +152,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
"Choose Output Directory", "Choose Output Directory",
false); false);
copyRuntimeFilesCheckBox.addChangeListener(new ChangeListener() {
@Override
public void stateChanged(@NotNull ChangeEvent e) {
updateOutputDirEnabled();
}
});
fillModuleKindList(); fillModuleKindList();
fillJvmVersionList(); fillJvmVersionList();
fillLanguageAndAPIVersionList(); fillLanguageAndAPIVersionList();
@@ -299,7 +290,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
} }
private void updateOutputDirEnabled() { private void updateOutputDirEnabled() {
if (isEnabled) { if (isEnabled && copyRuntimeFilesCheckBox != null) {
outputDirectory.setEnabled(copyRuntimeFilesCheckBox.isSelected()); outputDirectory.setEnabled(copyRuntimeFilesCheckBox.isSelected());
labelForOutputDirectory.setEnabled(copyRuntimeFilesCheckBox.isSelected()); labelForOutputDirectory.setEnabled(copyRuntimeFilesCheckBox.isSelected());
} }
@@ -618,7 +609,6 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
public void setEnabled(boolean value) { public void setEnabled(boolean value) {
isEnabled = value; isEnabled = value;
UIUtil.setEnabled(getContentPane(), value, true); UIUtil.setEnabled(getContentPane(), value, true);
updateOutputDirEnabled();
} }
public CommonCompilerArguments getCommonCompilerArguments() { public CommonCompilerArguments getCommonCompilerArguments() {
@@ -652,4 +642,16 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
public void setCompilerSettings(CompilerSettings compilerSettings) { public void setCompilerSettings(CompilerSettings compilerSettings) {
this.compilerSettings = compilerSettings; this.compilerSettings = compilerSettings;
} }
private void createUIComponents() {
// Workaround: ThreeStateCheckBox doesn't send suitable notification on state change
// TODO: replace with PropertyChangerListener after fix is available in IDEA
copyRuntimeFilesCheckBox = new ThreeStateCheckBox() {
@Override
public void setState(State state) {
super.setState(state);
updateOutputDirEnabled();
}
};
}
} }