mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
sort languages in the Breadcrumbs settings by name instead of ID
This commit is contained in:
@@ -21,7 +21,6 @@ import com.intellij.lang.Language;
|
||||
import com.intellij.openapi.actionSystem.DataContext;
|
||||
import com.intellij.openapi.editor.ex.EditorSettingsExternalizable;
|
||||
import com.intellij.openapi.options.Configurable;
|
||||
import com.intellij.openapi.options.ConfigurationException;
|
||||
import com.intellij.openapi.options.colors.pages.GeneralColorsPage;
|
||||
import com.intellij.ui.breadcrumbs.BreadcrumbsProvider;
|
||||
import com.intellij.ui.components.labels.LinkLabel;
|
||||
@@ -36,18 +35,19 @@ import javax.swing.JLabel;
|
||||
import javax.swing.JPanel;
|
||||
import javax.swing.JRadioButton;
|
||||
import java.awt.GridLayout;
|
||||
import java.util.TreeMap;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import static com.intellij.application.options.colors.ColorAndFontOptions.selectOrEditColor;
|
||||
import static com.intellij.openapi.application.ApplicationBundle.message;
|
||||
import static com.intellij.openapi.util.text.StringUtil.naturalCompare;
|
||||
import static javax.swing.SwingConstants.LEFT;
|
||||
|
||||
/**
|
||||
* @author Sergey.Malenkov
|
||||
*/
|
||||
final class BreadcrumbsConfigurable implements Configurable {
|
||||
private final TreeMap<String, JCheckBox> map = new TreeMap<>();
|
||||
private final HashMap<String, JCheckBox> map = new HashMap<>();
|
||||
private JComponent component;
|
||||
private JCheckBox show;
|
||||
private JRadioButton above;
|
||||
@@ -77,7 +77,7 @@ final class BreadcrumbsConfigurable implements Configurable {
|
||||
}
|
||||
}
|
||||
JPanel boxes = new JPanel(new GridLayout(0, 3));
|
||||
for (JCheckBox box : map.values()) boxes.add(box);
|
||||
map.values().stream().sorted((box1, box2) -> naturalCompare(box1.getText(), box2.getText())).forEach(box -> boxes.add(box));
|
||||
|
||||
show = new JCheckBox(message("checkbox.show.breadcrumbs"));
|
||||
show.addItemListener(event -> updateEnabled());
|
||||
@@ -140,7 +140,7 @@ final class BreadcrumbsConfigurable implements Configurable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void apply() throws ConfigurationException {
|
||||
public void apply() {
|
||||
boolean modified = false;
|
||||
EditorSettingsExternalizable settings = EditorSettingsExternalizable.getInstance();
|
||||
if (settings.setBreadcrumbsAbove(isBreadcrumbsAbove())) modified = true;
|
||||
|
||||
Reference in New Issue
Block a user