From 7f597a62a9878da58a45a669d3ce651bbf48a3ff Mon Sep 17 00:00:00 2001 From: irengrig Date: Tue, 7 Sep 2010 19:36:40 +0400 Subject: [PATCH] IDEA-55100 Update dialog blocks children --- .../org/jetbrains/idea/svn/actions/SelectBranchPopup.java | 6 +++++- .../idea/svn/update/SvnUpdateRootOptionsPanel.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SelectBranchPopup.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SelectBranchPopup.java index b1b790b5896a..aaf411700d09 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SelectBranchPopup.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SelectBranchPopup.java @@ -61,6 +61,10 @@ public class SelectBranchPopup { } public static void show(Project project, VirtualFile file, BranchSelectedCallback callback, final String title) { + show(project, file, callback, title, null); + } + + public static void show(Project project, VirtualFile file, BranchSelectedCallback callback, final String title, final Component component) { final SvnFileUrlMapping urlMapping = SvnVcs.getInstance(project).getSvnFileUrlMapping(); final SVNURL svnurl = urlMapping.getUrlForFile(new File(file.getPath())); if (svnurl == null) { @@ -72,7 +76,7 @@ public class SelectBranchPopup { } // not vcs root but wc root is ok - showForBranchRoot(project, rootUrlInfo.getVirtualFile(), callback, title); + showForBranchRoot(project, rootUrlInfo.getVirtualFile(), callback, title, component); } public static void showForBranchRoot(Project project, VirtualFile vcsRoot, BranchSelectedCallback callback, final String title) { diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnUpdateRootOptionsPanel.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnUpdateRootOptionsPanel.java index c3177fd50987..023ed7cba73d 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnUpdateRootOptionsPanel.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnUpdateRootOptionsPanel.java @@ -154,7 +154,7 @@ public class SvnUpdateRootOptionsPanel implements SvnPanel{ recalculateUrl(url); myBranchField.setText(SVNPathUtil.tail(url)); } - }, SvnBundle.message("select.branch.popup.general.title")); + }, SvnBundle.message("select.branch.popup.general.title"), myPanel); } private void recalculateUrl(final String url) {