Author: adietish Date: 2011-12-07 09:26:51 -0500 (Wed, 07 Dec 2011) New Revision: 37059 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectExistingProjectDialog.java Log: [JBIDE-10171] Corrected wording in different labels and dialog titles Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-12-07 13:52:37 UTC (rev 37058) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2011-12-07 14:26:51 UTC (rev 37059) @@ -71,8 +71,9 @@ public AdapterWizardPage(ImportProjectWizard wizard, ImportProjectWizardModel model) { super( "Import OpenShift application", - "Select the project to enable, the Git clone destination, the branch to clone" - + " and configure your server adapter ", + "Choose to create a new/use existing project, " + + "the GITbranch and clone destination, " + + "and configure your server adapter ", "Server Adapter", wizard); this.model = new AdapterWizardPageModel(model); @@ -484,7 +485,7 @@ return ValidationStatus.ok(); } else { return ValidationStatus.error( - "You have to select a project that shall be enabled for OpenShift"); + "Select an existing project to use with OpenShift"); } } } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java 2011-12-07 13:52:37 UTC (rev 37058) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java 2011-12-07 14:26:51 UTC (rev 37059) @@ -27,6 +27,7 @@ import org.eclipse.jface.wizard.Wizard; import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.errors.TransportException; +import org.eclipse.osgi.util.NLS; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; import org.jboss.tools.common.ui.WizardUtils; @@ -72,7 +73,7 @@ if (model.isNewProject()) { model.importProject(monitor); } else { - if (!askForConfirmation()) { + if (!askForConfirmation(model.getApplicationName(), model.getProjectName())) { return Status.CANCEL_STATUS; } model.addToExistingProject(monitor); @@ -119,16 +120,18 @@ } } - private boolean askForConfirmation() { + private boolean askForConfirmation(final String applicationName, final String projectName) { final boolean[] confirmed = new boolean[1]; getShell().getDisplay().syncExec(new Runnable() { @Override public void run() { confirmed[0] = MessageDialog.openConfirm(getShell(), - "Confirm project modification", - "This will copy OpenShit configuration files to your project.\n" + - "Are you sure that you want to allow this?"); + NLS.bind("Import OpenShift Application ", applicationName), + NLS.bind( + "OpenShift application {0} will be enabled on project {1} by copying OpenShift " + + "configuration and enable Git for the project.\n " + + "This cannot be undone. Do you wish to continue ?", applicationName, projectName)); }}); return confirmed[0]; } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectExistingProjectDialog.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectExistingProjectDialog.java 2011-12-07 13:52:37 UTC (rev 37058) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectExistingProjectDialog.java 2011-12-07 14:26:51 UTC (rev 37059) @@ -33,7 +33,7 @@ public SelectExistingProjectDialog(String openShiftAppName, Shell shell) { super(shell, new ProjectLabelProvider()); - setTitle("Project Selection"); + setTitle("Select Existing Project"); setMessage(NLS.bind( "Select an existing project for {0}.\nOnly java projects which are not Team shared can be used.", openShiftAppName));