diff --git a/colorSchemes/src/colorSchemes/Darcula.xml b/colorSchemes/src/colorSchemes/Darcula.xml
index 26859bd2fddd..45975555b320 100644
--- a/colorSchemes/src/colorSchemes/Darcula.xml
+++ b/colorSchemes/src/colorSchemes/Darcula.xml
@@ -227,6 +227,16 @@
+
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/Advertiser.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/Advertiser.java
index 7d26f3ded01e..9155f602521a 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/Advertiser.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/Advertiser.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@ package com.intellij.codeInsight.lookup.impl;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.ui.ClickListener;
+import com.intellij.ui.JBColor;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.ui.GridBag;
import com.intellij.util.ui.UIUtil;
@@ -70,7 +71,7 @@ public class Advertiser {
myNextLabel = new JLabel(">>");
myNextLabel.setFont(adFont().deriveFont(
ContainerUtil.immutableMapBuilder().put(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON).build()));
- myNextLabel.setForeground(Color.blue);
+ myNextLabel.setForeground(JBColor.blue);
new ClickListener() {
@Override
public boolean onClick(MouseEvent e, int clickCount) {
@@ -93,8 +94,7 @@ public class Advertiser {
if (!myTexts.isEmpty()) {
String text = myTexts.get(myCurrentItem % myTexts.size());
myTextPanel.setText(prepareText(text));
- }
- else {
+ } else {
myTextPanel.setText("");
}
myCachedPrefSize = null;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java
index fba0595bb7de..450ef407ec4c 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java
@@ -70,6 +70,7 @@ import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
import com.intellij.psi.search.searches.DefinitionsSearch;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.ui.HintListener;
+import com.intellij.ui.JBColor;
import com.intellij.ui.LightweightHint;
import com.intellij.ui.ScreenUtil;
import com.intellij.usageView.UsageViewShortNameLocation;
@@ -217,7 +218,7 @@ public class CtrlMouseHandler extends AbstractProjectComponent {
private static final TextAttributesKey CTRL_CLICKABLE_ATTRIBUTES_KEY =
TextAttributesKey
- .createTextAttributesKey("CTRL_CLICKABLE", new TextAttributes(Color.blue, null, Color.blue, EffectType.LINE_UNDERSCORE, 0));
+ .createTextAttributesKey("CTRL_CLICKABLE", new TextAttributes(JBColor.blue, null, JBColor.blue, EffectType.LINE_UNDERSCORE, 0));
@NotNull private final Alarm myDocAlarm;
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTree.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTree.java
index dafe722fef70..47be08d24b9a 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTree.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTree.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.FileStatus;
import com.intellij.profile.codeInspection.ui.InspectionsConfigTreeComparator;
import com.intellij.ui.ColoredTreeCellRenderer;
+import com.intellij.ui.JBColor;
import com.intellij.ui.SimpleTextAttributes;
import com.intellij.ui.TreeSpeedSearch;
import com.intellij.ui.treeStructure.Tree;
@@ -53,9 +54,7 @@ import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.ExpandVetoException;
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
-import java.awt.*;
import java.util.*;
-import java.util.List;
public class InspectionTree extends Tree {
private final HashSet