diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/RunHotswapDialog.java b/java/debugger/impl/src/com/intellij/debugger/ui/RunHotswapDialog.java index 9f7f8b47202c..7172f4f0bf6a 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/RunHotswapDialog.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/RunHotswapDialog.java @@ -105,7 +105,7 @@ public class RunHotswapDialog extends OptionsDialog { JLabel label = new JLabel(DebuggerBundle.message("hotswap.dialog.run.prompt")); JPanel panel = new JPanel(new BorderLayout()); panel.add(label, BorderLayout.CENTER); - Icon icon = UIUtil.getOptionPanelQuestionIcon(); + Icon icon = UIUtil.getQuestionIcon(); if (icon != null) { label.setIcon(icon); label.setIconTextGap(7); diff --git a/java/execution/openapi/src/com/intellij/execution/filters/ExceptionFilter.java b/java/execution/openapi/src/com/intellij/execution/filters/ExceptionFilter.java index 766a6bd8e9f0..157402578f4b 100644 --- a/java/execution/openapi/src/com/intellij/execution/filters/ExceptionFilter.java +++ b/java/execution/openapi/src/com/intellij/execution/filters/ExceptionFilter.java @@ -129,7 +129,7 @@ public class ExceptionFilter implements Filter, DumbAware { final OpenFileHyperlinkInfo linkInfo = new OpenFileHyperlinkInfo(myProject, virtualFile, lineNumber - 1); TextAttributes attributes = HYPERLINK_ATTRIBUTES.clone(); if (!ProjectRootManager.getInstance(myProject).getFileIndex().isInContent(virtualFile)) { - Color color = UIUtil.getTextInactiveTextColor(); + Color color = UIUtil.getInactiveTextColor(); attributes.setForegroundColor(color); attributes.setEffectColor(color); } diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/AbstractStepWithProgress.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/AbstractStepWithProgress.java index fe882f9c49d5..dfe7601da4f9 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/AbstractStepWithProgress.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/AbstractStepWithProgress.java @@ -75,7 +75,7 @@ public abstract class AbstractStepWithProgress extends ModuleWizardStep private JPanel createProgressPanel() { final JPanel progressPanel = new JPanel(new GridBagLayout()); myTitleLabel = new JLabel(); - myTitleLabel.setFont(UIManager.getFont("Label.font").deriveFont(Font.BOLD)); + myTitleLabel.setFont(UIUtil.getLabelFont().deriveFont(Font.BOLD)); progressPanel.add(myTitleLabel, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(8, 10, 5, 10), 0, 0)); myProgressLabel = new JLabel(); diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/NameLocationStep.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/NameLocationStep.java index a653e128a42e..3fd71a17784c 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/NameLocationStep.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/NameLocationStep.java @@ -81,7 +81,6 @@ public class NameLocationStep extends ModuleWizardStep { myPanel.add(myNamePathComponent, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(8, 10, 0, 10), 0, 0)); final JLabel label = new JLabel(IdeBundle.message("label.module.file.will.be.saved.in")); - //label.setFont(UIManager.getFont("Label.font").deriveFont(Font.BOLD)); myPanel.add(label, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1.0, 1.0, GridBagConstraints.SOUTHWEST, GridBagConstraints.HORIZONTAL, new Insets(30, 10, 0, 10), 0, 0)); myTfModuleFilePath = new JTextField(); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationErrorsComponent.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationErrorsComponent.java index c2f17a08ec6c..341ca35c2761 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationErrorsComponent.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationErrorsComponent.java @@ -524,8 +524,9 @@ public class ConfigurationErrorsComponent extends JPanel implements Disposable, if (myModel.getSize() == 0) { setBorder(null); } else { - if (getBorder() == null) setBorder(BorderFactory.createCompoundBorder(BorderFactory.createMatteBorder(5, 0, 5, 0, UIUtil.getPanelBackground()), - BorderFactory.createLineBorder(UIUtil.getPanelBackgound().darker()))); + if (getBorder() == null) setBorder( + BorderFactory.createCompoundBorder(BorderFactory.createMatteBorder(5, 0, 5, 0, UIUtil.getPanelBackground()), + BorderFactory.createLineBorder(UIUtil.getPanelBackground().darker()))); } final List errors = myModel.getErrors(); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseStructureConfigurable.java index 91f15189e5d4..eb3973368615 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseStructureConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/BaseStructureConfigurable.java @@ -193,7 +193,7 @@ public abstract class BaseStructureConfigurable extends MasterDetailsComponent i final boolean invalid = level != null; if (unused || invalid) { Color fg = unused - ? UIUtil.getTextInactiveTextColor() + ? UIUtil.getInactiveTextColor() : selected && hasFocus ? UIUtil.getTreeSelectionForeground() : UIUtil.getTreeForeground(); textAttributes = new SimpleTextAttributes(invalid ? SimpleTextAttributes.STYLE_WAVED : SimpleTextAttributes.STYLE_PLAIN, fg, level == ProjectStructureProblemDescription.Severity.ERROR ? Color.RED : Color.GRAY); diff --git a/java/java-impl/src/com/intellij/refactoring/ui/InfoDialog.java b/java/java-impl/src/com/intellij/refactoring/ui/InfoDialog.java index e553bef0747f..c20ade157515 100644 --- a/java/java-impl/src/com/intellij/refactoring/ui/InfoDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/ui/InfoDialog.java @@ -65,7 +65,7 @@ public class InfoDialog extends DialogWrapper{ myTextArea = new JTextArea(myText); textPanel.add(myTextArea, BorderLayout.CENTER); myTextArea.setEditable(false); - myTextArea.setBackground(UIUtil.getPanelBackgound()); + myTextArea.setBackground(UIUtil.getPanelBackground()); Font font = myShowInFutureCheckBox.getFont(); font = new Font(font.getName(), font.getStyle(), font.getSize() + 1); myTextArea.setFont(font); diff --git a/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java b/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java index e05741cc339c..7b34748412d9 100644 --- a/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java +++ b/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java @@ -27,6 +27,7 @@ import com.intellij.openapi.util.Ref; import com.intellij.util.Alarm; import com.intellij.util.Function; import com.intellij.util.ui.EmptyIcon; +import com.intellij.util.ui.UIUtil; import javax.swing.*; import javax.swing.plaf.TreeUI; @@ -139,7 +140,7 @@ public class DeferredIconImpl implements DeferredIcon { final TreeUI ui = ((JTree)actualTarget).getUI(); if (ui instanceof BasicTreeUI) { // this call is "fake" and only need to reset tree layout cache - ((BasicTreeUI)ui).setLeftChildIndent(((Integer)UIManager.get("Tree.leftChildIndent")).intValue()); + ((BasicTreeUI)ui).setLeftChildIndent(UIUtil.getTreeLeftChildIndent()); } } } diff --git a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorSettingsTable.java b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorSettingsTable.java index 716220bbba38..66ae80271e0a 100644 --- a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorSettingsTable.java +++ b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorSettingsTable.java @@ -19,6 +19,7 @@ package com.intellij.ui.tabs; import com.intellij.ui.FileColorManager; import com.intellij.util.ui.EmptyIcon; import com.intellij.openapi.ui.StripeTable; +import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -243,7 +244,7 @@ public abstract class FileColorSettingsTable extends StripeTable { setBackground(isSelected ? table.getSelectionBackground() : table.getBackground()); setForeground(isSelected ? table.getSelectionForeground() : table.getForeground()); - setBorder(hasFocus ? (UIManager.getBorder("Table.focusCellHighlightBorder")) + setBorder(hasFocus ? UIUtil.getTableFocusCellHighlightBorder() : NO_FOCUS_BORDER); } } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DescriptionLabel.java b/platform/platform-api/src/com/intellij/openapi/ui/DescriptionLabel.java index 55c0e6e9e902..8bd8f5fe2fa7 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/DescriptionLabel.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/DescriptionLabel.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.ui; +import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -28,7 +29,7 @@ public class DescriptionLabel extends JLabel { @Override public void updateUI() { super.updateUI(); - setForeground(UIManager.getColor("Panel.background").darker()); + setForeground(UIUtil.getPanelBackground().darker()); int size = getFont().getSize(); if (size >= 12) { size -= 2; diff --git a/platform/platform-api/src/com/intellij/openapi/ui/FixedComboBoxEditor.java b/platform/platform-api/src/com/intellij/openapi/ui/FixedComboBoxEditor.java index c9c1592fa1ae..47a77cddeaeb 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/FixedComboBoxEditor.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/FixedComboBoxEditor.java @@ -308,7 +308,7 @@ public class FixedComboBoxEditor implements ComboBoxEditor { g.setColor(bottomColor); g.drawLine(x + 4, y + height - 4, x + width - 2, y + height - 4); - g.setColor(UIManager.getColor("Panel.background")); + g.setColor(UIUtil.getPanelBackground()); g.fillRect(x, y, width, 3); g.fillRect(x, y, 3, height); diff --git a/platform/platform-api/src/com/intellij/openapi/ui/LoadingDecorator.java b/platform/platform-api/src/com/intellij/openapi/ui/LoadingDecorator.java index c5d9f288ed25..a4012a2abedb 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/LoadingDecorator.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/LoadingDecorator.java @@ -173,7 +173,7 @@ public class LoadingDecorator { final Graphics2D g = mySnapshot.createGraphics(); myPane.paint(g); final Component opaque = UIUtil.findNearestOpaque(this); - mySnapshotBg = opaque != null ? opaque.getBackground() : UIUtil.getPanelBackgound(); + mySnapshotBg = opaque != null ? opaque.getBackground() : UIUtil.getPanelBackground(); g.dispose(); } myProgress.resume(); diff --git a/platform/platform-api/src/com/intellij/openapi/ui/TreeComboBox.java b/platform/platform-api/src/com/intellij/openapi/ui/TreeComboBox.java index 37251ec23a74..c52d8450478d 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/TreeComboBox.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/TreeComboBox.java @@ -34,7 +34,7 @@ import java.util.Enumeration; * User: spLeaner */ public class TreeComboBox extends JComboBox { - final static int INDENT = UIManager.getInt("Tree.leftChildIndent"); + final static int INDENT = UIUtil.getTreeLeftChildIndent(); private TreeModel myTreeModel; public TreeComboBox(@NotNull final TreeModel model) { diff --git a/platform/platform-api/src/com/intellij/openapi/wm/StatusBarWidget.java b/platform/platform-api/src/com/intellij/openapi/wm/StatusBarWidget.java index 4a8528808d5c..35dce9cd2115 100644 --- a/platform/platform-api/src/com/intellij/openapi/wm/StatusBarWidget.java +++ b/platform/platform-api/src/com/intellij/openapi/wm/StatusBarWidget.java @@ -91,7 +91,7 @@ public interface StatusBarWidget extends Disposable { private static final Color PIXEL = LEFT1_FROM_INACTIVE; private static final Color LEFT1_TO_INACTIVE = new Color(180, 180, 180); - private static final Color SEPARATOR_COLOR = UIUtil.getPanelBackgound().darker(); + private static final Color SEPARATOR_COLOR = UIUtil.getPanelBackground().darker(); public void paintBorder(final Component c, final Graphics g, final int x, final int y, final int width, final int height) { final Graphics2D g2 = (Graphics2D)g.create(); diff --git a/platform/platform-api/src/com/intellij/ui/ColorPanel.java b/platform/platform-api/src/com/intellij/ui/ColorPanel.java index e831071af22c..b2e378f6681c 100644 --- a/platform/platform-api/src/com/intellij/ui/ColorPanel.java +++ b/platform/platform-api/src/com/intellij/ui/ColorPanel.java @@ -15,18 +15,16 @@ */ package com.intellij.ui; +import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; import javax.swing.*; -import javax.swing.border.Border; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import com.intellij.util.ui.UIUtil; - public class ColorPanel extends JPanel { public static final Color[] fixedColors; public static final Color DARK_MAGENTA = new Color(128, 0, 128); @@ -35,7 +33,7 @@ public class ColorPanel extends JPanel { public static final Color BLUE_GREEN = new Color(0, 128, 128); public static final Color DARK_YELLOW = new Color(128, 128, 0); public static final Color DARK_RED = new Color(128, 0, 0); - public static final Color DISABLED_COLOR = UIUtil.getPanelBackgound(); + public static final Color DISABLED_COLOR = UIUtil.getPanelBackground(); private static Color[] myCustomColors; @NonNls private String myActionCommand = "colorPanelChanged"; private boolean isFiringEvent = false; diff --git a/platform/platform-api/src/com/intellij/ui/GuiUtils.java b/platform/platform-api/src/com/intellij/ui/GuiUtils.java index 96f767ef02a1..f93831c2c605 100644 --- a/platform/platform-api/src/com/intellij/ui/GuiUtils.java +++ b/platform/platform-api/src/com/intellij/ui/GuiUtils.java @@ -318,12 +318,12 @@ public class GuiUtils { if (component instanceof JPanel) { final Border border = ((JPanel)component).getBorder(); if (border instanceof TitledBorder) { - Color color = enabled ? component.getForeground() : UIUtil.getTextInactiveTextColor(); + Color color = enabled ? component.getForeground() : UIUtil.getInactiveTextColor(); ((TitledBorder)border).setTitleColor(color); } } else if (component instanceof JLabel) { - Color color = UIUtil.getTextInactiveTextColor(); + Color color = UIUtil.getInactiveTextColor(); if (color == null) color = component.getForeground(); @NonNls String changeColorString = ""; final JLabel label = (JLabel)component; diff --git a/platform/platform-api/src/com/intellij/ui/SeparatorWithText.java b/platform/platform-api/src/com/intellij/ui/SeparatorWithText.java index 5fa975b44510..763c2ff99a10 100644 --- a/platform/platform-api/src/com/intellij/ui/SeparatorWithText.java +++ b/platform/platform-api/src/com/intellij/ui/SeparatorWithText.java @@ -15,6 +15,7 @@ */ package com.intellij.ui; +import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; import javax.swing.*; @@ -30,8 +31,7 @@ public class SeparatorWithText extends JComponent { public SeparatorWithText() { setBorder(BorderFactory.createEmptyBorder(VGAP, 0, VGAP, 0)); - @NonNls final String labelFont = "Label.font"; - setFont(UIManager.getFont(labelFont)); + setFont(UIUtil.getLabelFont()); setFont(getFont().deriveFont(Font.BOLD)); } diff --git a/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java b/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java index 6b2ffa474ebc..aff4263398ee 100644 --- a/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java +++ b/platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java @@ -278,7 +278,7 @@ public class SimpleColoredComponent extends JComponent implements Accessible { Font font = getFont(); if (font == null) { - font = UIManager.getFont("Label.font"); + font = UIUtil.getLabelFont(); } LOG.assertTrue(font != null); @@ -429,7 +429,7 @@ public class SimpleColoredComponent extends JComponent implements Accessible { color = getForeground(); } if (!isEnabled()) { - color = UIUtil.getTextInactiveTextColor(); + color = UIUtil.getInactiveTextColor(); } g.setColor(color); diff --git a/platform/platform-api/src/com/intellij/ui/SimpleTextAttributes.java b/platform/platform-api/src/com/intellij/ui/SimpleTextAttributes.java index b0c8596518ae..aa526016e1c2 100644 --- a/platform/platform-api/src/com/intellij/ui/SimpleTextAttributes.java +++ b/platform/platform-api/src/com/intellij/ui/SimpleTextAttributes.java @@ -45,8 +45,8 @@ public final class SimpleTextAttributes { public static final SimpleTextAttributes REGULAR_ITALIC_ATTRIBUTES = new SimpleTextAttributes(STYLE_ITALIC, null); public static final SimpleTextAttributes ERROR_ATTRIBUTES = new SimpleTextAttributes(STYLE_PLAIN, Color.red); - public static final SimpleTextAttributes GRAYED_ATTRIBUTES = new SimpleTextAttributes(STYLE_PLAIN, UIUtil.getTextInactiveTextColor()); - public static final SimpleTextAttributes GRAYED_BOLD_ATTRIBUTES = new SimpleTextAttributes(STYLE_BOLD, UIUtil.getTextInactiveTextColor()); + public static final SimpleTextAttributes GRAYED_ATTRIBUTES = new SimpleTextAttributes(STYLE_PLAIN, UIUtil.getInactiveTextColor()); + public static final SimpleTextAttributes GRAYED_BOLD_ATTRIBUTES = new SimpleTextAttributes(STYLE_BOLD, UIUtil.getInactiveTextColor()); public static final SimpleTextAttributes SYNTHETIC_ATTRIBUTES = new SimpleTextAttributes(STYLE_PLAIN, Color.BLUE); public static final SimpleTextAttributes GRAY_ATTRIBUTES = new SimpleTextAttributes(STYLE_PLAIN, Color.GRAY); diff --git a/platform/platform-api/src/com/intellij/ui/UI.java b/platform/platform-api/src/com/intellij/ui/UI.java index 899ea86b9069..5c73cfaef3bd 100644 --- a/platform/platform-api/src/com/intellij/ui/UI.java +++ b/platform/platform-api/src/com/intellij/ui/UI.java @@ -62,7 +62,7 @@ public class UI { ourColors.put("tooltip.error", Color.red); ourColors.put("tooltip.warning", Color.yellow.darker()); - ourColors.put("toolbar.background", UIUtil.getPanelBackgound()); + ourColors.put("toolbar.background", UIUtil.getPanelBackground()); ourColors.put("toolbar.hover.background", UIUtil.getTreeSelectionBackground()); ourColors.put("toolbar.selected.background", getColor("panel.custom.background")); ourColors.put("toolbar.hover.frame.foreground", UIUtil.getTreeSelectionBackground().darker()); diff --git a/platform/platform-api/src/com/intellij/ui/components/panels/ValidatingComponent.java b/platform/platform-api/src/com/intellij/ui/components/panels/ValidatingComponent.java index 2b66b1bd0e41..33ba62c1dc6f 100644 --- a/platform/platform-api/src/com/intellij/ui/components/panels/ValidatingComponent.java +++ b/platform/platform-api/src/com/intellij/ui/components/panels/ValidatingComponent.java @@ -15,6 +15,8 @@ */ package com.intellij.ui.components.panels; +import com.intellij.util.ui.UIUtil; + import javax.swing.*; import java.awt.*; @@ -24,7 +26,7 @@ import java.awt.*; * A label with possible error text is placed under validated component. */ public abstract class ValidatingComponent extends NonOpaquePanel { - private static final Font ERROR_FONT = UIManager.getFont("Label.font").deriveFont(Font.PLAIN, 10f); + private static final Font ERROR_FONT = UIUtil.getLabelFont().deriveFont(Font.PLAIN, 10f); private JLabel myErrorLabel; private T myMainComponent; diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java index 39f1cec6b902..7386a462f722 100644 --- a/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java +++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/JBTabsImpl.java @@ -1502,8 +1502,8 @@ public class JBTabsImpl extends JComponent if (isPaintFocus()) { if (bgColor == null) { alpha = 150; - shapeInfo.from = UIUtil.toAlpha(UIUtil.getPanelBackgound().brighter(), alpha); - shapeInfo.to = UIUtil.toAlpha(UIUtil.getPanelBackgound(), alpha); + shapeInfo.from = UIUtil.toAlpha(UIUtil.getPanelBackground().brighter(), alpha); + shapeInfo.to = UIUtil.toAlpha(UIUtil.getPanelBackground(), alpha); } else { alpha = 255; diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleTree.java b/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleTree.java index e93d41446a57..e468d675dc50 100644 --- a/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleTree.java +++ b/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleTree.java @@ -25,6 +25,7 @@ import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.util.SystemInfo; import com.intellij.ui.TreeUIHelper; import com.intellij.util.ui.EmptyIcon; +import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.tree.TreeUtil; import org.jetbrains.annotations.Nullable; @@ -95,7 +96,7 @@ public class SimpleTree extends Tree implements CellEditorListener { } }); - putClientProperty("JTree.lineStyle", "Angled"); + UIUtil.setLineStyleAngled(this); if (SystemInfo.isWindowsXP) { setUI(new BasicTreeUI()); // In WindowsXP UI handles are not shown :( } @@ -584,7 +585,7 @@ public class SimpleTree extends Tree implements CellEditorListener { public Icon getExpandedHandle() { if (myExpandedHandle == null) { - myExpandedHandle = UIManager.getIcon("Tree.expandedIcon"); + myExpandedHandle = UIUtil.getTreeExpandedIcon(); } return myExpandedHandle; @@ -592,7 +593,7 @@ public class SimpleTree extends Tree implements CellEditorListener { public Icon getCollapsedHandle() { if (myCollapsedHandle == null) { - myCollapsedHandle = UIManager.getIcon("Tree.collapsedIcon"); + myCollapsedHandle = UIUtil.getTreeCollapsedIcon(); } return myCollapsedHandle; diff --git a/platform/platform-api/src/com/intellij/util/ui/AnimatedIcon.java b/platform/platform-api/src/com/intellij/util/ui/AnimatedIcon.java index 833fde1174ba..d23a8677248f 100644 --- a/platform/platform-api/src/com/intellij/util/ui/AnimatedIcon.java +++ b/platform/platform-api/src/com/intellij/util/ui/AnimatedIcon.java @@ -156,7 +156,7 @@ public abstract class AnimatedIcon extends JComponent implements Disposable { if (parent instanceof JComponent) { opaque = (JComponent)UIUtil.findNearestOpaque((JComponent)parent); } - Color bg = opaque != null ? opaque.getBackground() : UIManager.getColor("Panel.background"); + Color bg = opaque != null ? opaque.getBackground() : UIUtil.getPanelBackground(); g.setColor(bg); g.fillRect(0, 0, getWidth(), getHeight()); } diff --git a/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java b/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java index 7708b63ba33b..815c3a125f78 100644 --- a/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java +++ b/platform/platform-impl/src/com/intellij/ide/IdeTooltipManager.java @@ -32,9 +32,7 @@ import com.intellij.ui.HintHint; import com.intellij.ui.awt.RelativePoint; import com.intellij.util.Alarm; import com.intellij.util.IJSwingUtilities; -import com.intellij.util.containers.ComparatorUtil; import com.intellij.util.ui.UIUtil; -import com.intellij.util.ui.update.ComparableObjectCheck; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -284,7 +282,7 @@ public class IdeTooltipManager implements ApplicationComponent, AWTEventListener public Color getTextForeground(boolean awtTooltip) { - return useGraphite(awtTooltip) ? Color.white : UIManager.getColor("ToolTip.foreground"); + return useGraphite(awtTooltip) ? Color.white : UIUtil.getToolTipForeground(); } public Color getLinkForeground(boolean awtTooltip) { @@ -292,7 +290,7 @@ public class IdeTooltipManager implements ApplicationComponent, AWTEventListener } public Color getTextBackground(boolean awtTooltip) { - return useGraphite(awtTooltip) ? new Color(100, 100, 100, 230) : UIManager.getColor("ToolTip.background"); + return useGraphite(awtTooltip) ? new Color(100, 100, 100, 230) : UIUtil.getToolTipBackground(); } public String getUlImg(boolean awtTooltip) { diff --git a/platform/platform-impl/src/com/intellij/ide/dnd/Highlighters.java b/platform/platform-impl/src/com/intellij/ide/dnd/Highlighters.java index a7860bc205a1..e53bac7a5f2b 100644 --- a/platform/platform-impl/src/com/intellij/ide/dnd/Highlighters.java +++ b/platform/platform-impl/src/com/intellij/ide/dnd/Highlighters.java @@ -17,6 +17,7 @@ package com.intellij.ide.dnd; import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.SystemInfo; +import com.intellij.util.ui.UIUtil; import javax.accessibility.Accessible; import javax.swing.*; @@ -137,7 +138,7 @@ public class Highlighters implements DnDEvent.DropTargetHighlightingType { } }; myLabel.setFont(myLabel.getFont().deriveFont(Font.BOLD)); - myLabel.setForeground(UIManager.getColor("ToolTip.foreground")); + myLabel.setForeground(UIUtil.getToolTipForeground()); setFocusable(false); @@ -179,10 +180,10 @@ public class Highlighters implements DnDEvent.DropTargetHighlightingType { Object old = g2d.getRenderingHint(RenderingHints.KEY_ANTIALIASING); g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g.setColor(UIManager.getColor("ToolTip.background")); + g.setColor(UIUtil.getToolTipBackground()); g.fillRoundRect(0, 0, getSize().width - 1, getSize().height - 1, 6, 6); - g.setColor(UIManager.getColor("ToolTip.foreground")); + g.setColor(UIUtil.getToolTipForeground()); g.drawRoundRect(0, 0, getSize().width - 1, getSize().height - 1, 6, 6); g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, old); } diff --git a/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java index 2b3e1a629f13..6772bb9a34b7 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java @@ -601,15 +601,6 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo initIdeaDefaults(table); } - protected void initSystemColorDefaults(UIDefaults table) { - super.initSystemColorDefaults(table); - /* - table.put("control", new ColorUIResource(236, 233, 216)); - table.put("controlHighlight", new ColorUIResource(255, 255, 255)); - table.put("controlShadow", new ColorUIResource(172, 167, 153)); - */ - } - @SuppressWarnings({"HardCodedStringLiteral"}) private static void initIdeaDefaults(UIDefaults defaults) { defaults.put("Menu.maxGutterIconWidth", 18); diff --git a/platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsListPanel.java b/platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsListPanel.java index 137c858b14d0..dab6e4eab014 100644 --- a/platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsListPanel.java +++ b/platform/platform-impl/src/com/intellij/notification/impl/ui/NotificationsListPanel.java @@ -379,7 +379,7 @@ public class NotificationsListPanel extends JPanel implements NotificationModelL } }); - setBackground(UIUtil.getPanelBackgound()); + setBackground(UIUtil.getPanelBackground()); addMouseMotionListener(new MouseMotionListener() { public void mouseMoved(MouseEvent e) { @@ -657,7 +657,7 @@ public class NotificationsListPanel extends JPanel implements NotificationModelL scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED); scrollPane.setBorder(null); - scrollPane.getViewport().setBackground(UIUtil.getPanelBackgound()); + scrollPane.getViewport().setBackground(UIUtil.getPanelBackground()); final JComponent buttonBar = buildFilterBar(list, project); model.addListDataListener(new ListDataListener() { diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButtonWithText.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButtonWithText.java index e693bc68991c..ffa6f65acb06 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButtonWithText.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButtonWithText.java @@ -56,7 +56,7 @@ public class ActionButtonWithText extends ActionButton { final int textHeight = fontMetrics.getMaxAscent() + fontMetrics.getMaxDescent(); UIUtil.applyRenderingHints(g); - g.setColor(isButtonEnabled() ? UIUtil.getLabelForeground() : UIUtil.getTextInactiveTextColor()); + g.setColor(isButtonEnabled() ? UIUtil.getLabelForeground() : UIUtil.getInactiveTextColor()); final int iconTextDifference = (int)Math.ceil((icon.getIconHeight() - textHeight) / 2); final int textStartX = x + icon.getIconWidth() + ICON_TEXT_SPACE; g.drawString(text, textStartX, y + iconTextDifference + fontMetrics.getMaxAscent()); diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffStatusBar.java b/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffStatusBar.java index 48e30c96b41b..6ad8c09a138d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffStatusBar.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffStatusBar.java @@ -59,7 +59,7 @@ public class DiffStatusBar extends JPanel { private void addComponent(final LegendTypeDescriptor diffType) { JComponent component = new JPanel() { public void paint(Graphics g) { - setBackground(UIUtil.getPanelBackgound()); + setBackground(UIUtil.getPanelBackground()); super.paint(g); FontMetrics metrics = getFontMetrics(getFont()); diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java index 81631b536deb..bc572d63d572 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java @@ -79,7 +79,7 @@ class MouseShortcutDialog extends DialogWrapper{ myTarConflicts=new JTextArea(); myTarConflicts.setFocusable(false); myTarConflicts.setEditable(false); - myTarConflicts.setBackground(UIUtil.getPanelBackgound()); + myTarConflicts.setBackground(UIUtil.getPanelBackground()); myTarConflicts.setLineWrap(true); myTarConflicts.setWrapStyleWord(true); diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.java index 2860a1a094ca..1ab3b908604a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.java @@ -330,7 +330,7 @@ public class QuickListPanel { setForeground(getSelectionForeground(tree)); } else { - Color foreground = used ? UIUtil.getTextInactiveTextColor() :UIUtil.getTreeForeground(); + Color foreground = used ? UIUtil.getInactiveTextColor() :UIUtil.getTreeForeground(); setForeground(foreground); } } diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsTree.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsTree.java index 5b015306d0d5..1bd749692730 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsTree.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsTree.java @@ -349,8 +349,8 @@ public class OptionsTree extends JPanel implements Disposable, OptionsEditorColl int nestingLevel = tree.isRootVisible() ? path.getPathCount() - 1 : path.getPathCount() - 2; - final int left = UIManager.getInt("Tree.leftChildIndent"); - final int right = UIManager.getInt("Tree.rightChildIndent"); + final int left = UIUtil.getTreeLeftChildIndent(); + final int right = UIUtil.getTreeRightChildIndent(); final Insets treeInsets = tree.getInsets(); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/Stripe.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/Stripe.java index b293b8c60e7c..b0ac04cde7e9 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/Stripe.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/Stripe.java @@ -24,6 +24,7 @@ import com.intellij.openapi.keymap.ex.KeymapManagerEx; import com.intellij.openapi.keymap.ex.WeakKeymapManagerListener; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.wm.ToolWindowAnchor; +import com.intellij.util.ui.UIUtil; import javax.swing.*; import java.awt.*; @@ -333,7 +334,7 @@ final class Stripe extends JPanel{ } public void setOverlayed(boolean overlayed) { - Color bg = UIManager.getColor("Panel.background"); + Color bg = UIUtil.getPanelBackground(); if (overlayed) { setBackground(new Color(bg.getRed(), bg.getGreen(), bg.getBlue(), 190)); } else { diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java index adf6866eacf3..45a2f7b137da 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java @@ -402,7 +402,7 @@ public final class ToolWindowManagerImpl extends ToolWindowManagerEx implements label.setOpaque(true); final Color treeBg = UIManager.getColor("Tree.background"); label.setBackground(new Color(treeBg.getRed(), treeBg.getGreen(), treeBg.getBlue(), 180)); - final Color treeFg = UIManager.getColor("Tree.foreground"); + final Color treeFg = UIUtil.getTreeForeground(); label.setForeground(new Color(treeFg.getRed(), treeFg.getGreen(), treeFg.getBlue(), 180)); final ToolWindowFactory factory = bean.getToolWindowFactory(); final ToolWindowImpl toolWindow = diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InlineProgressIndicator.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InlineProgressIndicator.java index fd8a68555de8..e160f4945b3f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InlineProgressIndicator.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InlineProgressIndicator.java @@ -112,7 +112,7 @@ public class InlineProgressIndicator extends ProgressIndicatorBase implements Di size = (aqua ? 8 : 10); } myProcessName.setFont(font.deriveFont(Font.PLAIN, size)); - myProcessName.setForeground(UIManager.getColor("Panel.background").brighter().brighter()); + myProcessName.setForeground(UIUtil.getPanelBackground().brighter().brighter()); myProcessName.setBorder(new EmptyBorder(2, 2, 2, 2)); myProcessName.setDecorate(false); @@ -346,7 +346,7 @@ public class InlineProgressIndicator extends ProgressIndicatorBase implements Di int arc = 8; - g.setColor(UIManager.getColor("Panel.background")); + g.setColor(UIUtil.getPanelBackground()); g.fillRoundRect(0, 0, getWidth() - 1, getHeight() - 1, arc, arc); Color bg = getBackground().darker().darker(); @@ -360,7 +360,7 @@ public class InlineProgressIndicator extends ProgressIndicatorBase implements Di g.fillRoundRect(0, 0, getWidth() - 1, getHeight() - 1, arc, arc); - g.setColor(UIManager.getColor("Panel.background")); + g.setColor(UIUtil.getPanelBackground()); g.fillRoundRect(0, getHeight() / 2, getWidth() - 1, getHeight() / 2, arc, arc); g.fillRect(0, (int)label.getMaxY() + 1, getWidth() - 1, getHeight() / 2); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusBarUI.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusBarUI.java index 1f87fd6dcc6f..dbe3f867d0ff 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusBarUI.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/StatusBarUI.java @@ -84,7 +84,7 @@ public class StatusBarUI extends ComponentUI { public void paintBorder(final Component c, final Graphics g, final int x, final int y, final int width, final int height) { final Graphics2D g2d = (Graphics2D) g.create(); - final Color background = UIUtil.getPanelBackgound(); + final Color background = UIUtil.getPanelBackground(); g2d.setColor(background); g2d.fillRect(0, 0, width, height); diff --git a/platform/platform-impl/src/com/intellij/ui/HorizontalLabeledIcon.java b/platform/platform-impl/src/com/intellij/ui/HorizontalLabeledIcon.java index 76b9144d87ff..d33b6d1ddfb6 100644 --- a/platform/platform-impl/src/com/intellij/ui/HorizontalLabeledIcon.java +++ b/platform/platform-impl/src/com/intellij/ui/HorizontalLabeledIcon.java @@ -114,7 +114,7 @@ public class HorizontalLabeledIcon implements Icon { y += fontMetrics.getHeight(); } if (myMnemonic != null) { - g.setColor(UIUtil.getTextInactiveTextColor()); + g.setColor(UIUtil.getInactiveTextColor()); int offset = fontMetrics.stringWidth(myStrings[myStrings.length-1]+" "); y -= fontMetrics.getHeight(); g.drawString(myMnemonic, x + offset, y); diff --git a/platform/platform-impl/src/com/intellij/ui/LabeledIcon.java b/platform/platform-impl/src/com/intellij/ui/LabeledIcon.java index 5ef719dfbd69..8c728c5ba13b 100644 --- a/platform/platform-impl/src/com/intellij/ui/LabeledIcon.java +++ b/platform/platform-impl/src/com/intellij/ui/LabeledIcon.java @@ -124,7 +124,7 @@ public class LabeledIcon implements Icon { if (myMnemonic != null) { y -= fontMetrics.getHeight(); - g.setColor(UIUtil.getTextInactiveTextColor()); + g.setColor(UIUtil.getInactiveTextColor()); int offset = getTextWidth() - fontMetrics.stringWidth(myMnemonic); g.drawString(myMnemonic, x + offset, y); } diff --git a/platform/platform-impl/src/com/intellij/ui/SeparatorComponent.java b/platform/platform-impl/src/com/intellij/ui/SeparatorComponent.java index ae20a803a532..6be7f19bc486 100644 --- a/platform/platform-impl/src/com/intellij/ui/SeparatorComponent.java +++ b/platform/platform-impl/src/com/intellij/ui/SeparatorComponent.java @@ -15,6 +15,8 @@ */ package com.intellij.ui; +import com.intellij.util.ui.UIUtil; + import javax.swing.*; import java.awt.*; @@ -94,7 +96,7 @@ public class SeparatorComponent extends JComponent { */ public static JComponent createLabbeledLineSeparator(final String titleText, final Color containerBackgroungColor) { JLabel titleLabel = new JLabel(titleText); - titleLabel.setFont(UIManager.getFont("Label.font")); + titleLabel.setFont(UIUtil.getLabelFont()); titleLabel.setForeground(Colors.DARK_BLUE); SeparatorComponent separatorComponent = new SeparatorComponent(5, containerBackgroungColor.darker(), containerBackgroungColor.brighter()); diff --git a/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegCellRenderer.java b/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegCellRenderer.java index 146394ba3c3e..36bc9562780e 100644 --- a/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegCellRenderer.java +++ b/platform/platform-impl/src/com/intellij/ui/plaf/beg/BegCellRenderer.java @@ -48,15 +48,15 @@ public class BegCellRenderer extends JLabel implements TreeCellRenderer, ListCel } public Component getTreeCellRendererComponent(JTree tree, Object obj, boolean selected, boolean expanded, boolean leaf, int i1, boolean hasFocus) { - setFont(UIManager.getFont("Label.font")); + setFont(UIUtil.getLabelFont()); setLeafIcon(UIManager.getIcon("Tree.leafIcon")); setClosedIcon(UIManager.getIcon("Tree.closedIcon")); setOpenIcon(UIManager.getIcon("Tree.openIcon")); - setSelectionForeground(UIManager.getColor("Tree.selectionForeground")); - setTextForeground(UIManager.getColor("Tree.textForeground")); - setSelectionBackground(UIManager.getColor("Tree.selectionBackground")); - setTextBackground(UIManager.getColor("Tree.textBackground")); - setSelectionBorderColor(UIManager.getColor("Tree.selectionBorderColor")); + setSelectionForeground(UIUtil.getTreeSelectionForeground()); + setTextForeground(UIUtil.getTreeTextForeground()); + setSelectionBackground(UIUtil.getTreeSelectionBackground()); + setTextBackground(UIUtil.getTreeTextBackground()); + setSelectionBorderColor(UIUtil.getTreeSelectionBorderColor()); Object obj1 = UIManager.get("Tree.drawsFocusBorderAroundIcon"); myDrawsFocusBorderAroundIcon = obj1 != null && ((Boolean)obj1).booleanValue(); @@ -80,12 +80,12 @@ public class BegCellRenderer extends JLabel implements TreeCellRenderer, ListCel } public Component getListCellRendererComponent(JList list, Object obj, int index, boolean selected, boolean hasFocus) { - setFont(UIManager.getFont("Label.font")); - setSelectionForeground(UIManager.getColor("List.selectionForeground")); - setTextForeground(UIManager.getColor("List.foreground")); + setFont(UIUtil.getLabelFont()); + setSelectionForeground(UIUtil.getListSelectionForeground()); + setTextForeground(UIUtil.getListForeground()); setSelectionBackground(UIManager.getColor("List.selectionBackground")); - setTextBackground(UIManager.getColor("List.background")); - setSelectionBorderColor(UIManager.getColor("Tree.selectionBorderColor")); + setTextBackground(UIUtil.getListBackground()); + setSelectionBorderColor(UIUtil.getTreeSelectionBorderColor()); Object obj1 = UIManager.get("Tree.drawsFocusBorderAroundIcon"); myDrawsFocusBorderAroundIcon = obj1 != null && ((Boolean)obj1).booleanValue(); diff --git a/platform/platform-impl/src/com/intellij/ui/popup/PopupComponent.java b/platform/platform-impl/src/com/intellij/ui/popup/PopupComponent.java index aaa7ebeaf936..c4eb6386647b 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/PopupComponent.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/PopupComponent.java @@ -23,8 +23,6 @@ import com.intellij.util.ui.UIUtil; import javax.swing.*; import java.awt.*; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; public interface PopupComponent { @@ -140,7 +138,7 @@ public interface PopupComponent { if (SystemInfo.isMac && UIUtil.isUnderAquaLookAndFeel()) { final Component c = (Component)ReflectionUtil.getField(Popup.class, myPopup, Component.class, "component"); - c.setBackground(UIUtil.getPanelBackgound()); + c.setBackground(UIUtil.getPanelBackground()); } } diff --git a/platform/util/src/com/intellij/ui/TitlePanel.java b/platform/util/src/com/intellij/ui/TitlePanel.java index f970ce1b3285..8c93962ad9ea 100644 --- a/platform/util/src/com/intellij/ui/TitlePanel.java +++ b/platform/util/src/com/intellij/ui/TitlePanel.java @@ -16,6 +16,8 @@ package com.intellij.ui; +import com.intellij.util.ui.UIUtil; + import javax.swing.*; import javax.swing.border.EmptyBorder; import java.awt.*; @@ -55,7 +57,7 @@ public class TitlePanel extends CaptionPanel { public void setActive(final boolean active) { super.setActive(active); myLabel.setIcon(active ? myRegular : myInactive); - myLabel.setForeground(active ? UIManager.getColor("Label.foreground") : Color.gray); + myLabel.setForeground(active ? UIUtil.getLabelForeground() : Color.gray); } public void setText(String titleText) { diff --git a/platform/util/src/com/intellij/util/ui/MacUIUtil.java b/platform/util/src/com/intellij/util/ui/MacUIUtil.java index 481372696fc2..458da7cd41ff 100644 --- a/platform/util/src/com/intellij/util/ui/MacUIUtil.java +++ b/platform/util/src/com/intellij/util/ui/MacUIUtil.java @@ -50,7 +50,7 @@ public class MacUIUtil { final int width1 = width - 8; final int height1 = height - 6; - g.setColor(UIUtil.getPanelBackgound()); + g.setColor(UIUtil.getPanelBackground()); g.fillRect(x, y, width, height); g.setColor(c.getBackground()); diff --git a/platform/util/src/com/intellij/util/ui/UIUtil.java b/platform/util/src/com/intellij/util/ui/UIUtil.java index fe398d6afb39..d19ae46b0da8 100644 --- a/platform/util/src/com/intellij/util/ui/UIUtil.java +++ b/platform/util/src/com/intellij/util/ui/UIUtil.java @@ -111,7 +111,7 @@ public class UIUtil { public static void setEnabled(Component component, boolean enabled, boolean recursively) { component.setEnabled(enabled); if (component instanceof JLabel) { - Color color = UIManager.getColor(enabled ? "Label.foreground" : "Label.disabledForeground"); + Color color = enabled ? getLabelForeground() : UIManager.getColor("Label.disabledForeground"); if (color != null) { component.setForeground(color); } @@ -198,8 +198,11 @@ public class UIUtil { return UIManager.getIcon("OptionPane.warningIcon"); } + /** + * @deprecated use com.intellij.util.ui.UIUtil#getQuestionIcon() + */ public static Icon getOptionPanelQuestionIcon() { - return UIManager.getIcon("OptionPane.questionIcon"); + return getQuestionIcon(); } @NotNull @@ -300,8 +303,11 @@ public class UIUtil { return UIManager.getColor("textInactiveText"); } + /** + * @deprecated use com.intellij.util.ui.UIUtil#getTextFieldBackground() + */ public static Color getActiveTextFieldBackgroundColor() { - return UIManager.getColor("TextField.background"); + return getTextFieldBackground(); } public static Color getInactiveTextFieldBackgroundColor() { @@ -320,8 +326,11 @@ public class UIUtil { return UIManager.getColor("Tree.selectionForeground"); } + /** + * @deprecated use com.intellij.util.ui.UIUtil#getInactiveTextColor() + */ public static Color getTextInactiveTextColor() { - return UIManager.getColor("textInactiveText"); + return getInactiveTextColor(); } public static void installPopupMenuColorAndFonts(final JComponent contentPane) { @@ -340,12 +349,12 @@ public class UIUtil { return UIManager.getColor("Tree.selectionBorderColor"); } - public static Object getTreeRightChildIndent() { - return UIManager.get("Tree.rightChildIndent"); + public static int getTreeRightChildIndent() { + return UIManager.getInt("Tree.rightChildIndent"); } - public static Object getTreeLeftChildIndent() { - return UIManager.get("Tree.leftChildIndent"); + public static int getTreeLeftChildIndent() { + return UIManager.getInt("Tree.leftChildIndent"); } public static Color getToolTipBackground() { @@ -402,7 +411,7 @@ public class UIUtil { public static Color getListBackground() { // Fixes most of the GTK+ L&F glitches - return UIUtil.isUnderGTKLookAndFeel() ? getTreeTextBackground() : UIManager.getColor("List.background"); + return isUnderGTKLookAndFeel() ? getTreeTextBackground() : UIManager.getColor("List.background"); } public static Color getListForeground() { @@ -418,7 +427,7 @@ public class UIUtil { } public static Color getTableFocusCellBackground() { - return UIManager.getColor("Table.focusCellBackground"); + return UIManager.getColor(TABLE_FOCUS_CELL_BACKGROUND_PROPERTY); } public static Color getListSelectionBackground() { @@ -494,11 +503,14 @@ public class UIUtil { } public static Color getTableFocusCellForeground() { - return UIManager.getColor("Table.focusCellForeground"); + return UIManager.getColor("Table.focusCellForeground"); } + /** + * @deprecated use com.intellij.util.ui.UIUtil#getPanelBackground() instead + */ public static Color getPanelBackgound() { - return UIManager.getColor("Panel.background"); + return getPanelBackground(); } public static Border getTextFieldBorder() { @@ -1036,7 +1048,7 @@ public class UIUtil { URL resource = liImg != null ? SystemInfo.class.getResource(liImg) : null; String fontFamilyAndSize = "font-family:" + font.getFamily() + "; font-size:" + font.getSize() + ";"; - @Language("CSS") + //@Language("CSS") String body = "body, div, td {" + fontFamilyAndSize + " " + (fgColor != null ? "color:" + ColorUtil.toHex(fgColor) : "") + "}"; if (resource != null) { body += "ul {list-style-image: " + resource.toExternalForm() +"}"; @@ -1051,8 +1063,8 @@ public class UIUtil { public static boolean isStandardMenuLAF() { return isWinLafOnVista() || - "Nimbus".equals(UIManager.getLookAndFeel().getName()) || - "GTK look and feel".equals(UIManager.getLookAndFeel().getName()); + isUnderNimbusLookAndFeel() || + isUnderGTKLookAndFeel(); } public static Color getFocusedFillColor() { @@ -1223,7 +1235,7 @@ public class UIUtil { public static HTMLEditorKit getHTMLEditorKit() { final HTMLEditorKit kit = new HTMLEditorKit(); - Font font = UIManager.getFont("Label.font"); + Font font = getLabelFont(); @NonNls String family = font != null ? font.getFamily() : "Tahoma"; int size = font != null ? font.getSize() : 11; @@ -1296,7 +1308,7 @@ public class UIUtil { @NonNls public static String toHtml(String html, final int hPadding) { html = CLOSE_TAG_PATTERN.matcher(html).replaceAll("<$1$2>"); - Font font = UIManager.getFont("Label.font"); + Font font = getLabelFont(); @NonNls String family = font != null ? font.getFamily() : "Tahoma"; int size = font != null ? font.getSize() : 11; return "