From 4f9cf97d51e4400f2393f07c75ee19c4b0f6247b Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Sat, 9 May 2015 18:33:01 +0300
Subject: [PATCH] [vcs-log] rename getIndicatorVersion -> getIndicatorColor,
 getBackgroundVersion -> getBackgroundColor

---
 .../intellij/vcs/log/ui/VcsLogColorManagerImpl.java  | 12 ++++++------
 .../com/intellij/vcs/log/ui/frame/BranchesPanel.java |  2 +-
 .../intellij/vcs/log/ui/frame/VcsLogGraphTable.java  |  2 +-
 .../intellij/vcs/log/ui/render/LabelPainters.java    |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogColorManagerImpl.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogColorManagerImpl.java
index 61064fe51bf6..0ff5df4bc36e 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogColorManagerImpl.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogColorManagerImpl.java
@@ -54,25 +54,25 @@ public class VcsLogColorManagerImpl implements VcsLogColorManager {
   }
 
   @NotNull
-  public static JBColor getBackgroundVersion(@NotNull final Color rootColor) {
+  public static JBColor getBackgroundColor(@NotNull final Color baseRootColor) {
     return new JBColor(new NotNullProducer<Color>() {
       @NotNull
       @Override
       public Color produce() {
-        return ColorUtil.mix(rootColor, UIUtil.getTableBackground(), 0.75);
+        return ColorUtil.mix(baseRootColor, UIUtil.getTableBackground(), 0.75);
       }
     });
   }
 
   @NotNull
-  public static JBColor getIndicatorVersion(@NotNull final Color rootColor) {
-    if (Registry.is("vcs.log.square.labels")) return getBackgroundVersion(rootColor);
+  public static JBColor getIndicatorColor(@NotNull final Color baseRootColor) {
+    if (Registry.is("vcs.log.square.labels")) return getBackgroundColor(baseRootColor);
     return new JBColor(new NotNullProducer<Color>() {
       @NotNull
       @Override
       public Color produce() {
-        if (UIUtil.isUnderDarcula()) return rootColor;
-        return ColorUtil.darker(ColorUtil.softer(rootColor), 2);
+        if (UIUtil.isUnderDarcula()) return baseRootColor;
+        return ColorUtil.darker(ColorUtil.softer(baseRootColor), 2);
       }
     });
   }
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/BranchesPanel.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/BranchesPanel.java
index 0c8cd92dac35..6d368cd0b722 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/BranchesPanel.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/BranchesPanel.java
@@ -117,7 +117,7 @@ public class BranchesPanel extends JPanel {
       for (RefGroup group : entry.getValue()) {
         // it is assumed here that all refs in a single group belong to a single root
         if (myRoots == null || myRoots.contains(root)) {
-          Color rootIndicatorColor = VcsLogColorManagerImpl.getIndicatorVersion(myUI.getColorManager().getRootColor(root));
+          Color rootIndicatorColor = VcsLogColorManagerImpl.getIndicatorColor(myUI.getColorManager().getRootColor(root));
           Rectangle rectangle = myReferencePainter
             .paintLabel(group.getName(), g, paddingX, (getHeight() - myReferencePainter.getHeight(this)) / 2 - VERTICAL_SPACE, group.getBgColor(),
                         rootIndicatorColor);
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogGraphTable.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogGraphTable.java
index d864d6f5db1f..44d8f41bb8d5 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogGraphTable.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogGraphTable.java
@@ -410,7 +410,7 @@ public class VcsLogGraphTable extends JBTable implements TypeSafeDataProvider, C
   }
 
   public static JBColor getRootBackgroundColor(@NotNull VirtualFile root, @NotNull VcsLogColorManager colorManager) {
-    return VcsLogColorManagerImpl.getBackgroundVersion(colorManager.getRootColor(root));
+    return VcsLogColorManagerImpl.getBackgroundColor(colorManager.getRootColor(root));
   }
 
   public void handleAnswer(@Nullable GraphAnswer<Integer> answer, boolean dataCouldChange, @Nullable Selection previousSelection) {
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/LabelPainters.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/LabelPainters.java
index 8d04e8a6caf0..973af640b84e 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/LabelPainters.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/LabelPainters.java
@@ -55,7 +55,7 @@ public class LabelPainters {
 
     public void paintReference(@NotNull VcsRef reference, @NotNull Graphics g, int paddingX, int paddingY) {
       myLabelPainter.paintLabel((Graphics2D)g, reference.getName(), paddingX, paddingY, reference.getType().getBackgroundColor(),
-                                VcsLogColorManagerImpl.getIndicatorVersion(myColorManager.getRootColor(reference.getRoot())));
+                                VcsLogColorManagerImpl.getIndicatorColor(myColorManager.getRootColor(reference.getRoot())));
     }
 
     public Rectangle paintLabel(@NotNull String text,