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

Cleanup: generify lists in FileTypeConfigurable, remove some dead code

Browse Source 
GitOrigin-RevId: 4c6c2805a3cf8ad7e95a4e9d80d34e38b72f9959
This commit is contained in:
Dmitry Jemerov
2019-05-29 21:10:44 +03:00
committed by intellij-monorepo-bot
parent 7a3addff97
commit 071a58da1d
1 changed files with 18 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java
+18 -40
View File
@@ -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<FileType> 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<FileType> 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<FileType> listModel = (DefaultListModel<FileType>)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<String> 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<String> getListModel() {
return (DefaultListModel<String>)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();
}
}