diff --git a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java index 76f6b53d856f..87ad709c249e 100644 --- a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java +++ b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java @@ -291,21 +291,6 @@ public class FileTypeConfigurable implements SearchableConfigurable, Configurabl return null; } - @Nullable - public FileType addNewPattern(FileType type, String pattern) { - FileNameMatcher matcher = FileTypeManager.parseFromString(pattern); - final FileType existing = findExistingFileType(matcher); - if (existing != null) { - return existing; - } - - myTempPatternsTable.addAssociation(matcher, type); - myPatterns.addPatternAndSelect(pattern); - IdeFocusManager.getGlobalInstance().doWhenFocusSettlesDown(() -> IdeFocusManager.getGlobalInstance().requestFocus(myPatterns.myPatternsList, true)); - - return null; - } - private void removePattern() { FileType type = myRecognizedFileType.getSelectedFileType(); if (type == null) return; @@ -323,19 +308,19 @@ public class FileTypeConfigurable implements SearchableConfigurable, Configurabl } public static class RecognizedFileTypes extends JPanel { - private final JList myFileTypesList; + private final JList myFileTypesList; private final MySpeedSearch mySpeedSearch; private FileTypeConfigurable myController; public RecognizedFileTypes() { super(new BorderLayout()); - myFileTypesList = new JBList(new DefaultListModel()); + myFileTypesList = new JBList<>(new DefaultListModel<>()); myFileTypesList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); myFileTypesList.setCellRenderer(new FileTypeRenderer(() -> { ArrayList result = new ArrayList<>(); for (int i = 0; i < myFileTypesList.getModel().getSize(); i++) { - result.add((FileType)myFileTypesList.getModel().getElementAt(i)); + result.add(myFileTypesList.getModel().getElementAt(i)); } return result; })); @@ -443,7 +428,7 @@ public class FileTypeConfigurable implements SearchableConfigurable, Configurabl } public FileType getSelectedFileType() { - return (FileType)myFileTypesList.getSelectedValue(); + return myFileTypesList.getSelectedValue(); } public JComponent getComponent() { @@ -451,7 +436,7 @@ public class FileTypeConfigurable implements SearchableConfigurable, Configurabl } public void setFileTypes(FileType[] types) { - DefaultListModel listModel = (DefaultListModel)myFileTypesList.getModel(); + DefaultListModel listModel = (DefaultListModel)myFileTypesList.getModel(); listModel.clear(); for (FileType type : types) { if (type != FileTypes.UNKNOWN) { @@ -472,12 +457,12 @@ public class FileTypeConfigurable implements SearchableConfigurable, Configurabl } public static class PatternsPanel extends JPanel { - private final JBList myPatternsList; + private final JBList myPatternsList; private FileTypeConfigurable myController; public PatternsPanel() { super(new BorderLayout()); - myPatternsList = new JBList(new DefaultListModel()); + myPatternsList = new JBList<>(new DefaultListModel<>()); myPatternsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); myPatternsList.setCellRenderer(new ExtensionRenderer()); myPatternsList.getEmptyText().setText(FileTypesBundle.message("filetype.settings.no.patterns")); @@ -502,8 +487,8 @@ public class FileTypeConfigurable implements SearchableConfigurable, Configurabl myPatternsList.clearSelection(); } - private DefaultListModel getListModel() { - return (DefaultListModel)myPatternsList.getModel(); + private DefaultListModel getListModel() { + return (DefaultListModel)myPatternsList.getModel(); } public void addPattern(String pattern) { @@ -514,37 +499,30 @@ public class FileTypeConfigurable implements SearchableConfigurable, Configurabl ScrollingUtil.ensureSelectionExists(myPatternsList); } - public void addPatternAndSelect(String pattern) { - addPattern(pattern); - ScrollingUtil.selectItem(myPatternsList, getListModel().getSize() - 1); - } - public void select(final String pattern) { for (int i = 0; i < myPatternsList.getItemsCount(); i++) { - final Object at = myPatternsList.getModel().getElementAt(i); - if (at instanceof String) { - final FileNameMatcher matcher = FileTypeManager.parseFromString((String)at); - if (matcher.acceptsCharSequence(pattern)) { - ScrollingUtil.selectItem(myPatternsList, i); - return; - } + final String at = myPatternsList.getModel().getElementAt(i); + final FileNameMatcher matcher = FileTypeManager.parseFromString(at); + if (matcher.acceptsCharSequence(pattern)) { + ScrollingUtil.selectItem(myPatternsList, i); + return; } } } public String removeSelected() { - Object selectedValue = myPatternsList.getSelectedValue(); + String selectedValue = myPatternsList.getSelectedValue(); if (selectedValue == null) return null; ListUtil.removeSelectedItems(myPatternsList); - return (String)selectedValue; + return selectedValue; } public String getDefaultExtension() { - return (String)getListModel().getElementAt(0); + return getListModel().getElementAt(0); } public String getSelectedItem() { - return (String)myPatternsList.getSelectedValue(); + return myPatternsList.getSelectedValue(); } }