MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Add assertion if there are no branches to update or to merge with.

Browse Source
This commit is contained in:
Nadya.Zabrodina
2013-02-23 19:59:17 +04:00
parent 3d9d40af2c
commit dbbc8bb074
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgMergeDialog.java
+2 -3
View File
@@ -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) {
plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgUpdateToDialog.java
+2 -3
View File
@@ -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) {