Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2002-04-19 03:29:58 +0000
committerJean Michel-Lemieux2002-04-19 03:29:58 +0000
commite50154f613f3149152e65f31340c0ca5ceeb2afd (patch)
treee7fafa5419a1d41f29bf5826073c0aaa78cab30a
parente9656cb090dcc33bbcdf72662ab2cc6fc889c42f (diff)
downloadeclipse.platform.team-e50154f613f3149152e65f31340c0ca5ceeb2afd.tar.gz
eclipse.platform.team-e50154f613f3149152e65f31340c0ca5ceeb2afd.tar.xz
eclipse.platform.team-e50154f613f3149152e65f31340c0ca5ceeb2afd.zip
Bug 10551: Branch wizard: error text displayed too early
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/BranchWizardPage.java4
2 files changed, 5 insertions, 2 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 82e79b631..c515aa8b6 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
@@ -38,6 +38,9 @@ BranchWizardPage.branchName=Branch Name:
BranchWizardPage.versionName=Version Name:
BranchWizardPage.startWorking=Start working in the branch
BranchWizardPage.versionPrefix=Root_
+BranchWizard.versionNameWarning=Version name: {0}
+BranchWizard.branchNameWarning=Branch name: {0}
+
BranchWizard.branchAndVersionMustBeDifferent=The branch name and version name must be different.
ConsolePreferencePage.consoleColorSettings=Console text color settings.
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 8585d253c..3032664b9 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
@@ -132,13 +132,13 @@ public class BranchWizardPage extends CVSWizardPage {
} else {
IStatus status = CVSTag.validateTagName(branch);
if (!status.isOK()) {
- setMessage(status.getMessage(), WARNING_MESSAGE);
+ setMessage(Policy.bind("BranchWizard.branchNameWarning", status.getMessage()), WARNING_MESSAGE); //$NON-NLS-1$
complete = false;
} else {
if(versionText!=null) {
status = CVSTag.validateTagName(versionText.getText());
if (!status.isOK()) {
- setMessage(status.getMessage(), WARNING_MESSAGE);
+ setMessage(Policy.bind("BranchWizard.versionNameWarning", status.getMessage()), WARNING_MESSAGE); //$NON-NLS-1$
complete = false;
} else {
if(versionText.getText().equals(branch)) {

Back to the top