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] code issues: extract method and simplify condition

Browse Source
This commit is contained in:
Julia Beliaeva
2015-07-16 19:39:17 +03:00
parent 974bf93056
commit 0e96d58f02
1 changed files with 6 additions and 3 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 -3
View File
@@ -17,6 +17,7 @@ package com.intellij.vcs.log.ui;
import com.intellij.openapi.util.Condition;
import com.intellij.ui.JBColor;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.vcs.log.*;
import com.intellij.vcs.log.data.LoadingDetails;
import com.intellij.vcs.log.data.VcsLogDataHolder;
@@ -24,7 +25,6 @@ import com.intellij.vcs.log.data.VcsLogUiProperties;
import org.jetbrains.annotations.NotNull;
import java.awt.*;
import java.util.Collections;
public class CurrentBranchHighlighter implements VcsLogHighlighter {
private static final JBColor CURRENT_BRANCH_BG = new JBColor(new Color(228, 250, 255), new Color(63, 71, 73));
@@ -49,8 +49,7 @@ public class CurrentBranchHighlighter implements VcsLogHighlighter {
VcsLogProvider provider = myDataHolder.getLogProvider(details.getRoot());
String currentBranch = provider.getCurrentBranch(details.getRoot());
VcsLogBranchFilter branchFilter = myFilterUi.getFilters().getBranchFilter();
if (currentBranch != null &&
(branchFilter == null || !Collections.singleton(currentBranch).containsAll(branchFilter.getBranchNames()))) {
if (currentBranch != null && (branchFilter == null || !isFilteredByCurrentBranch(currentBranch, branchFilter))) {
Condition<Hash> condition =
myDataHolder.getContainingBranchesGetter().getContainedInBranchCondition(currentBranch, details.getRoot());
if (condition.value(details.getId())) {
@@ -61,6 +60,10 @@ public class CurrentBranchHighlighter implements VcsLogHighlighter {
return VcsCommitStyle.DEFAULT;
}
private boolean isFilteredByCurrentBranch(@NotNull String currentBranch, @NotNull VcsLogBranchFilter branchFilter) {
return branchFilter.getBranchNames().size() == 1 && currentBranch.equals(ContainerUtil.getFirstItem(branchFilter.getBranchNames()));
}
public static class Factory implements VcsLogHighlighterFactory {
@NotNull private static final String ID = "CURRENT_BRANCH";