From dbbc8bb074dad649dd2fa0272e545841a96ffa87 Mon Sep 17 00:00:00 2001 From: "Nadya.Zabrodina" Date: Sat, 23 Feb 2013 18:09:30 +0400 Subject: [PATCH] Add assertion if there are no branches to update or to merge with. --- plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgMergeDialog.java | 5 ++--- .../hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateToDialog.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgMergeDialog.java b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgMergeDialog.java index 37c72b6861b7..cadfeec91c74 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgMergeDialog.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgMergeDialog.java @@ -118,9 +118,8 @@ public class HgMergeDialog extends DialogWrapper { } private void loadBranches(VirtualFile root) { - if (branchesForRepos.get(root) != null) { - branchSelector.setModel(new DefaultComboBoxModel(branchesForRepos.get(root).toArray())); - } + assert branchesForRepos.get(root) != null; + branchSelector.setModel(new DefaultComboBoxModel(branchesForRepos.get(root).toArray())); } private void loadTags(VirtualFile root) { diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateToDialog.java b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateToDialog.java index 4f12354a09f9..ecc5a406b3fd 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateToDialog.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateToDialog.java @@ -119,9 +119,8 @@ public class HgUpdateToDialog extends DialogWrapper { } private void loadBranches(VirtualFile root) { - if (branchesForRepos.get(root) != null) { - branchSelector.setModel(new DefaultComboBoxModel(branchesForRepos.get(root).toArray())); - } + assert branchesForRepos.get(root) != null; + branchSelector.setModel(new DefaultComboBoxModel(branchesForRepos.get(root).toArray())); } private void loadTags(VirtualFile root) {