diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-04 20:44:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-04 20:44:01 +0000 |
| commit | fb5a02906f644d044eb0286bf27d413ba0e05216 (patch) | |
| tree | bca7d49005d81d10c70bc3f547df041c636b4300 /plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskDialog.java | |
| parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
| parent | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (diff) | |
| download | idea-fb5a02906f644d044eb0286bf27d413ba0e05216.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskDialog.java')
| -rw-r--r-- | plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskDialog.java | 5 |
1 files changed, 2 insertions, 3 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 6fe1467b1b47..2cc241e4d8a1 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 @@ -28,7 +28,6 @@ import com.intellij.openapi.ui.ValidationInfo; import com.intellij.openapi.util.Condition; import com.intellij.openapi.vcs.AbstractVcs; import com.intellij.openapi.vcs.VcsTaskHandler; -import com.intellij.openapi.vcs.VcsType; import com.intellij.tasks.*; import com.intellij.tasks.impl.TaskManagerImpl; import com.intellij.tasks.impl.TaskUtil; @@ -106,7 +105,8 @@ public class OpenTaskDialog extends DialogWrapper { myCreateBranch.addActionListener(listener); myCreateChangelist.setSelected(manager.getState().createChangelist); - if (vcs.getType() != VcsType.distributed) { + VcsTaskHandler[] handlers = VcsTaskHandler.getAllHandlers(project); + if (handlers.length == 0) { myCreateBranch.setSelected(false); myCreateBranch.setVisible(false); myBranchName.setVisible(false); @@ -114,7 +114,6 @@ public class OpenTaskDialog extends DialogWrapper { myBranchFrom.setVisible(false); } else { - VcsTaskHandler[] handlers = VcsTaskHandler.getAllHandlers(project); for (VcsTaskHandler handler : handlers) { VcsTaskHandler.TaskInfo[] tasks = handler.getCurrentTasks(); if (tasks.length > 0) { |