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-64841 "Use branch" disabled (SVN update file) - enable branch selection from update/integrate details - in order to Configure Branches be accessible

Browse Source
This commit is contained in:
irengrig
2012-01-18 15:11:13 +04:00
parent 63affd3707
commit d6368836d4
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4ideaOld/src/org/jetbrains/idea/svn/update/SvnUpdateRootOptionsPanel.java
+10 -4
View File
@@ -83,7 +83,7 @@ public class SvnUpdateRootOptionsPanel implements SvnPanel{
public void actionPerformed(ActionEvent e) {
if (myUpdateToSpecificUrl.isSelected()) {
myURLText.setEnabled(true);
myBranchField.setEnabled((myBranchUrl != null) && (mySourceUrl != null));
myBranchField.setEnabled(mySourceUrl != null);
//chooseBranch();
} else {
myURLText.setEnabled(false);
@@ -123,7 +123,7 @@ public class SvnUpdateRootOptionsPanel implements SvnPanel{
myRevisionText.getTextField().selectAll();
myRevisionText.setEnabled(myRevisionBox.isSelected());
myURLText.setEnabled(myUpdateToSpecificUrl.isSelected());
myBranchField.setEnabled(myUpdateToSpecificUrl.isSelected() && (myBranchUrl != null) && (mySourceUrl != null));
myBranchField.setEnabled(myUpdateToSpecificUrl.isSelected() && (mySourceUrl != null));
final boolean revisionCanBeSpecifiedForRoot = (! myIsNested) || isRevisionCanBeSpecifiedForRoot();
myRevisionBox.setEnabled(revisionCanBeSpecifiedForRoot);
@@ -146,12 +146,18 @@ public class SvnUpdateRootOptionsPanel implements SvnPanel{
}
private void chooseBranch() {
if ((myBranchUrl == null) || (mySourceUrl == null)) {
if (mySourceUrl == null) {
myBranchField.setEnabled(false);
return;
}
SelectBranchPopup.show(myVcs.getProject(), myRoot.getVirtualFile(), new SelectBranchPopup.BranchSelectedCallback() {
public void branchSelected(final Project project, final SvnBranchConfigurationNew configuration, final String url, final long revision) {
// try to re-init branch url
myBranchUrl = getBranchForUrl(mySourceUrl);
if (myBranchUrl == null) {
myBranchField.setText("");
return;
}
recalculateUrl(url);
myBranchField.setText(SVNPathUtil.tail(url));
}
@@ -205,7 +211,7 @@ public class SvnUpdateRootOptionsPanel implements SvnPanel{
myUpdateToSpecificUrl.setSelected(false);
myRevisionText.setEnabled(myRevisionBox.isSelected());
myURLText.setEnabled(myUpdateToSpecificUrl.isSelected());
myBranchField.setEnabled(myUpdateToSpecificUrl.isSelected() && (myBranchUrl != null) && (mySourceUrl != null));
myBranchField.setEnabled(myUpdateToSpecificUrl.isSelected() && (mySourceUrl != null));
}
public void apply(final SvnConfiguration configuration) throws ConfigurationException {