Converted to using Runtime NLS support

1 files changed, 12 insertions, 11 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/BranchPromptDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/BranchPromptDialog.java
index 8e1ebeef4..cc28234ac 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/BranchPromptDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/BranchPromptDialog.java
@@ -14,6 +14,7 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Button;
@@ -24,8 +25,8 @@ import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.team.internal.ccvs.core.CVSTag;
+import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
 import org.eclipse.team.internal.ccvs.ui.IHelpContextIds;
-import org.eclipse.team.internal.ccvs.ui.Policy;
 import org.eclipse.team.internal.ccvs.ui.wizards.CVSWizardPage;
 import org.eclipse.team.internal.ui.PixelConverter;
 import org.eclipse.team.internal.ui.SWTUtils;
@@ -69,10 +70,10 @@ public class BranchPromptDialog extends DetailsDialog {
 		
         final int areaWidth= convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
         
-        final Label description= SWTUtils.createLabel(composite, allStickyResources ? Policy.bind("BranchWizardPage.pageDescriptionVersion") : Policy.bind("BranchWizardPage.pageDescription"));  //$NON-NLS-1$//$NON-NLS-2$
+        final Label description= SWTUtils.createLabel(composite, allStickyResources ? CVSUIMessages.BranchWizardPage_pageDescriptionVersion : CVSUIMessages.BranchWizardPage_pageDescription);  //$NON-NLS-1$//$NON-NLS-2$
         description.setLayoutData(SWTUtils.createGridData(areaWidth, SWT.DEFAULT, true, false));
         
-		final Label name= SWTUtils.createLabel(composite, Policy.bind("BranchWizardPage.branchName")); //$NON-NLS-1$
+		final Label name= SWTUtils.createLabel(composite, CVSUIMessages.BranchWizardPage_branchName); //$NON-NLS-1$
         name.setLayoutData(SWTUtils.createGridData(areaWidth, SWT.DEFAULT, true, false));
         
 		branchText = CVSWizardPage.createTextField(composite);
@@ -85,7 +86,7 @@ public class BranchPromptDialog extends DetailsDialog {
 		});
 		addBranchContentAssist();
 
-		final Button check = SWTUtils.createCheckBox(composite, Policy.bind("BranchWizardPage.startWorking")); //$NON-NLS-1$
+		final Button check = SWTUtils.createCheckBox(composite, CVSUIMessages.BranchWizardPage_startWorking); //$NON-NLS-1$
 		check.addListener(SWT.Selection, new Listener() {
 			public void handleEvent(Event event) {
 				update = check.getSelection();
@@ -94,10 +95,10 @@ public class BranchPromptDialog extends DetailsDialog {
 		check.setSelection(true);		
 		update = true;
 		
-		final Label versionLabel1= SWTUtils.createLabel(composite, Policy.bind("BranchWizardPage.specifyVersion")); //$NON-NLS-1$
+		final Label versionLabel1= SWTUtils.createLabel(composite, CVSUIMessages.BranchWizardPage_specifyVersion); //$NON-NLS-1$
         versionLabel1.setLayoutData(SWTUtils.createGridData(areaWidth, SWT.DEFAULT, true, false));
 
-		final Label versionLabel2= SWTUtils.createLabel(composite, Policy.bind("BranchWizardPage.versionName")); //$NON-NLS-1$
+		final Label versionLabel2= SWTUtils.createLabel(composite, CVSUIMessages.BranchWizardPage_versionName); //$NON-NLS-1$
 		versionLabel2.setLayoutData(SWTUtils.createGridData(areaWidth, SWT.DEFAULT, true, false));
         
 		versionText = CVSWizardPage.createTextField(composite);
@@ -134,7 +135,7 @@ public class BranchPromptDialog extends DetailsDialog {
 	 */
 	protected void updateVersionName(String branchName) {
 		if(versionText!=null && !allStickyResources) {
-			versionText.setText(Policy.bind("BranchWizardPage.versionPrefix") + branchName); //$NON-NLS-1$
+			versionText.setText(CVSUIMessages.BranchWizardPage_versionPrefix + branchName); //$NON-NLS-1$
 		}
 	}
 	
@@ -153,7 +154,7 @@ public class BranchPromptDialog extends DetailsDialog {
 		composite.setLayoutData(gridData);
 		
 		tagArea = new TagSelectionArea(getShell(), tagSource, TagSelectionArea.INCLUDE_VERSIONS | TagSelectionArea.INCLUDE_BRANCHES, null);
-		tagArea.setTagAreaLabel(Policy.bind("BranchWizardPage.existingVersionsAndBranches")); //$NON-NLS-1$
+		tagArea.setTagAreaLabel(CVSUIMessages.BranchWizardPage_existingVersionsAndBranches); //$NON-NLS-1$
 		tagArea.setIncludeFilterInputArea(false);
 		tagArea.createArea(composite);
 
@@ -171,15 +172,15 @@ public class BranchPromptDialog extends DetailsDialog {
 		} else {
 			IStatus status = CVSTag.validateTagName(branchTag);
 			if (!status.isOK()) {
-				message = Policy.bind("BranchWizard.branchNameWarning", status.getMessage()); //$NON-NLS-1$
+				message = NLS.bind(CVSUIMessages.BranchWizard_branchNameWarning, new String[] { status.getMessage() }); //$NON-NLS-1$
 			} else {
 				if(versionText!=null) {
 					status = CVSTag.validateTagName(versionText.getText());
 					if (!status.isOK()) {
-						message = Policy.bind("BranchWizard.versionNameWarning", status.getMessage()); //$NON-NLS-1$
+						message = NLS.bind(CVSUIMessages.BranchWizard_versionNameWarning, new String[] { status.getMessage() }); //$NON-NLS-1$
 					} else {
 						if(versionTag.length() != 0 && versionTag.equals(branchTag)) {
-							message = Policy.bind("BranchWizard.branchAndVersionMustBeDifferent"); //$NON-NLS-1$
+							message = CVSUIMessages.BranchWizard_branchAndVersionMustBeDifferent; //$NON-NLS-1$
 						}
 					}
 				}