21062: Reusing ConfigureProjectWizardMainPage for target mgmt leads to incorrect resource string in dialog

3 files changed, 19 insertions, 11 deletions

diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ConfigureProjectWizardMainPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ConfigureProjectWizardMainPage.java
index bb5ddb8a4..ad240f007 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ConfigureProjectWizardMainPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/ConfigureProjectWizardMainPage.java
@@ -42,8 +42,7 @@ public class ConfigureProjectWizardMainPage extends WizardPage {
 	private AdaptableList wizards;
 	private IWorkbench workbench;
 	private IProject project;
-	private boolean creationMode = true;
-	private String instructionLabel="ConfigureProjectWizardMainPage.selectRepository";
+	private String description;
 	
 	private IConfigurationWizard selectedWizard;
 	
@@ -53,16 +52,25 @@ public class ConfigureProjectWizardMainPage extends WizardPage {
 	 * @param pageName  the name of the page
 	 * @param title  the title of the page
 	 * @param titleImage  the image for the page title
-	 * @param wizard  the wizards to populate the table with
+	 * @param wizards  the wizards to populate the table with
 	 */
 	public ConfigureProjectWizardMainPage(String pageName, String title, ImageDescriptor titleImage, AdaptableList wizards) {
+		this(pageName,title,titleImage,wizards,Policy.bind("ConfigureProjectWizardMainPage.selectRepository"));
+	}
+	
+	/**
+	 * Create a new ConfigureProjectWizardMainPage
+	 * 
+	 * @param pageName  the name of the page
+	 * @param title  the title of the page
+	 * @param titleImage  the image for the page title
+	 * @param wizards  the wizards to populate the table with
+	 * @param description The string to use as a description label
+	 */
+	public ConfigureProjectWizardMainPage(String pageName, String title, ImageDescriptor titleImage, AdaptableList wizards, String description) {
 		super(pageName, title, titleImage);
 		this.wizards = wizards;
-		this.creationMode = creationMode;
-	}
-	public ConfigureProjectWizardMainPage(String pageName, String title, ImageDescriptor titleImage, AdaptableList wizards, String instructionLabel) {
-		this(pageName,title,titleImage,wizards);
-		this.instructionLabel=instructionLabel;
+		this.description = description;
 	}
 	
 	public IConfigurationWizard getSelectedWizard() {
@@ -88,7 +96,7 @@ public class ConfigureProjectWizardMainPage extends WizardPage {
 		WorkbenchHelp.setHelp(composite, IHelpContextIds.SHARE_PROJECT_PAGE);
 				
 		Label label = new Label(composite, SWT.LEFT);
-		label.setText(Policy.bind(instructionLabel)); //$NON-NLS-1$
+		label.setText(description);
 		GridData data = new GridData();
 		data.horizontalAlignment = GridData.FILL;
 		label.setLayoutData(data);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
index a14f69816..1b06d0864 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
@@ -19,7 +19,7 @@ ConfigureProjectWizard.configureProject=Share Project
 ConfigureProjectWizard.description=Select the repository plug-in that will be used to share the selected project.
 ConfigureProjectWizard.title=Share Project
 ConfigureProjectWizardMainPage.selectRepository=Select a repository type:
-ConfigureProjectWizardMainPage.selectTarget=Select a Target manager type:
+ConfigureProjectWizardMainPage.selectTarget=Select a site type:
 
 ConfigurationWizard.exceptionCreatingWizard=Exception creating wizard.
 
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ConfigureTargetWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ConfigureTargetWizard.java
index 3739b3233..94bccfc05 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ConfigureTargetWizard.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/ConfigureTargetWizard.java
@@ -137,7 +137,7 @@ public class ConfigureTargetWizard extends Wizard implements IConfigurationWizar
 					}
 				}
 			} else {
-				mainPage = new ConfigureProjectWizardMainPage("target-selection-page", getWizardLabel(), TeamImages.getImageDescriptor(UIConstants.IMG_WIZBAN_SHARE), wizards, "ConfigureProjectWizardMainPage.selectTarget"); //$NON-NLS-1$
+				mainPage = new ConfigureProjectWizardMainPage("target-selection-page", getWizardLabel(), TeamImages.getImageDescriptor(UIConstants.IMG_WIZBAN_SHARE), wizards, Policy.bind("ConfigureProjectWizardMainPage.selectTarget")); //$NON-NLS-1$
 				mainPage.setDescription(getWizardDescription());
 				mainPage.setProject(project);
 				mainPage.setWorkbench(workbench);