Author: adietish Date: 2012-02-14 17:10:59 -0500 (Tue, 14 Feb 2012) New Revision: 38728 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/ApplicationConfigurationWizardPageModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java Log: [JBIDE-10901] fixing erroneous state when running wizard from console ("Import application") 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 20:11:40 UTC (rev 38727) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-14 22:10:59 UTC (rev 38728) @@ -36,6 +36,7 @@ import org.eclipse.jface.databinding.swt.WidgetProperties; import org.eclipse.jface.databinding.viewers.ViewerProperties; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IInputValidator; import org.eclipse.jface.dialogs.InputDialog; @@ -99,12 +100,18 @@ private Button useExistingAppBtn; private Text existingAppNameText; private Button browseAppsButton; - private Text newApplicationNameText; + private Group appConfigurationGroup; public ApplicationConfigurationWizardPage(IWizard wizard, OpenShiftExpressApplicationWizardModel wizardModel) { super("Setup OpenShift Application", "Select an existing or create a new OpenShift Express Application.", "Setup OpenShift Application", wizard); - this.pageModel = new ApplicationConfigurationWizardPageModel(wizardModel); + try { + this.pageModel = new ApplicationConfigurationWizardPageModel(wizardModel); + } catch (OpenShiftException e) { + IStatus status = OpenShiftUIActivator.createErrorStatus(e.getMessage(), e); + OpenShiftUIActivator.log(status); + ErrorDialog.openError(getShell(), "Error", "Error initializing application configuration page", status); + } } @Override @@ -127,38 +134,29 @@ useExistingAppBtn.setText("Use existing application:"); useExistingAppBtn.setToolTipText("Select an existing application or uncheck to create a new one."); useExistingAppBtn.setFocus(); - GridDataFactory.fillDefaults().span(1, 1).align(SWT.FILL, SWT.CENTER).grab(false, false) - .applyTo(useExistingAppBtn); - final IObservableValue useExistingAppObservable = BeanProperties.value( - ApplicationConfigurationWizardPageModel.PROPERTY_USE_EXISTING_APPLICATION).observe(pageModel); - final ISWTObservableValue useExistingAppBtnSelection = WidgetProperties.selection().observe(useExistingAppBtn); + GridDataFactory.fillDefaults() + .span(1, 1).align(SWT.FILL, SWT.CENTER).grab(false, false).applyTo(useExistingAppBtn); + IObservableValue useExistingAppObservable = + BeanProperties.value(ApplicationConfigurationWizardPageModel.PROPERTY_USE_EXISTING_APPLICATION) + .observe(pageModel); + final IObservableValue useExistingAppBtnSelection = + WidgetProperties.selection().observe(useExistingAppBtn); dbc.bindValue(useExistingAppBtnSelection, useExistingAppObservable); // existing app name this.existingAppNameText = new Text(existingAppSelectionGroup, SWT.BORDER); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).span(1, 1).grab(true, false) .applyTo(existingAppNameText); - final IObservableValue existingAppNameModelObservable = + IObservableValue existingAppNameTextObservable = + WidgetProperties.text(SWT.Modify).observe(existingAppNameText); + IObservableValue existingAppNameModelObservable = BeanProperties.value( ApplicationConfigurationWizardPageModel.PROPERTY_EXISTING_APPLICATION_NAME).observe(pageModel); - final ISWTObservableValue existingAppNameTextObservable = - WidgetProperties.text(SWT.Modify).observe(existingAppNameText); ValueBindingBuilder .bind(existingAppNameTextObservable) .to(existingAppNameModelObservable) .in(dbc); - if (pageModel.getExistingApplicationName() != null) { - existingAppNameText.setText(pageModel.getExistingApplicationName()); - } - // move focus to the project name text control when choosing the 'Use an - // existing project' option. - useExistingAppBtn.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - existingAppNameText.setFocus(); - existingAppNameText.selectAll(); - } - }); + UIUtils.focusOnSelection(useExistingAppBtn, existingAppNameText); createContentAssist(existingAppNameText); this.browseAppsButton = new Button(existingAppSelectionGroup, SWT.NONE); @@ -177,7 +175,8 @@ new ApplicationToSelectNameValidator( useExistingAppBtnSelection, existingAppNameTextObservable, existingAppsObservable); dbc.addValidationStatusProvider(existingAppValidator); - ControlDecorationSupport.create(existingAppValidator, SWT.LEFT | SWT.TOP, null, new CustomControlDecorationUpdater(false)); + ControlDecorationSupport.create( + existingAppValidator, SWT.LEFT | SWT.TOP, null, new CustomControlDecorationUpdater(false)); return existingAppSelectionGroup; } @@ -223,22 +222,28 @@ } private void createApplicationConfigurationGroup(Composite parent, DataBindingContext dbc) { - Group container = new Group(parent, SWT.NONE); - container.setText("New application"); - GridLayoutFactory.fillDefaults().numColumns(2).margins(6, 6).applyTo(container); - GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).applyTo(container); + this.appConfigurationGroup = new Group(parent, SWT.NONE); + appConfigurationGroup.setText("New application"); + GridLayoutFactory.fillDefaults().numColumns(2).margins(6, 6).applyTo(appConfigurationGroup); + GridDataFactory.fillDefaults() + .grab(true, true).align(SWT.FILL, SWT.FILL).applyTo(appConfigurationGroup); IObservableValue useExistingApplication = BeanProperties .value(ApplicationConfigurationWizardPageModel.PROPERTY_USE_EXISTING_APPLICATION) .observe(pageModel); - enableApplicationWidgets(pageModel.isUseExistingApplication(), container, existingAppNameText, browseAppsButton); + enableApplicationWidgets( + pageModel.isUseExistingApplication() + , appConfigurationGroup + , existingAppNameText + , browseAppsButton); + useExistingApplication.addValueChangeListener( - onUseExistingApplication(container, existingAppNameText, browseAppsButton)); + onUseExistingApplication(appConfigurationGroup, existingAppNameText, browseAppsButton)); - Label applicationNameLabel = new Label(container, SWT.NONE); + Label applicationNameLabel = new Label(appConfigurationGroup, SWT.NONE); applicationNameLabel.setText("Name:"); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).applyTo(applicationNameLabel); - this.newApplicationNameText = new Text(container, SWT.BORDER); + Text newApplicationNameText = new Text(appConfigurationGroup, SWT.BORDER); GridDataFactory.fillDefaults() .grab(true, false).align(SWT.FILL, SWT.FILL).applyTo(newApplicationNameText); UIUtils.selectAllOnFocus(newApplicationNameText); @@ -253,10 +258,10 @@ .to(applicationNameModelObservable) .in(dbc); - Label applicationTypeLabel = new Label(container, SWT.NONE); + Label applicationTypeLabel = new Label(appConfigurationGroup, SWT.NONE); applicationTypeLabel.setText("Type:"); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).span(1, 1).applyTo(applicationTypeLabel); - Combo cartridgesCombo = new Combo(container, SWT.BORDER | SWT.READ_ONLY); + Combo cartridgesCombo = new Combo(appConfigurationGroup, SWT.BORDER | SWT.READ_ONLY); GridDataFactory.fillDefaults() .align(SWT.FILL, SWT.CENTER).span(1, 1).grab(true, false).applyTo(cartridgesCombo); fillCartridgesCombo(dbc, cartridgesCombo); @@ -274,15 +279,17 @@ new NewApplicationNameValidator( useExistingAppBtnSelection, applicationNameTextObservable); dbc.addValidationStatusProvider(newApplicationNameValidator); - ControlDecorationSupport.create(newApplicationNameValidator, SWT.LEFT | SWT.TOP, null, new CustomControlDecorationUpdater()); + ControlDecorationSupport.create(newApplicationNameValidator, SWT.LEFT | SWT.TOP, null, + new CustomControlDecorationUpdater()); final NewApplicationTypeValidator newApplicationTypeValidator = new NewApplicationTypeValidator( useExistingAppBtnSelection, selectedCartridgeComboObservable); dbc.addValidationStatusProvider(newApplicationTypeValidator); - ControlDecorationSupport.create(newApplicationTypeValidator, SWT.LEFT | SWT.TOP, null, new CustomControlDecorationUpdater()); + ControlDecorationSupport.create(newApplicationTypeValidator, SWT.LEFT | SWT.TOP, null, + new CustomControlDecorationUpdater()); // embeddable cartridges - Group cartridgesGroup = new Group(container, SWT.NONE); + Group cartridgesGroup = new Group(appConfigurationGroup, SWT.NONE); cartridgesGroup.setText("Embeddable Cartridges"); GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).span(2, 1).applyTo(cartridgesGroup); GridLayoutFactory.fillDefaults().numColumns(2).margins(6, 6).applyTo(cartridgesGroup); @@ -309,7 +316,7 @@ uncheckAllButton.addSelectionListener(onUncheckAll()); // bottom filler - Composite spacer = new Composite(container, SWT.NONE); + Composite spacer = new Composite(appConfigurationGroup, SWT.NONE); GridDataFactory.fillDefaults() .span(2, 1).align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(spacer); } @@ -637,14 +644,19 @@ public void run() { Display.getDefault().asyncExec(new Runnable() { public void run() { - onPageActivated2(dbc); + loadOpenshiftResources(dbc); + enableApplicationWidgets( + pageModel.isUseExistingApplication() + , appConfigurationGroup + , existingAppNameText + , browseAppsButton); } }); } }.start(); } - protected void onPageActivated2(final DataBindingContext dbc) { + protected void loadOpenshiftResources(final DataBindingContext dbc) { try { WizardUtils.runInWizard(new Job("Loading existing applications...") { @Override @@ -655,12 +667,11 @@ } catch (NotFoundOpenShiftException e) { return Status.OK_STATUS; } catch (Exception e) { - return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "Could not load applications", - e); + return OpenShiftUIActivator.createErrorStatus("Could not load applications", e); } } - }, getContainer(), getDataBindingContext()); + }, getContainer(), dbc); WizardUtils.runInWizard(new Job("Loading application cartridges...") { @Override @@ -671,11 +682,10 @@ } catch (NotFoundOpenShiftException e) { return Status.OK_STATUS; } catch (Exception e) { - return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, - "Could not load application cartridges", e); + return OpenShiftUIActivator.createErrorStatus("Could not load application cartridges", e); } } - }, getContainer(), getDataBindingContext()); + }, getContainer(), dbc); WizardUtils.runInWizard(new Job("Loading embeddable cartridges...") { @Override protected IStatus run(IProgressMonitor monitor) { @@ -685,11 +695,10 @@ } catch (NotFoundOpenShiftException e) { return Status.OK_STATUS; } catch (Exception e) { - return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, - "Could not load embeddable cartridges", e); + return OpenShiftUIActivator.createErrorStatus("Could not load embeddable cartridges", e); } } - }, getContainer(), getDataBindingContext()); + }, getContainer(), dbc); } catch (Exception ex) { // ignore } @@ -697,12 +706,12 @@ class ApplicationToSelectNameValidator extends MultiValidator { - private final ISWTObservableValue useExistingAppBtnbservable; - private final ISWTObservableValue existingAppNameTextObservable; + private final IObservableValue useExistingAppBtnbservable; + private final IObservableValue existingAppNameTextObservable; private final IObservableValue existingAppsObservable; - public ApplicationToSelectNameValidator(ISWTObservableValue useExistingAppBtnbservable, - ISWTObservableValue existingAppNameTextObservable, IObservableValue existingAppsObservable) { + public ApplicationToSelectNameValidator(IObservableValue useExistingAppBtnbservable, + IObservableValue existingAppNameTextObservable, IObservableValue existingAppsObservable) { this.useExistingAppBtnbservable = useExistingAppBtnbservable; this.existingAppNameTextObservable = existingAppNameTextObservable; this.existingAppsObservable = existingAppsObservable; @@ -717,7 +726,7 @@ if (!useExistingApp) { return ValidationStatus.ok(); } - + if (existingApps != null && appName != null && !appName.isEmpty()) { for (IApplication application : pageModel.getExistingApplications()) { if (application.getName().equalsIgnoreCase(appName)) { @@ -760,23 +769,38 @@ return ValidationStatus.ok(); } if (applicationName.isEmpty()) { - return new Status(IStatus.CANCEL, OpenShiftUIActivator.PLUGIN_ID, + return OpenShiftUIActivator.createCancelStatus( "Select an alphanumerical name and a type for the application to create."); } - for (int i = 0; i < applicationName.length(); ++i) { - if (!Character.isLetterOrDigit(applicationName.charAt(i))) { - return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, - "The application name must not contain spaces."); - } + if (!StringUtils.isAlphaNumeric(applicationName)) { + return OpenShiftUIActivator.createErrorStatus( + "The application name must not contain spaces."); } - 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."); + if (isExistingApplication(applicationName)) { + return OpenShiftUIActivator.createErrorStatus( + "An application with the same name already exists on OpenShift."); } + if (isExistingProject(applicationName)) { + return OpenShiftUIActivator.createErrorStatus( + NLS.bind("A project {0} already exists in the workspace.", applicationName)); + } return ValidationStatus.ok(); } + private boolean isExistingApplication(final String applicationName) { + for (IApplication application : pageModel.getExistingApplications()) { + if (application.getName().equalsIgnoreCase(applicationName)) { + return true; + } + } + return false; + } + + private boolean isExistingProject(String name) { + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name); + return project.exists(); + } + @Override public IObservableList getTargets() { WritableList targets = new WritableList(); @@ -784,7 +808,7 @@ return targets; } } - + class NewApplicationTypeValidator extends MultiValidator { private final ISWTObservableValue useExistingAppBtnbservable; @@ -799,12 +823,12 @@ @Override protected IStatus validate() { final boolean useExistingApp = (Boolean) useExistingAppBtnbservable.getValue(); - final String cartridge = (String) cartridgesComboObservable.getValue(); + final String cartridge = (String) cartridgesComboObservable.getValue(); if (useExistingApp) { return ValidationStatus.ok(); } - if(cartridge == null || cartridge.isEmpty()) { - return new Status(IStatus.CANCEL, OpenShiftUIActivator.PLUGIN_ID, + if (cartridge == null || cartridge.isEmpty()) { + return OpenShiftUIActivator.createCancelStatus( "Select an alphanumerical name and a type for the application to create."); } return ValidationStatus.ok(); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-02-14 20:11:40 UTC (rev 38727) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-02-14 22:10:59 UTC (rev 38728) @@ -50,15 +50,18 @@ private List<IApplication> existingApplications = null; private List<ICartridge> cartridges = new ArrayList<ICartridge>(); private List<IEmbeddableCartridge> embeddableCartridges = new ArrayList<IEmbeddableCartridge>(); - private String applicationName; + // private String applicationName; private ICartridge selectedCartridge; - private String selectedApplicationName; - private boolean useExistingApplication; + private String existingApplicationName; - public ApplicationConfigurationWizardPageModel(OpenShiftExpressApplicationWizardModel wizardModel) { + // private boolean useExistingApplication; + + public ApplicationConfigurationWizardPageModel(OpenShiftExpressApplicationWizardModel wizardModel) throws OpenShiftException { this.wizardModel = wizardModel; - setUseExistingApplication(wizardModel.isExistingApplication()); - setExistingApplicationName(wizardModel.getApplication() != null ? wizardModel.getApplication().getName() : null); + setExistingApplication(wizardModel.getApplication()); + // setUseExistingApplication(wizardModel.isExistingApplication()); + // setExistingApplicationName(wizardModel.getApplication() != null ? + // wizardModel.getApplication().getName() : null); } /** @@ -70,7 +73,6 @@ public IUser getUser() { return wizardModel.getUser(); -// return OpenShiftUIActivator.getDefault().getUser(); } public List<IApplication> getApplications() throws OpenShiftException { @@ -96,22 +98,23 @@ } public boolean isUseExistingApplication() { - return this.useExistingApplication; + return wizardModel.isUseExistingApplication(); } public void setUseExistingApplication(boolean useExistingApplication) { - wizardModel.setUseExistingApplication(useExistingApplication); - firePropertyChange(PROPERTY_USE_EXISTING_APPLICATION, this.useExistingApplication, - this.useExistingApplication = useExistingApplication); + firePropertyChange(PROPERTY_USE_EXISTING_APPLICATION + , wizardModel.isUseExistingApplication() + , wizardModel.setUseExistingApplication(useExistingApplication)); } public String getExistingApplicationName() { - return selectedApplicationName; + return existingApplicationName; } public void setExistingApplicationName(String applicationName) { - firePropertyChange(PROPERTY_EXISTING_APPLICATION_NAME, this.selectedApplicationName, - this.selectedApplicationName = applicationName); + firePropertyChange(PROPERTY_EXISTING_APPLICATION_NAME + , existingApplicationName + , this.existingApplicationName = applicationName); } public void loadExistingApplications() throws OpenShiftException { @@ -139,7 +142,7 @@ public void loadCartridges() throws OpenShiftException { setCartridges(getUser().getCartridges()); - //setCartridges(OpenShiftUIActivator.getDefault().getUser().getCartridges()); + // setCartridges(OpenShiftUIActivator.getDefault().getUser().getCartridges()); } public void setCartridges(List<ICartridge> cartridges) { @@ -160,7 +163,8 @@ } public List<IEmbeddableCartridge> loadEmbeddableCartridges() throws OpenShiftException { -// List<IEmbeddableCartridge> cartridges = OpenShiftUIActivator.getDefault().getUser().getEmbeddableCartridges(); + // List<IEmbeddableCartridge> cartridges = + // OpenShiftUIActivator.getDefault().getUser().getEmbeddableCartridges(); List<IEmbeddableCartridge> cartridges = getUser().getEmbeddableCartridges(); setEmbeddableCartridges(cartridges); return cartridges; @@ -189,11 +193,13 @@ public void setApplicationName(String applicationName) { wizardModel.setApplicationName(applicationName); - firePropertyChange(PROPERTY_APPLICATION_NAME, this.applicationName, this.applicationName = applicationName); + firePropertyChange(PROPERTY_APPLICATION_NAME + , wizardModel.getApplicationName() + , wizardModel.setApplicationName(applicationName)); } public String getApplicationName() { - return this.applicationName; + return wizardModel.getApplicationName(); } public void setEmbeddableCartridges(List<IEmbeddableCartridge> cartridges) { Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-02-14 20:11:40 UTC (rev 38727) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-02-14 22:10:59 UTC (rev 38728) @@ -39,7 +39,6 @@ public static final String PROPERTY_NEW_PROJECT = "newProject"; public static final String PROPERTY_CLONE_URI = "cloneUri"; - // public static final String PROPERTY_MERGE_URI = "mergeUri"; public static final String PROPERTY_APPLICATION_URL = "applicationUrl"; public static final String PROPERTY_REPO_PATH = "repositoryPath"; public static final String PROPERTY_REMOTE_NAME = "remoteName"; @@ -79,75 +78,6 @@ return wizardModel.isNewProject(); } - // public void setMergeUri(String mergeUri) { - // firePropertyChange(PROPERTY_MERGE_URI, wizardModel.getMergeUri(), - // wizardModel.setMergeUri(mergeUri)); - // } - // - // public String getMergeUri() { - // return wizardModel.getMergeUri(); - // } - - // public GitUri getKnownMergeUri(String uriOrLabel) { - // GitUri gitUri = null; - // if (isGitUri(uriOrLabel)) { - // gitUri = getKnownMergeUriByUri(uriOrLabel); - // } else { - // gitUri = getKnownMergeUriByLabel(uriOrLabel); - // } - // return gitUri; - // } - - // private boolean isGitUri(String gitUriString) { - // try { - // URIish uriish = new URIish(gitUriString); - // return uriish.isRemote(); - // } catch (URISyntaxException e) { - // return false; - // } - // } - - // private GitUri getKnownMergeUriByUri(String gitUriString) { - // GitUri matchingGitUri = null; - // for (GitUri gitUri : getMergeUris()) { - // if (gitUri.getGitUri().equals(gitUriString)) { - // matchingGitUri = gitUri; - // break; - // } - // } - // return matchingGitUri; - // } - - // private GitUri getKnownMergeUriByLabel(String label) { - // GitUri matchingGitUri = null; - // for (GitUri gitUri : getMergeUris()) { - // if (gitUri.getLabel().equals(label)) { - // matchingGitUri = gitUri; - // break; - // } - // } - // return matchingGitUri; - // } - - // public List<GitUri> getMergeUris() { - // ArrayList<GitUri> mergeUris = new ArrayList<GitUri>(); - // mergeUris.add(new GitUri( - // "seambooking-example", - // "git://github.com/openshift/seambooking-example.git", - // ICartridge.JBOSSAS_7)); - // mergeUris.add(new GitUri( - // "tweetstream-example", - // "git://github.com/openshift/tweetstream-example.git", - // ICartridge.JBOSSAS_7)); - // mergeUris.add(new GitUri( - // "sinatra-example", "git://github.com/openshift/sinatra-example.git", - // new Cartridge("rack-1.1"))); - // mergeUris.add(new GitUri( - // "sugarcrm-example", "git://github.com/openshift/sugarcrm-example.git", - // new Cartridge("php-5.3"))); - // return mergeUris; - // } - public void loadGitUri() throws OpenShiftException { setLoading(true); setCloneUri("Loading..."); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java 2012-02-14 20:11:40 UTC (rev 38727) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java 2012-02-14 22:10:59 UTC (rev 38728) @@ -14,6 +14,7 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.net.URISyntaxException; +import java.util.Set; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; @@ -25,6 +26,7 @@ import com.openshift.express.client.IApplication; import com.openshift.express.client.ICartridge; +import com.openshift.express.client.IEmbeddableCartridge; import com.openshift.express.client.OpenShiftException; /** @@ -37,7 +39,7 @@ 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 USE_EXISTING_APPLICATION = "uswizardModel.getApplicationName()eExistingApplication"; public static final String REMOTE_NAME = "remoteName"; public static final String REPOSITORY_PATH = "repositoryPath"; public static final String PROJECT_NAME = "projectName"; @@ -62,7 +64,7 @@ * @throws InterruptedException * @throws URISyntaxException * @throws InvocationTargetException - * @throws IOException + * @throws IOException */ public void importProject(IProgressMonitor monitor) throws OpenShiftException, CoreException, InterruptedException, URISyntaxException, InvocationTargetException, IOException; @@ -131,14 +133,14 @@ public Object getProperty(String key); -// public void setUser(IUser user); -// -// public IUser getUser(); - public IApplication getApplication(); + public String setApplicationName(String name); + public String getApplicationName(); + public void setApplicationCartridge(ICartridge cartridge); + public ICartridge getApplicationCartridge(); public void setApplication(IApplication application); @@ -162,7 +164,7 @@ public String setProjectName(String projectName); public IProject setProject(IProject project); - + public boolean isGitSharedProject(); public Boolean setCreateServerAdapter(Boolean createServerAdapter); @@ -183,8 +185,15 @@ public void setServerType(IServerType serverType); - public boolean isExistingApplication(); + public boolean isUseExistingApplication(); - public void setUseExistingApplication(boolean useExistingApplication); - + public boolean setUseExistingApplication(boolean useExistingApplication); + + public void addUserToModel(); + + public Set<IEmbeddableCartridge> setSelectedEmbeddableCartridges( + Set<IEmbeddableCartridge> selectedEmbeddableCartridges); + + public Set<IEmbeddableCartridge> getSelectedEmbeddableCartridges(); + } \ 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/OpenShiftExpressApplicationWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-14 20:11:40 UTC (rev 38727) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-14 22:10:59 UTC (rev 38728) @@ -58,8 +58,7 @@ private OpenShiftExpressApplicationWizardModel wizardModel; /** - * @see #getUser which calls UserModel#getRecentUser if no user present at - * construction time + * @see #setUser called by CredentialsWizardPageModel#getValidityStatus */ public OpenShiftExpressApplicationWizard(String wizardTitle) { this(null, null, null, wizardTitle); @@ -156,7 +155,7 @@ @Override public boolean performFinish() { - boolean success = getWizardModel().isExistingApplication(); + boolean success = getWizardModel().isUseExistingApplication(); if (!success) { if (createApplication()) { success = addRemoveCartridges( @@ -187,8 +186,9 @@ private boolean createApplication() { try { + final String applicationName = wizardModel.getApplicationName(); IStatus status = WizardUtils.runInWizard( - new Job(NLS.bind("Creating application \"{0}\"...", getWizardModel().getApplicationName())) { + new Job(NLS.bind("Creating application \"{0}\"...", applicationName)) { @Override protected IStatus run(IProgressMonitor monitor) { try { @@ -197,8 +197,7 @@ } catch (Exception e) { // TODO: refresh user return OpenShiftUIActivator.createErrorStatus( - "Could not create application \"{0}\"", e, getWizardModel() - .getApplicationName()); + "Could not create application \"{0}\"", e, applicationName); } } 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-14 20:11:40 UTC (rev 38727) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-02-14 22:10:59 UTC (rev 38728) @@ -57,7 +57,6 @@ setRemoteName(NEW_PROJECT_REMOTE_NAME_DEFAULT); setServerType(ServerCore.findServerType(ExpressServerUtils.OPENSHIFT_SERVER_TYPE)); setPublicationMode(PUBLISH_SOURCE); - setUseExistingApplication(false); } /** @@ -190,18 +189,6 @@ return dataModel.get(key); } - // @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 IApplication getApplication() { return (IApplication) getProperty(APPLICATION); @@ -209,8 +196,8 @@ @Override public void setApplication(IApplication application) { - setUseExistingApplication(application != null); setProperty(APPLICATION, application); + setUseExistingApplication(application); setApplicationCartridge(application); setApplicationName(application); } @@ -333,15 +320,19 @@ } @Override - public boolean isExistingApplication() { + public boolean isUseExistingApplication() { return (Boolean) getProperty(USE_EXISTING_APPLICATION); } @Override - public void setUseExistingApplication(boolean useExistingApplication) { - setProperty(USE_EXISTING_APPLICATION, useExistingApplication); + public boolean setUseExistingApplication(boolean useExistingApplication) { + return (Boolean) setProperty(USE_EXISTING_APPLICATION, useExistingApplication); } + protected void setUseExistingApplication(IApplication application) { + setUseExistingApplication(application != null); + } + private void waitForAccessible(IApplication application, IProgressMonitor monitor) throws OpenShiftApplicationNotAvailableException, OpenShiftException { // monitor.subTask("waiting for application to become accessible..."); @@ -351,7 +342,7 @@ } } - IApplication createApplication(String name, ICartridge cartridge, IProgressMonitor monitor) + protected IApplication createApplication(String name, ICartridge cartridge, IProgressMonitor monitor) throws OpenShiftApplicationNotAvailableException, OpenShiftException { IUser user = getUser(); if (user == null) { @@ -366,9 +357,9 @@ OpenShiftException { IApplication application = createApplication(getApplicationName(), getApplicationCartridge(), monitor); setApplication(application); - } + @Override public Set<IEmbeddableCartridge> getSelectedEmbeddableCartridges() { @SuppressWarnings("unchecked") Set<IEmbeddableCartridge> selectedEmbeddableCartridges = @@ -380,12 +371,14 @@ return selectedEmbeddableCartridges; } + @Override public Set<IEmbeddableCartridge> setSelectedEmbeddableCartridges( Set<IEmbeddableCartridge> selectedEmbeddableCartridges) { dataModel.put(KEY_SELECTED_EMBEDDABLE_CARTRIDGES, selectedEmbeddableCartridges); return selectedEmbeddableCartridges; } + @Override public void setApplicationCartridge(ICartridge cartridge) { dataModel.put(APPLICATION_CARTRIDGE, cartridge); } @@ -397,12 +390,14 @@ dataModel.put(APPLICATION_CARTRIDGE, application.getCartridge()); } + @Override public ICartridge getApplicationCartridge() { return (ICartridge) dataModel.get(APPLICATION_CARTRIDGE); } - public void setApplicationName(String applicationName) { - dataModel.put(APPLICATION_NAME, applicationName); + @Override + public String setApplicationName(String applicationName) { + return (String) dataModel.put(APPLICATION_NAME, applicationName); } protected void setApplicationName(IApplication application) { @@ -417,15 +412,18 @@ return (String) dataModel.get(APPLICATION_NAME); } + @Override public IUser getUser() { return (IUser) dataModel.get(USER); } + @Override public IUser setUser(IUser user) { dataModel.put(USER, user); return user; } + @Override public void addUserToModel() { IUser user = getUser(); Assert.isNotNull(user);