MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[vcs-log] minor: reformat code, capitalize title

Browse Source
This commit is contained in:
Julia Beliaeva
2015-07-16 19:39:17 +03:00
parent df9704410a
commit 974bf93056
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/CurrentBranchHighlighter.java
+6 -4
View File
@@ -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);
}
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/MergeCommitsHighlighter.java
+1 -2
View File
@@ -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
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/MyCommitsHighlighter.java
+1 -2
View File
@@ -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
plugins/git4idea/src/git4idea/branch/DeepComparator.java
+3 -3
View File
@@ -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);