From ae62bb7e7e2be46644b1e5088e9fc30fbb45a6c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D0=B5=D0=B7=D0=B1=D0=BE=D1=80=D0=BE=D0=B4=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=9B=D0=B5=D0=B2?= Date: Thu, 11 Jun 2020 19:25:17 +0300 Subject: [PATCH] 298-fix-future-deprecation plain solution --- .../ui/GitflowTaskDialogPanelProvider.java | 32 +++++-------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/src/main/java/gitflow/ui/GitflowTaskDialogPanelProvider.java b/src/main/java/gitflow/ui/GitflowTaskDialogPanelProvider.java index 6e9e662..e20a145 100644 --- a/src/main/java/gitflow/ui/GitflowTaskDialogPanelProvider.java +++ b/src/main/java/gitflow/ui/GitflowTaskDialogPanelProvider.java @@ -1,10 +1,9 @@ package gitflow.ui; import com.intellij.openapi.project.Project; import com.intellij.tasks.LocalTask; -import com.intellij.tasks.Task; import com.intellij.tasks.TaskManager; +import com.intellij.tasks.actions.vcs.VcsTaskDialogPanelProvider; import com.intellij.tasks.ui.TaskDialogPanel; -import com.intellij.tasks.ui.TaskDialogPanelProvider; import git4idea.branch.GitBranchUtil; import git4idea.repo.GitRepository; import gitflow.GitflowBranchUtil; @@ -13,26 +12,15 @@ import org.jetbrains.annotations.Nullable; -public class GitflowTaskDialogPanelProvider extends TaskDialogPanelProvider { - - @Deprecated - @Nullable - @Override - public TaskDialogPanel getOpenTaskPanel(@NotNull Project project, @NotNull Task task) { - return null; - } - +public class GitflowTaskDialogPanelProvider extends VcsTaskDialogPanelProvider { @Nullable @Override public TaskDialogPanel getOpenTaskPanel(@NotNull Project project, @NotNull LocalTask task) { GitRepository currentRepo = GitBranchUtil.getCurrentRepository(project); GitflowBranchUtil branchUtil = GitflowBranchUtilManager.getBranchUtil(currentRepo); - if (branchUtil.hasGitflow()) { - return TaskManager.getManager(project).isVcsEnabled() ? new GitflowOpenTaskPanel(project, task, currentRepo) : null; - } - else{ - return null; - } + return branchUtil != null && branchUtil.hasGitflow() && TaskManager.getManager(project).isVcsEnabled() + ? new GitflowOpenTaskPanel(project, task, currentRepo) + : null; } @Nullable @@ -40,13 +28,9 @@ public TaskDialogPanel getOpenTaskPanel(@NotNull Project project, @NotNull Local public TaskDialogPanel getCloseTaskPanel(@NotNull Project project, @NotNull LocalTask task) { GitRepository currentRepo = GitBranchUtil.getCurrentRepository(project); GitflowBranchUtil branchUtil = GitflowBranchUtilManager.getBranchUtil(currentRepo); - - if (branchUtil.hasGitflow()) { - return TaskManager.getManager(project).isVcsEnabled() ? new GitflowCloseTaskPanel(project, task, currentRepo) : null; - } - else{ - return null; - } + return branchUtil != null && branchUtil.hasGitflow() && TaskManager.getManager(project).isVcsEnabled() + ? new GitflowCloseTaskPanel(project, task, currentRepo) + : null; } }