Author: xcoulon Date: 2012-02-14 11:16:44 -0500 (Tue, 14 Feb 2012) New Revision: 38710 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RemoveConnectionActionProvider.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java Log: fixed - JBIDE-10854 - Project Configuration UI issues https://issues.jboss.org/browse/JBIDE-10854 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RemoveConnectionActionProvider.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RemoveConnectionActionProvider.java 2012-02-14 16:11:11 UTC (rev 38709) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RemoveConnectionActionProvider.java 2012-02-14 16:16:44 UTC (rev 38710) @@ -31,7 +31,7 @@ public static class DeleteConnectionAction extends AbstractAction { public DeleteConnectionAction() { - super("Delete Connection"); + super("Disconnect"); } @Override Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-14 16:11:11 UTC (rev 38709) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-14 16:16:44 UTC (rev 38710) @@ -25,6 +25,8 @@ import org.eclipse.core.databinding.observable.value.ValueChangeEvent; import org.eclipse.core.databinding.validation.MultiValidator; import org.eclipse.core.databinding.validation.ValidationStatus; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -767,11 +769,10 @@ "The application name must not contain spaces."); } } - for (IApplication application : pageModel.getExistingApplications()) { - if (application.getName().equalsIgnoreCase(applicationName)) { - return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, - "An application with the same name already exists on OpenShift."); - } + final IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(applicationName); + if(project.exists()) { + return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, + "A project with the same name already exists in the workspace."); } return ValidationStatus.ok(); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2012-02-14 16:11:11 UTC (rev 38709) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2012-02-14 16:16:44 UTC (rev 38710) @@ -61,7 +61,7 @@ private Text passwordText = null; public CredentialsWizardPage(IWizard wizard, IUserAwareModel wizardModel) { - super("Server connection", "Please provide your OpenShift Express credentials.", "Server Connection", + super("OpenShift Connection", "Please provide your OpenShift Express credentials.", "Server Connection", wizard); this.pageModel = new CredentialsWizardPageModel(wizardModel); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java 2012-02-14 16:11:11 UTC (rev 38709) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java 2012-02-14 16:16:44 UTC (rev 38710) @@ -59,7 +59,7 @@ private Text existingProjectNameText = null; public ProjectAndServerAdapterSettingsWizardPage(IWizard wizard, IOpenShiftExpressWizardModel wizardModel) { - super("Setup Project", + super("Setup Project for OpenShift application '" + wizardModel.getApplicationName() + "'", "Configure your project and server adapter settings, then click 'next' or 'finish'.", "Project Configuration", wizard); this.pageModel = new ProjectAndServerAdapterSettingsWizardPageModel(wizardModel); @@ -96,7 +96,7 @@ // existing project Label existingProjectLabel = new Label(projectGroup, SWT.NONE); - existingProjectLabel.setText("Use the existing project"); + existingProjectLabel.setText("Use existing project:"); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).span(1, 1).grab(false, false) .indent(10, 0).applyTo(existingProjectLabel); @@ -137,7 +137,7 @@ adapter.setProposals(getOpenProjectsInWorkspace()); Button browseProjectsButton = new Button(projectGroup, SWT.NONE); - browseProjectsButton.setText("Browse"); + browseProjectsButton.setText("Browse..."); GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).span(1, 1).grab(false, false) .applyTo(browseProjectsButton); browseProjectsButton.addSelectionListener(onBrowseProjects()); @@ -198,7 +198,7 @@ GridLayoutFactory.fillDefaults().numColumns(3).spacing(12, 8).applyTo(c); final Button serverAdapterCheckbox = new Button(c, SWT.CHECK); - serverAdapterCheckbox.setText("Create a new Server Adapter"); + serverAdapterCheckbox.setText("Create and setup a server for easy publishing"); serverAdapterCheckbox .setToolTipText("This Server Adapter will let you publish your local changes onto OpenShift, right from your Eclipse workbench."); GridDataFactory.fillDefaults().span(3, 1).align(SWT.FILL, SWT.CENTER).grab(true, false)