From 4332ef2ee96e5e65a4a043c2cb3258fc2780cb45 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Tue, 29 Dec 2015 01:09:47 +0300 Subject: [PATCH] [vcs-log] remove else clauses, use return instead --- .../dvcs/ui/VcsLogSingleCommitAction.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/ui/VcsLogSingleCommitAction.java b/platform/dvcs-impl/src/com/intellij/dvcs/ui/VcsLogSingleCommitAction.java index 4134595da4ca..aa40ad2ed3b7 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/ui/VcsLogSingleCommitAction.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/ui/VcsLogSingleCommitAction.java @@ -27,7 +27,6 @@ import com.intellij.vcs.log.CommitId; import com.intellij.vcs.log.Hash; import com.intellij.vcs.log.VcsLog; import com.intellij.vcs.log.VcsLogDataKeys; -import com.intellij.vcs.log.data.LoadingDetails; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -60,20 +59,20 @@ public abstract class VcsLogSingleCommitAction extends List commits = log.getSelectedCommits(); if (commits.isEmpty()) { e.getPresentation().setEnabledAndVisible(false); + return; } - else { - CommitId commit = ContainerUtil.getFirstItem(commits); - assert commit != null; - Repo repository = getRepositoryForRoot(project, commit.getRoot()); - if (repository == null) { - e.getPresentation().setEnabledAndVisible(false); - } - else { - e.getPresentation().setVisible(isVisible(project, repository, commit.getHash())); - e.getPresentation().setEnabled(commits.size() == 1 && isEnabled(repository, commit.getHash())); - } + CommitId commit = ContainerUtil.getFirstItem(commits); + assert commit != null; + Repo repository = getRepositoryForRoot(project, commit.getRoot()); + + if (repository == null) { + e.getPresentation().setEnabledAndVisible(false); + return; } + + e.getPresentation().setVisible(isVisible(project, repository, commit.getHash())); + e.getPresentation().setEnabled(commits.size() == 1 && isEnabled(repository, commit.getHash())); } protected abstract void actionPerformed(@NotNull Repo repository, @NotNull Hash commit);