From 87624b560bebfe308e55d84b5571c4c0f1ae6ea6 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Mon, 18 Aug 2014 12:57:56 +0400 Subject: [PATCH 1/2] extracted constant for ColorAndFontOptions ID --- .../application/options/colors/ColorAndFontOptions.java | 4 +++- .../com/intellij/codeInspection/ex/SeverityEditorDialog.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java b/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java index 5e3017206132..ce2a00d3d671 100644 --- a/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java +++ b/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java @@ -81,6 +81,8 @@ import java.util.*; import java.util.List; public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract implements EditorOptionsProvider { + public static final String ID = "reference.settingsdialog.IDE.editor.colors"; + private HashMap mySchemes; private MyColorScheme mySelectedScheme; public static final String DIFF_GROUP = ApplicationBundle.message("title.diff"); @@ -999,7 +1001,7 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract @Override @NotNull public String getHelpTopic() { - return "reference.settingsdialog.IDE.editor.colors"; + return ID; } private static class MyColorScheme extends EditorColorsSchemeImpl { diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/SeverityEditorDialog.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/SeverityEditorDialog.java index a7bcd970660d..e239678af0ad 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/SeverityEditorDialog.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/SeverityEditorDialog.java @@ -233,7 +233,7 @@ public class SeverityEditorDialog extends DialogWrapper { final OptionsEditor optionsEditor = OptionsEditor.KEY.getData(dataContext); if (optionsEditor != null) { final ColorAndFontOptions colorAndFontOptions = - (ColorAndFontOptions)((ConfigurableWrapper)optionsEditor.findConfigurableById("reference.settingsdialog.IDE.editor.colors")).getConfigurable(); + (ColorAndFontOptions)((ConfigurableWrapper)optionsEditor.findConfigurableById(ColorAndFontOptions.ID)).getConfigurable(); assert colorAndFontOptions != null; final SearchableConfigurable javaPage = colorAndFontOptions.findSubConfigurable(InspectionColorSettingsPage.class); LOG.assertTrue(javaPage != null); From a45dc879b1d8fd6e07db6ee76d733a749640d3ca Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Mon, 18 Aug 2014 12:59:34 +0400 Subject: [PATCH 2/2] inspections ui: severities table cell not changes foreground on selection while editing fixed --- .../src/com/intellij/openapi/ui/ComboBoxTableRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-api/src/com/intellij/openapi/ui/ComboBoxTableRenderer.java b/platform/platform-api/src/com/intellij/openapi/ui/ComboBoxTableRenderer.java index c02f27af5d4b..f35d76fff51c 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/ComboBoxTableRenderer.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/ComboBoxTableRenderer.java @@ -117,7 +117,7 @@ public class ComboBoxTableRenderer extends JLabel implements TableCellRendere public Component getTableCellEditorComponent(JTable table, final Object value, boolean isSelected, final int row, final int column) { @SuppressWarnings("unchecked") final T t = (T)value; myValue = t; - customizeComponent(t, table, isSelected); + customizeComponent(t, table, true); //noinspection SSBasedInspection SwingUtilities.invokeLater(new Runnable() {