Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2007-06-21 18:06:44 +0000
committerMichael Valenta2007-06-21 18:06:44 +0000
commit603a280a15141ac4d7719a1a0687a9c87883116e (patch)
tree41a7beada8013c2bf354469c401a5a3246d9aab1 /bundles/org.eclipse.team.cvs.ui
parentf5d2346d24d9b4d4242e94904f2c707d752132c6 (diff)
downloadeclipse.platform.team-603a280a15141ac4d7719a1a0687a9c87883116e.tar.gz
eclipse.platform.team-603a280a15141ac4d7719a1a0687a9c87883116e.tar.xz
eclipse.platform.team-603a280a15141ac4d7719a1a0687a9c87883116e.zip
Bug 190674 Conflicting resources message lost when typing in commit wizard
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java33
1 files changed, 24 insertions, 9 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java
index c959996a3..9ff9df224 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java
@@ -54,6 +54,10 @@ public class CommitWizardCommitPage extends WizardPage implements IPropertyChang
private ParticipantPagePane fPagePane;
private PageBook bottomChild;
+
+ private boolean fHasConflicts;
+
+ private boolean fIsEmpty;
public CommitWizardCommitPage(IResource [] resources, CommitWizard wizard) {
@@ -229,21 +233,19 @@ public class CommitWizardCommitPage extends WizardPage implements IPropertyChang
public void updateEnablements() {
if (fConfiguration != null) {
+ fHasConflicts = false;
+ fIsEmpty = false;
+
SyncInfoSet set = fConfiguration.getSyncInfoSet();
if (set.hasConflicts()) {
- setErrorMessage(CVSUIMessages.CommitWizardCommitPage_4);
- setPageComplete(false);
- return;
+ fHasConflicts = true;
}
if (set.isEmpty()) {
- // No need for a message as it should be obvious that there are no resources to commit
- setErrorMessage(null);
- setPageComplete(false);
- return;
+ fIsEmpty = true;
}
}
- setErrorMessage(null);
- setPageComplete(true);
+
+ validatePage(false);
}
boolean validatePage(boolean setMessage) {
@@ -257,6 +259,19 @@ public class CommitWizardCommitPage extends WizardPage implements IPropertyChang
return false;
}
}
+
+ if (fHasConflicts) {
+ setErrorMessage(CVSUIMessages.CommitWizardCommitPage_4);
+ setPageComplete(false);
+ return false;
+ }
+ if (fIsEmpty) {
+ // No need for a message as it should be obvious that there are no resources to commit
+ setErrorMessage(null);
+ setPageComplete(false);
+ return false;
+ }
+
setPageComplete(true);
setErrorMessage(null);
return true;

Back to the top