Bug 11598: Branch wizard: error occurs if both tags are the same

2 files changed, 25 insertions, 20 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
index 98de5f42e..ab3074f78 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
@@ -44,6 +44,7 @@ BranchWizardPage.branchName=Branch Name:
 BranchWizardPage.versionName=Version Name:
 BranchWizardPage.startWorking=Start working in the branch
 BranchWizardPage.versionPrefix=Root_
+BranchWizard.branchAndVersionMustBeDifferent=The branch name and version name must be different.
 
 ConsolePreferencePage.consoleColorSettings=Console text color settings.
 ConsolePreferencePage.commandColor=Command &Line:
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/BranchWizardPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/BranchWizardPage.java
index f74019536..8585d253c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/BranchWizardPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/BranchWizardPage.java
@@ -123,31 +123,35 @@ public class BranchWizardPage extends CVSWizardPage {
 	}
 	
 	private void updateEnablement() {
+		boolean complete = true;
 		String branch = branchText.getText();
+		
 		if (branch.length() == 0) {
-			setErrorMessage(null);
-			setPageComplete(false);
-			return;
-		}
-		IStatus status = CVSTag.validateTagName(branch);
-		if (status.isOK()) {
-			setErrorMessage(null);
+			setMessage(null);
+			complete = false;
 		} else {
-			setErrorMessage(status.getMessage());
-			setPageComplete(false);
-			return;
-		}
-		
-		if(versionText!=null) {
-			status = CVSTag.validateTagName(versionText.getText());
-			if (status.isOK()) {
-				setErrorMessage(null);
+			IStatus status = CVSTag.validateTagName(branch);
+			if (!status.isOK()) {
+				setMessage(status.getMessage(), WARNING_MESSAGE);
+				complete = false;
 			} else {
-				setErrorMessage(status.getMessage());
-				setPageComplete(false);
-				return;
+				if(versionText!=null) {
+					status = CVSTag.validateTagName(versionText.getText());
+					if (!status.isOK()) {
+						setMessage(status.getMessage(), WARNING_MESSAGE);
+						complete = false;
+					} else {
+						if(versionText.getText().equals(branch)) {
+							setMessage(Policy.bind("BranchWizard.branchAndVersionMustBeDifferent"), WARNING_MESSAGE); //$NON-NLS-1$
+							complete = false;
+						}
+					}
+				}
 			}
 		}
-		setPageComplete(true);
+		if(complete) {
+			setMessage(null);
+		}
+		setPageComplete(complete);
 	}
 }
\ No newline at end of file