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-CR-8762 Several improvements in pluggable panels of "Open Task" dialog

Browse Source 
* Better validation messages from VcsOpenTaskPanel that always indicate
problematic control
* Preferred focused component from VcsOpenTaskPanel is taken into account
This commit is contained in:
Mikhail Golubev
2016-04-01 14:52:43 +03:00
parent f9a3625d9b
commit f5eb1cafb3
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/OpenTaskDialog.java
+6
View File
@@ -155,6 +155,12 @@ public class OpenTaskDialog extends DialogWrapper {
@Override
public JComponent getPreferredFocusedComponent() {
for (TaskDialogPanel panel : myPanels) {
final JComponent component = panel.getPreferredFocusedComponent();
if (component != null) {
return component;
}
}
if (myTaskStateCombo.isVisible() && myTaskStateCombo.isEnabled()){
return myTaskStateCombo.getComboBox();
}
plugins/tasks/tasks-core/src/com/intellij/tasks/actions/vcs/VcsOpenTaskPanel.java
+3 -3
View File
@@ -186,10 +186,10 @@ public class VcsOpenTaskPanel extends TaskDialogPanel {
else if (myVcsTaskHandler != null) {
return myVcsTaskHandler.isBranchNameValid(branchName)
? null
: new ValidationInfo("Branch name is not valid; check your vcs branch name restrictions.");
: new ValidationInfo("Branch name is not valid; check your vcs branch name restrictions.", myBranchName);
}
else if (branchName.contains(" ")) {
return new ValidationInfo("Branch name should not contain spaces");
return new ValidationInfo("Branch name should not contain spaces", myBranchName);
}
else {
return null;
@@ -197,7 +197,7 @@ public class VcsOpenTaskPanel extends TaskDialogPanel {
}
if (myCreateChangelist.isSelected()) {
if (myChangelistName.getText().trim().isEmpty()) {
return new ValidationInfo("Changelist name should not be empty");
return new ValidationInfo("Changelist name should not be empty", myChangelistName);
}
}
return null;