From 9a93b0bb2e46709176829394b5339f0dfce46bb8 Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Thu, 12 Nov 2015 14:53:43 +0300 Subject: [PATCH] [task]: dialog validation fix --- .../src/com/intellij/tasks/actions/OpenTaskDialog.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskDialog.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskDialog.java index 2dc6e1307e82..220976330957 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskDialog.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskDialog.java @@ -259,8 +259,10 @@ public class OpenTaskDialog extends DialogWrapper { if (branchName.isEmpty()) { return new ValidationInfo("Branch name should not be empty", myBranchName); } - else if (myVcsTaskHandler != null && !myVcsTaskHandler.isBranchNameValid(branchName)){ - return new ValidationInfo("Branch name is not valid; check your vcs branch name restrictions."); + else if (myVcsTaskHandler != null) { + return myVcsTaskHandler.isBranchNameValid(branchName) + ? null + : new ValidationInfo("Branch name is not valid; check your vcs branch name restrictions."); } else if (branchName.contains(" ")) { return new ValidationInfo("Branch name should not contain spaces");