Author: adietish Date: 2012-02-09 12:03:21 -0500 (Thu, 09 Feb 2012) New Revision: 38575 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftWizardModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 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/ProjectAndServerAdapterSettingsWizardPageModel.java Log: [JBIDE-10842] fixing invisible error: application name was not set in wizard model Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftWizardModel.java 2012-02-09 17:01:39 UTC (rev 38574) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftWizardModel.java 2012-02-09 17:03:21 UTC (rev 38575) @@ -34,6 +34,8 @@ public static final String NEW_PROJECT = "enableProject"; public static final String USER = "user"; public static final String APPLICATION = "application"; + public static final String APPLICATION_NAME = "applicationName"; + public static final String APPLICATION_CARTRIDGE = "applicationCartridge"; public static final String USE_EXISTING_APPLICATION = "useExistingApplication"; public static final String REMOTE_NAME = "remoteName"; public static final String REPOSITORY_PATH = "repositoryPath"; @@ -137,8 +139,6 @@ public ICartridge getApplicationCartridge(); - public String getApplicationCartridgeName(); - public void setApplication(IApplication application); public String setRemoteName(String remoteName); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-02-09 17:01:39 UTC (rev 38574) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-02-09 17:03:21 UTC (rev 38575) @@ -37,11 +37,10 @@ public class OpenShiftExpressApplicationWizardModel extends ObservableUIPojo implements IOpenShiftWizardModel { protected HashMap<String, Object> dataModel = new HashMap<String, Object>(); - + private static final int APP_CREATION_TIMEOUT = 40; private static final String KEY_SELECTED_EMBEDDABLE_CARTRIDGES = "selectedEmbeddableCartridges"; - public OpenShiftExpressApplicationWizardModel() { super(); // default value(s) @@ -54,7 +53,6 @@ setUseExistingApplication(false); } - /** * Imports the project that the user has chosen into the workspace. * @@ -145,7 +143,7 @@ getProjectName() , getApplication() , getRemoteName() -// , getUser()) + // , getUser()) , OpenShiftUIActivator.getDefault().getUser()) .execute(monitor); createServerAdapter(monitor, importedProjects); @@ -180,17 +178,17 @@ return dataModel.get(key); } -// @Override -// public void setUser(IUser user) { -// setProperty(USER, user); -// OpenShiftUIActivator.getDefault().setUser(user); -// } + // @Override + // public void setUser(IUser user) { + // setProperty(USER, user); + // OpenShiftUIActivator.getDefault().setUser(user); + // } -// @Override -// public IUser getUser() { -// return (IUser) getProperty(USER); -// return OpenShiftUIActivator.getDefault().getUser(); -// } + // @Override + // public IUser getUser() { + // return (IUser) getProperty(USER); + // return OpenShiftUIActivator.getDefault().getUser(); + // } @Override public IApplication getApplication() { @@ -198,43 +196,15 @@ } @Override - public String getApplicationName() { - String applicationName = null; - IApplication application = getApplication(); - if (application != null) { - applicationName = application.getName(); - } - return applicationName; - } - - @Override - public ICartridge getApplicationCartridge() { - ICartridge cartridge = null; - IApplication application = getApplication(); - if (application != null) { - cartridge = application.getCartridge(); - } - return cartridge; - } - - @Override - public String getApplicationCartridgeName() { - String cartridgeName = null; - ICartridge cartridge = getApplicationCartridge(); - if (cartridge != null) { - cartridgeName = cartridge.getName(); - } - return cartridgeName; - } - - @Override public void setApplication(IApplication application) { setProperty(APPLICATION, application); - if(application == null) { + if (application == null) { setUseExistingApplication(false); } else { setUseExistingApplication(true); } + setApplicationCartridge(application); + setApplicationName(application); } @Override @@ -291,6 +261,7 @@ private IProject getProject() { return ResourcesPlugin.getWorkspace().getRoot().getProject(getProjectName()); } + @Override public Boolean setCreateServerAdapter(Boolean createServerAdapter) { return (Boolean) setProperty(CREATE_SERVER_ADAPTER, createServerAdapter); @@ -336,24 +307,21 @@ public void setServerType(IServerType serverType) { setProperty(SERVER_TYPE, serverType); } - + private void setPublicationMode(String mode) { setProperty(PUBLICATION_MODE, mode); } - @Override public boolean isExistingApplication() { return (Boolean) getProperty(USE_EXISTING_APPLICATION); } - @Override public void setUseExistingApplication(boolean useExistingApplication) { setProperty(USE_EXISTING_APPLICATION, useExistingApplication); } - private void waitForAccessible(IApplication application, IProgressMonitor monitor) throws OpenShiftApplicationNotAvailableException, OpenShiftException { // monitor.subTask("waiting for application to become accessible..."); @@ -362,8 +330,9 @@ OpenShiftExpressUIMessages.HOSTNAME_NOT_ANSWERING, application.getApplicationUrl())); } } - - IApplication createApplication(String name, ICartridge cartridge, IProgressMonitor monitor) throws OpenShiftApplicationNotAvailableException, OpenShiftException { + + IApplication createApplication(String name, ICartridge cartridge, IProgressMonitor monitor) + throws OpenShiftApplicationNotAvailableException, OpenShiftException { IUser user = OpenShiftUIActivator.getDefault().getUser(); if (user == null) { throw new OpenShiftException("Could not create application, have no valid user credentials"); @@ -372,34 +341,53 @@ waitForAccessible(application, monitor); return application; } - - public void createApplication(IProgressMonitor monitor) throws OpenShiftApplicationNotAvailableException, OpenShiftException { + + public void createApplication(IProgressMonitor monitor) throws OpenShiftApplicationNotAvailableException, + OpenShiftException { IApplication application = createApplication(getApplicationName(), getApplicationCartridge(), monitor); setApplication(application); - + } - public List<IEmbeddableCartridge> getSelectedEmbeddableCartridges() { @SuppressWarnings("unchecked") - List<IEmbeddableCartridge> selectedEmbeddableCartridges = (List<IEmbeddableCartridge>) dataModel.get(KEY_SELECTED_EMBEDDABLE_CARTRIDGES); - if(selectedEmbeddableCartridges == null) { + List<IEmbeddableCartridge> selectedEmbeddableCartridges = (List<IEmbeddableCartridge>) dataModel + .get(KEY_SELECTED_EMBEDDABLE_CARTRIDGES); + if (selectedEmbeddableCartridges == null) { selectedEmbeddableCartridges = new ArrayList<IEmbeddableCartridge>(); dataModel.put(KEY_SELECTED_EMBEDDABLE_CARTRIDGES, selectedEmbeddableCartridges); } return selectedEmbeddableCartridges; } - public void setApplicationCartridge(ICartridge cartridge) { - // TODO Auto-generated method stub - + dataModel.put(APPLICATION_CARTRIDGE, cartridge); } + protected void setApplicationCartridge(IApplication application) { + if (application == null) { + return; + } + dataModel.put(APPLICATION_CARTRIDGE, application.getCartridge()); + } + public ICartridge getApplicationCartridge() { + return (ICartridge) dataModel.get(APPLICATION_CARTRIDGE); + } + public void setApplicationName(String applicationName) { - // TODO Auto-generated method stub - + dataModel.put(APPLICATION_NAME, applicationName); } + protected void setApplicationName(IApplication application) { + if (application == null) { + return; + } + dataModel.put(APPLICATION_NAME, application.getName()); + } + + @Override + public String getApplicationName() { + return (String) dataModel.get(APPLICATION_NAME); + } } \ No newline at end of file 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-09 17:01:39 UTC (rev 38574) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java 2012-02-09 17:03:21 UTC (rev 38575) @@ -263,13 +263,11 @@ protected IStatus validate() { final IStatus existingProjectValidityStatus = (IStatus) existingProjectValidityObservable.getValue(); - if (existingProjectValidityStatus != null) { - final IStatus existingProjectValidity = pageModel.getExistingProjectValidity(); - return existingProjectValidity; + if (existingProjectValidityStatus == null) { + return ValidationStatus.ok(); } - return ValidationStatus.ok(); + return existingProjectValidityStatus; } - } /* Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPageModel.java 2012-02-09 17:01:39 UTC (rev 38574) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPageModel.java 2012-02-09 17:03:21 UTC (rev 38575) @@ -14,11 +14,12 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; /** - * @author Andr� Dietisheim + * @author Andre Dietisheim * @author Xavier Coulon * */ @@ -78,25 +79,29 @@ public IStatus validateExistingProject() { IStatus status = Status.OK_STATUS; - // skip the validation if the user wants to create a new project. The name and state of the existing project do - // not matter... final String applicationName = getApplicationName(); - if (isNewProject() && applicationName != null) { - final IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(applicationName); - if(project.exists()) { - status = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "A project named '" + applicationName + "' already exists in the workspace."); + if (isNewProject()) { + if (applicationName == null) { + status = OpenShiftUIActivator.createErrorStatus("You have to choose an application name"); + } else { + final IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(applicationName); + if(project.exists()) { + status = OpenShiftUIActivator.createErrorStatus( + NLS.bind("A project named {0} already exists in the workspace.", applicationName)); + } } } else { final String projectName = wizardModel.getProjectName(); if (projectName == null || projectName.isEmpty()) { - status = new Status(IStatus.CANCEL, OpenShiftUIActivator.PLUGIN_ID, - "Select an open project in the workspace."); + status = OpenShiftUIActivator.createErrorStatus("Select an open project in the workspace."); } else { final IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); if (!project.exists()) { - status = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "The project does not exist."); + status = OpenShiftUIActivator.createErrorStatus( + NLS.bind("The project {0} does not exist in your workspace.", projectName)); } else if (!project.isOpen()) { - status = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "The project is not open."); + status = OpenShiftUIActivator.createErrorStatus( + NLS.bind("The project {0} is not open.", projectName)); } } }