From 974bf93056196c635ae1a34367147fcc87e56498 Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Tue, 7 Jul 2015 19:06:00 +0300
Subject: [PATCH] [vcs-log] minor: reformat code, capitalize title

---
 .../intellij/vcs/log/ui/CurrentBranchHighlighter.java  | 10 ++++++----
 .../intellij/vcs/log/ui/MergeCommitsHighlighter.java   |  3 +--
 .../com/intellij/vcs/log/ui/MyCommitsHighlighter.java  |  3 +--
 .../git4idea/src/git4idea/branch/DeepComparator.java   |  6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/CurrentBranchHighlighter.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/CurrentBranchHighlighter.java
index 0dc206167487..9987425d6208 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/CurrentBranchHighlighter.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/CurrentBranchHighlighter.java
@@ -51,7 +51,8 @@ public class CurrentBranchHighlighter implements VcsLogHighlighter {
       VcsLogBranchFilter branchFilter = myFilterUi.getFilters().getBranchFilter();
       if (currentBranch != null &&
           (branchFilter == null || !Collections.singleton(currentBranch).containsAll(branchFilter.getBranchNames()))) {
-        Condition<Hash> condition = myDataHolder.getContainingBranchesGetter().getContainedInBranchCondition(currentBranch, details.getRoot());
+        Condition<Hash> condition =
+          myDataHolder.getContainingBranchesGetter().getContainedInBranchCondition(currentBranch, details.getRoot());
         if (condition.value(details.getId())) {
           return VcsCommitStyleFactory.background(CURRENT_BRANCH_BG);
         }
@@ -61,12 +62,13 @@ public class CurrentBranchHighlighter implements VcsLogHighlighter {
   }
 
   public static class Factory implements VcsLogHighlighterFactory {
-    @NotNull
-    private static final String ID = "CURRENT_BRANCH";
+    @NotNull private static final String ID = "CURRENT_BRANCH";
 
     @NotNull
     @Override
-    public VcsLogHighlighter createHighlighter(@NotNull VcsLogDataHolder logDataHolder, @NotNull VcsLogUiProperties uiProperties, @NotNull VcsLogFilterUi filterUi) {
+    public VcsLogHighlighter createHighlighter(@NotNull VcsLogDataHolder logDataHolder,
+                                               @NotNull VcsLogUiProperties uiProperties,
+                                               @NotNull VcsLogFilterUi filterUi) {
       return new CurrentBranchHighlighter(logDataHolder, uiProperties, filterUi);
     }
 
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/MergeCommitsHighlighter.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/MergeCommitsHighlighter.java
index b6f09723f2d7..16d820e9f331 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/MergeCommitsHighlighter.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/MergeCommitsHighlighter.java
@@ -48,8 +48,7 @@ public class MergeCommitsHighlighter implements VcsLogHighlighter {
   }
 
   public static class Factory implements VcsLogHighlighterFactory {
-    @NotNull
-    private static final String ID = "MERGE_COMMITS";
+    @NotNull private static final String ID = "MERGE_COMMITS";
 
     @NotNull
     @Override
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/MyCommitsHighlighter.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/MyCommitsHighlighter.java
index 91565728fd3e..7e4a690050f4 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/MyCommitsHighlighter.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/MyCommitsHighlighter.java
@@ -80,8 +80,7 @@ public class MyCommitsHighlighter implements VcsLogHighlighter {
   }
 
   public static class Factory implements VcsLogHighlighterFactory {
-    @NotNull
-    private static final String ID = "MY_COMMITS";
+    @NotNull private static final String ID = "MY_COMMITS";
 
     @NotNull
     @Override
diff --git a/plugins/git4idea/src/git4idea/branch/DeepComparator.java b/plugins/git4idea/src/git4idea/branch/DeepComparator.java
index 1e1b1fdd8caa..c1d3b31a5ec0 100644
--- a/plugins/git4idea/src/git4idea/branch/DeepComparator.java
+++ b/plugins/git4idea/src/git4idea/branch/DeepComparator.java
@@ -26,7 +26,6 @@ import com.intellij.openapi.util.Key;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.VcsNotifier;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.ui.JBColor;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.vcs.log.*;
 import com.intellij.vcs.log.impl.HashImpl;
@@ -177,7 +176,7 @@ public class DeepComparator implements Disposable {
                   @NotNull Map<GitRepository, GitBranch> repositoriesWithCurrentBranches,
                   @NotNull VcsLogDataProvider dataProvider,
                   @NotNull String branchToCompare) {
-      super(project, "Comparing branches...");
+      super(project, "Comparing Branches...");
       myProject = project;
       myUi = ui;
       myRepositoriesWithCurrentBranches = repositoriesWithCurrentBranches;
@@ -218,7 +217,8 @@ public class DeepComparator implements Disposable {
         @NotNull
         @Override
         public VcsCommitStyle getStyle(int commitIndex, boolean isSelected) {
-          return VcsCommitStyleFactory.foreground(!myNonPickedCommits.contains(commitIndex) ? MergeCommitsHighlighter.MERGE_COMMIT_FOREGROUND : null);
+          return VcsCommitStyleFactory
+            .foreground(!myNonPickedCommits.contains(commitIndex) ? MergeCommitsHighlighter.MERGE_COMMIT_FOREGROUND : null);
         }
       };
       myUi.addHighlighter(myHighlighter);