From 6845731e822f064eb4d10684f5b9198f9b756fc4 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Fri, 30 Nov 2012 14:05:56 +0100
Subject: [PATCH] fix blue color (cherry picked from commit
 0fd70bedacb91e4451f42edefa1970f580b5549b)

Conflicts:

	platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/Advertiser.java
---
 colorSchemes/src/colorSchemes/Darcula.xml              | 10 ++++++++++
 .../intellij/codeInsight/lookup/impl/Advertiser.java   |  8 ++++----
 .../codeInsight/navigation/CtrlMouseHandler.java       |  3 ++-
 .../com/intellij/codeInspection/ui/InspectionTree.java |  7 +++----
 .../src/com/intellij/openapi/ui/MessageType.java       |  6 +++---
 .../com/intellij/codeInsight/hint/HintManagerImpl.java |  2 +-
 .../openapi/editor/impl/EditorGutterComponentImpl.java |  5 +++--
 .../openapi/options/newEditor/OptionsTree.java         |  4 ++--
 8 files changed, 28 insertions(+), 17 deletions(-)

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 @@
         <option name="ERROR_STRIPE_COLOR" />
       </value>
     </option>
+    <option name="CTRL_CLICKABLE">
+      <value>
+        <option name="FOREGROUND" value="589df6" />
+        <option name="BACKGROUND" />
+        <option name="FONT_TYPE" value="0" />
+        <option name="EFFECT_COLOR" value="589df6"/>
+        <option name="EFFECT_TYPE" value="1" />
+        <option name="ERROR_STRIPE_COLOR" />
+      </value>
+    </option>
     <option name="CSS.FUNCTION">
       <value>
         <option name="FOREGROUND" value="da4939" />
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.<TextAttribute, Object>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<Object> myExpandedUserObjects;
@@ -280,7 +279,7 @@ public class InspectionTree extends Tree {
         if (refElement instanceof RefElement) {
           refElement = ((RefElement)refElement).getContainingEntry();
           if (((RefElement)refElement).isEntry() && ((RefElement)refElement).isPermanentEntry()) {
-            foreground = new SimpleTextAttributes(SimpleTextAttributes.STYLE_PLAIN, Color.blue);
+            foreground = new SimpleTextAttributes(SimpleTextAttributes.STYLE_PLAIN, JBColor.blue);
           }
         }
 
diff --git a/platform/platform-api/src/com/intellij/openapi/ui/MessageType.java b/platform/platform-api/src/com/intellij/openapi/ui/MessageType.java
index 2d92c1d4afad..f3343a27f605 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/MessageType.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/MessageType.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.
@@ -25,9 +25,9 @@ import java.awt.*;
 public class MessageType {
 
   public static final MessageType ERROR = new MessageType(UIUtil.getBalloonErrorIcon(),
-                                                          new JBColor(new Color(255, 204, 204, 230), new Color(0x70202c)));
+                                                          new JBColor(new Color(255, 204, 204, 230), new Color(0x70383a)));
   public static final MessageType INFO = new MessageType(UIUtil.getBalloonInformationIcon(),
-                                                         new JBColor(new Color(186, 238, 186, 230), new Color(0x19451a)));
+                                                         new JBColor(new Color(186, 238, 186, 230), new Color(0x356936)));
   public static final MessageType WARNING = new MessageType(UIUtil.getBalloonWarningIcon(),
                                                             new JBColor(new Color(249, 247, 142, 230), new Color(0x5C5C42)));
 
diff --git a/platform/platform-impl/src/com/intellij/codeInsight/hint/HintManagerImpl.java b/platform/platform-impl/src/com/intellij/codeInsight/hint/HintManagerImpl.java
index f93a7574d5e8..e34eeed7f315 100644
--- a/platform/platform-impl/src/com/intellij/codeInsight/hint/HintManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/codeInsight/hint/HintManagerImpl.java
@@ -790,7 +790,7 @@ public class HintManagerImpl extends HintManager implements Disposable {
 
     hintInfo.initStyleFrom(hint.getComponent());
     if (showByBalloon) {
-      hintInfo.setBorderColor(UIUtil.isUnderDarcula() ? Gray._180 : Color.gray);
+      hintInfo.setBorderColor(new JBColor(Color.gray, Gray._140));
       hintInfo.setFont(hintInfo.getTextFont().deriveFont(Font.PLAIN));
       hintInfo.setCalloutShift((int)(editor.getLineHeight() * 0.1));
     }
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
index 3e73c2cea4ad..fa9efad4625b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
@@ -47,6 +47,7 @@ import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.ui.HintHint;
+import com.intellij.ui.JBColor;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.util.Function;
 import com.intellij.util.IconUtil;
@@ -251,7 +252,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
     paintBackground(g, clip, getAnnotationsAreaOffset(), w);
 
     Color color = myEditor.getColorsScheme().getColor(EditorColors.ANNOTATIONS_COLOR);
-    g.setColor(color != null ? color : Color.blue);
+    g.setColor(color != null ? color : JBColor.blue);
     g.setFont(myEditor.getColorsScheme().getFont(EditorFontType.PLAIN));
 
     for (int i = 0; i < myTextAnnotationGutters.size(); i++) {
@@ -362,7 +363,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
     }
 
     Color color = myEditor.getColorsScheme().getColor(EditorColors.LINE_NUMBERS_COLOR);
-    g.setColor(color != null ? color : Color.blue);
+    g.setColor(color != null ? color : JBColor.blue);
     g.setFont(myEditor.getColorsScheme().getFont(EditorFontType.PLAIN));
 
     Graphics2D g2 = (Graphics2D)g;
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 69f06db95c57..6f963eb2e546 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
@@ -370,10 +370,10 @@ public class OptionsTree extends JPanel implements Disposable, OptionsEditorColl
 
 
         if (base.isError()) {
-          fg = UIUtil.isUnderDarcula() ? DarculaColors.RED : Color.red;
+          fg = JBColor.red;
         }
         else if (base.isModified()) {
-          fg = UIUtil.isUnderDarcula() ? DarculaColors.BLUE : Color.blue;
+          fg = JBColor.blue;
         }
 
       }