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

IDEA-55100 Update dialog blocks children

Browse Source
This commit is contained in:
irengrig
2010-09-07 19:38:38 +04:00
parent eca582a2b3
commit 7f597a62a9
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/actions/SelectBranchPopup.java
+5 -1
View File
@@ -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) {
plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnUpdateRootOptionsPanel.java
+1 -1
View File
@@ -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) {