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

Assuming language is null in case of None (for PY-16049)

Browse Source
This commit is contained in:
Ilya.Kazakevich
2015-05-29 22:10:41 +03:00
parent 3acb451732
commit d6b3ff688f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/openapi/src/com/jetbrains/python/templateLanguages/TemplateLanguagePanel.java
+7 -3
View File
@@ -20,6 +20,7 @@ import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
import com.intellij.ui.components.JBLabel;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
@@ -47,8 +48,9 @@ public class TemplateLanguagePanel extends JPanel {
descriptor.setShowFileSystemRoots(true);
List<String> templateConfigurations = TemplatesService.getAllTemplateLanguages();
for (String configuration : templateConfigurations) {
if (!configuration.equals(TemplatesService.WEB2PY))
if (!configuration.equals(TemplatesService.WEB2PY)) {
myTemplateLanguage.addItem(configuration);
}
}
myTemplatesFolder.setText(DEFAULT_TEMPLATES_FOLDER);
myTemplatesFolder.addKeyListener(new KeyAdapter() {
@@ -56,8 +58,9 @@ public class TemplateLanguagePanel extends JPanel {
public void keyTyped(KeyEvent e) {
final int dot = myTemplatesFolder.getCaret().getDot();
final int index = myTemplatesFolder.getText().indexOf(File.separator);
if (index >= dot)
if (index >= dot) {
myTemplateFolderModified = true;
}
}
});
}
@@ -66,9 +69,10 @@ public class TemplateLanguagePanel extends JPanel {
return myTemplatesFolder.getText();
}
@Nullable
public String getTemplateLanguage() {
final Object selectedItem = myTemplateLanguage.getSelectedItem();
return selectedItem != null ? (String)selectedItem : null;
return selectedItem != null && !selectedItem.toString().equals(TemplatesService.NONE) ? (String)selectedItem : null;
}
public void setTemplateLanguage(String language) {