MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] fix exception from compiler settings page

Browse Source 
^KTIJ-14274 Fixed

GitOrigin-RevId: d3f56db0ad4c70e5064eb2d8363c2c76936ac939
This commit is contained in:
Dmitry Gridin
2021-05-28 04:32:25 +00:00
committed by intellij-monorepo-bot
parent bb1573f0ab
commit 27db0b86bd
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
+6 -6
View File
@@ -15,7 +15,7 @@ import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.NlsContexts;
import com.intellij.openapi.util.NlsSafe;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.ui.CollectionComboBoxModel;
import com.intellij.ui.MutableCollectionComboBoxModel;
import com.intellij.ui.RawCommandLineEditor;
import com.intellij.ui.SimpleListCellRenderer;
import com.intellij.util.text.VersionComparatorUtil;
@@ -352,7 +352,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Di
version -> isLessOrEqual(version, upperBound) && !version.isUnsupported() ? new VersionView.Specific(version) : null
);
apiVersionComboBox.setModel(new CollectionComboBoxModel<>(permittedAPIVersions));
apiVersionComboBox.setModel(new MutableCollectionComboBoxModel<>(permittedAPIVersions));
apiVersionComboBox.setSelectedItem(
VersionComparatorUtil.compare(selectedAPIVersion.getVersionString(), upperBound.getVersionString()) <= 0
@@ -616,7 +616,7 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Di
private static void setSelectedItem(JComboBox<VersionView> comboBox, VersionView versionView) {
// Imported projects might have outdated language/api versions - we display them as well (see createVersionValidator() for details)
int index = ((DefaultComboBoxModel<VersionView>) comboBox.getModel()).getIndexOf(versionView);
int index = ((MutableCollectionComboBoxModel<VersionView>) comboBox.getModel()).getElementIndex(versionView);
if (index == -1) {
comboBox.addItem(versionView);
}
@@ -739,9 +739,9 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Di
}
private void createUIComponents() {
// Explicit use of DefaultComboBoxModel guarantees that setSelectedItem() can make safe cast.
languageVersionComboBox = new ComboBox<>(new DefaultComboBoxModel<>());
apiVersionComboBox = new ComboBox<>(new DefaultComboBoxModel<>());
// Explicit use of MutableCollectionComboBoxModel guarantees that setSelectedItem() can make safe cast.
languageVersionComboBox = new ComboBox<>(new MutableCollectionComboBoxModel<>());
apiVersionComboBox = new ComboBox<>(new MutableCollectionComboBoxModel<>());
createVersionValidator(languageVersionComboBox, "configuration.warning.text.language.version.unsupported");
createVersionValidator(apiVersionComboBox, "configuration.warning.text.api.version.unsupported");