Author: adietish Date: 2012-02-10 17:54:43 -0500 (Fri, 10 Feb 2012) New Revision: 38626 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/CreateNewApplicationWizard.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizardModel.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-10847] fixed various bugs, setting application name & cartridge if existing app is selected. Checking embedded cartridges is not functional yet 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-10 22:48:07 UTC (rev 38625) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-10 22:54:43 UTC (rev 38626) @@ -11,11 +11,12 @@ package org.jboss.tools.openshift.express.internal.ui.wizard; import java.util.Collection; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.UpdateListStrategy; -import org.eclipse.core.databinding.UpdateValueStrategy; import org.eclipse.core.databinding.beans.BeanProperties; import org.eclipse.core.databinding.conversion.Converter; import org.eclipse.core.databinding.observable.list.IObservableList; @@ -32,6 +33,7 @@ import org.eclipse.jface.databinding.fieldassist.ControlDecorationSupport; import org.eclipse.jface.databinding.swt.ISWTObservableValue; 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.IDialogConstants; import org.eclipse.jface.dialogs.IInputValidator; @@ -72,10 +74,8 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.Text; import org.jboss.tools.common.ui.WizardUtils; -import org.jboss.tools.common.ui.databinding.InvertingBooleanConverter; import org.jboss.tools.common.ui.databinding.ValueBindingBuilder; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -import org.jboss.tools.openshift.express.internal.ui.utils.Logger; import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils; import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils; import org.jboss.tools.openshift.express.internal.ui.wizard.CreationLogDialog.LogEntry; @@ -98,6 +98,7 @@ private Button useExistingAppBtn; private Text existingAppNameText; private Button browseAppsButton; + private Text newApplicationNameText; public ApplicationConfigurationWizardPage(IWizard wizard, OpenShiftExpressApplicationWizardModel wizardModel) { super("Application Configuration", "Configure the application you want\nto create or import.", @@ -140,7 +141,10 @@ ApplicationConfigurationWizardPageModel.PROPERTY_EXISTING_APPLICATION_NAME).observe(pageModel); final ISWTObservableValue existingAppNameTextObservable = WidgetProperties.text(SWT.Modify).observe( existingAppNameText); - ValueBindingBuilder.bind(existingAppNameTextObservable).to(existingAppNameModelObservable).in(dbc); + ValueBindingBuilder + .bind(existingAppNameTextObservable) + .to(existingAppNameModelObservable) + .in(dbc); if (pageModel.getExistingApplicationName() != null) { existingAppNameText.setText(pageModel.getExistingApplicationName()); } @@ -158,15 +162,18 @@ this.browseAppsButton = new Button(existingAppSelectionGroup, SWT.NONE); browseAppsButton.setText("Browse"); browseAppsButton.addSelectionListener(onBrowseApps()); - GridDataFactory.fillDefaults().align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).span(1, 1).grab(false, false) + GridDataFactory.fillDefaults() + .align(SWT.LEFT, SWT.CENTER).hint(100, SWT.DEFAULT).span(1, 1).grab(false, false) .applyTo(browseAppsButton); // observe the list of application, get notified once they have been // loaded - final IObservableValue existingAppsObservable = BeanProperties.value( - ApplicationConfigurationWizardPageModel.PROPERTY_EXISTING_APPLICATIONS).observe(pageModel); + final IObservableValue existingAppsObservable = + BeanProperties.value( + ApplicationConfigurationWizardPageModel.PROPERTY_EXISTING_APPLICATIONS).observe(pageModel); - final ApplicationToSelectNameValidator existingProjectValidator = new ApplicationToSelectNameValidator( - useExistingAppBtnSelection, existingAppNameTextObservable, existingAppsObservable); + final ApplicationToSelectNameValidator existingProjectValidator = + new ApplicationToSelectNameValidator( + useExistingAppBtnSelection, existingAppNameTextObservable, existingAppsObservable); dbc.addValidationStatusProvider(existingProjectValidator); ControlDecorationSupport.create(existingProjectValidator, SWT.LEFT | SWT.TOP); @@ -175,32 +182,17 @@ private void createContentAssist(final Text existingAppNameText) { ControlDecoration dec = new ControlDecoration(existingAppNameText, SWT.TOP | SWT.LEFT); - FieldDecoration contentProposalFieldIndicator = FieldDecorationRegistry.getDefault().getFieldDecoration( - FieldDecorationRegistry.DEC_CONTENT_PROPOSAL); + FieldDecoration contentProposalFieldIndicator = + FieldDecorationRegistry.getDefault().getFieldDecoration(FieldDecorationRegistry.DEC_CONTENT_PROPOSAL); dec.setImage(contentProposalFieldIndicator.getImage()); dec.setDescriptionText("Auto-completion is enabled when you start typing a project name."); dec.setShowOnlyOnFocus(true); - AutoCompleteField adapter = new AutoCompleteField(existingAppNameText, new TextContentAdapter(), - new String[] {}); - adapter.setProposals(getApplicationNames()); + AutoCompleteField adapter = + new AutoCompleteField(existingAppNameText, new TextContentAdapter(), new String[] {}); + adapter.setProposals(pageModel.getApplicationNames()); } - private String[] getApplicationNames() { - try { - List<IApplication> applications; - applications = pageModel.getApplications(); - String[] names = new String[applications.size()]; - for (int i = 0; i < applications.size(); i++) { - names[i] = applications.get(i).getName(); - } - return names; - } catch (OpenShiftException e) { - Logger.error("Failed to retrieve list of OpenShift applications", e); - } - return new String[0]; - } - private SelectionListener onBrowseApps() { return new SelectionListener() { @@ -212,7 +204,18 @@ if (result == IDialogConstants.OK_ID) { final IApplication selectedApplication = appSelectionDialog.getSelectedApplication(); if (selectedApplication != null) { - pageModel.setExistingApplicationName(selectedApplication.getName()); + try { + pageModel.setApplicationName(selectedApplication.getName()); + newApplicationNameText.setText(selectedApplication.getName()); + pageModel.setSelectedCartridge(selectedApplication.getCartridge()); + Set<IEmbeddableCartridge> embeddedCartridges = new HashSet<IEmbeddableCartridge>(); + embeddedCartridges.addAll(selectedApplication.getEmbeddedCartridges()); + pageModel.setSelectedEmbeddableCartridges(embeddedCartridges); + } catch (OpenShiftException ex) { + OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(NLS.bind( + "Could not get embedded cartridges for application {0}", + selectedApplication.getName()), ex)); + } } } } @@ -229,9 +232,9 @@ GridLayoutFactory.fillDefaults().numColumns(2).margins(6, 6).applyTo(container); GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).applyTo(container); - IObservableValue useExistingApplication = - BeanProperties.value(ApplicationConfigurationWizardPageModel.PROPERTY_USE_EXISTING_APPLICATION) - .observe(pageModel); + IObservableValue useExistingApplication = BeanProperties + .value(ApplicationConfigurationWizardPageModel.PROPERTY_USE_EXISTING_APPLICATION) + .observe(pageModel); enableApplicationWidgets(pageModel.isUseExistingApplication(), container, existingAppNameText, browseAppsButton); useExistingApplication.addValueChangeListener( onUseExistingApplication(container, existingAppNameText, browseAppsButton)); @@ -239,37 +242,41 @@ Label applicationNameLabel = new Label(container, SWT.NONE); applicationNameLabel.setText("Name:"); GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).applyTo(applicationNameLabel); - Text applicationNameText = new Text(container, SWT.BORDER); - GridDataFactory.fillDefaults().grab(true, false).align(SWT.FILL, SWT.FILL).applyTo(applicationNameText); - UIUtils.selectAllOnFocus(applicationNameText); - final IObservableValue applicationNameModelObservable = BeanProperties.value( - ApplicationConfigurationWizardPageModel.PROPERTY_APPLICATION_NAME).observe(pageModel); - final ISWTObservableValue applicationNameTextObservable = WidgetProperties.text(SWT.Modify).observe( - applicationNameText); - dbc.bindValue(applicationNameTextObservable, applicationNameModelObservable); - IObservableValue useExistingObservable = BeanProperties.value( - ApplicationConfigurationWizardPageModel.PROPERTY_USE_EXISTING_APPLICATION).observe(pageModel); + this.newApplicationNameText = new Text(container, SWT.BORDER); + GridDataFactory.fillDefaults() + .grab(true, false).align(SWT.FILL, SWT.FILL).applyTo(newApplicationNameText); + UIUtils.selectAllOnFocus(newApplicationNameText); + final ISWTObservableValue applicationNameTextObservable = + WidgetProperties.text(SWT.Modify).observe(newApplicationNameText); + final IObservableValue applicationNameModelObservable = + BeanProperties + .value(ApplicationConfigurationWizardPageModel.PROPERTY_APPLICATION_NAME) + .observe(pageModel); + ValueBindingBuilder + .bind(applicationNameTextObservable) + .to(applicationNameModelObservable) + .in(dbc); Label applicationTypeLabel = new Label(container, 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); - GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).span(1, 1).grab(true, false) - .applyTo(cartridgesCombo); + GridDataFactory.fillDefaults() + .align(SWT.FILL, SWT.CENTER).span(1, 1).grab(true, false).applyTo(cartridgesCombo); fillCartridgesCombo(dbc, cartridgesCombo); - final ISWTObservableValue cartridgesComboObservable = WidgetProperties.selection().observe(cartridgesCombo); - final IObservableValue selectedCartridgeModelObservable = BeanProperties.value( - NewApplicationWizardPageModel.PROPERTY_SELECTED_CARTRIDGE).observe(pageModel); - dbc.bindValue(cartridgesComboObservable, selectedCartridgeModelObservable, - new UpdateValueStrategy().setConverter(new StringToCartridgeConverter()), - new UpdateValueStrategy().setConverter(new CartridgeToStringConverter())); - ValueBindingBuilder.bind(WidgetProperties.enabled().observe(cartridgesCombo)) - .notUpdating(useExistingObservable).converting(new InvertingBooleanConverter()).in(dbc); + final ISWTObservableValue selectedCartridgeComboObservable = + WidgetProperties.selection().observe(cartridgesCombo); + final IObservableValue selectedCartridgeModelObservable = + BeanProperties.value(NewApplicationWizardPageModel.PROPERTY_SELECTED_CARTRIDGE).observe(pageModel); + ValueBindingBuilder + .bind(selectedCartridgeComboObservable).converting(new StringToCartridgeConverter()) + .to(selectedCartridgeModelObservable).converting(new CartridgeToStringConverter()) + .in(dbc); + final ISWTObservableValue useExistingAppBtnSelection = WidgetProperties.selection().observe(useExistingAppBtn); - - final ApplicationToCreateInputValidator applicationInputValidator = new ApplicationToCreateInputValidator( - useExistingAppBtnSelection, - applicationNameTextObservable, cartridgesComboObservable); + final ApplicationToCreateInputValidator applicationInputValidator = + new ApplicationToCreateInputValidator( + useExistingAppBtnSelection, applicationNameTextObservable, selectedCartridgeComboObservable); dbc.addValidationStatusProvider(applicationInputValidator); /* * final ApplicationToSelectNameValidator applicationNameValidator = new @@ -286,25 +293,30 @@ GridLayoutFactory.fillDefaults().numColumns(2).margins(6, 6).applyTo(cartridgesGroup); Composite tableContainer = new Composite(cartridgesGroup, SWT.NONE); - GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).span(1, 2).hint(400, 250) - .applyTo(tableContainer); + GridDataFactory.fillDefaults() + .align(SWT.FILL, SWT.FILL).grab(true, true).span(1, 2).hint(400, 250).applyTo(tableContainer); this.viewer = createTable(tableContainer); + dbc.bindSet( + ViewerProperties.checkedElements(IEmbeddableCartridge.class).observe(viewer), + BeanProperties.set(ApplicationConfigurationWizardPageModel.PROPERTY_SELECTED_EMBEDDABLE_CARTRIDGES) + .observe(pageModel)); Button checkAllButton = new Button(cartridgesGroup, SWT.PUSH); checkAllButton.setText("&Select All"); - GridDataFactory.fillDefaults().hint(110, SWT.DEFAULT).grab(false, false).align(SWT.FILL, SWT.TOP) - .applyTo(checkAllButton); + GridDataFactory.fillDefaults(). + hint(110, SWT.DEFAULT).grab(false, false).align(SWT.FILL, SWT.TOP).applyTo(checkAllButton); checkAllButton.addSelectionListener(onCheckAll()); Button uncheckAllButton = new Button(cartridgesGroup, SWT.PUSH); uncheckAllButton.setText("&Deselect All"); - GridDataFactory.fillDefaults().hint(110, SWT.DEFAULT).grab(false, true).align(SWT.FILL, SWT.TOP) - .applyTo(uncheckAllButton); + GridDataFactory.fillDefaults() + .hint(110, SWT.DEFAULT).grab(false, true).align(SWT.FILL, SWT.TOP).applyTo(uncheckAllButton); uncheckAllButton.addSelectionListener(onUncheckAll()); // bottom filler Composite spacer = new Composite(container, SWT.NONE); - GridDataFactory.fillDefaults().span(2, 1).align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(spacer); + GridDataFactory.fillDefaults() + .span(2, 1).align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(spacer); } private IValueChangeListener onUseExistingApplication(final Group applicationConfigurationGroup, @@ -473,7 +485,7 @@ } private void removeMySQLCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException { - List<IEmbeddableCartridge> checkedCartridges = pageModel.getSelectedEmbeddableCartridges(); + Set<IEmbeddableCartridge> checkedCartridges = pageModel.getSelectedEmbeddableCartridges(); if (viewer.getChecked(IEmbeddableCartridge.PHPMYADMIN_34)) { if (MessageDialog.openQuestion(getShell(), "Remove phpmyadmin cartridge", "If you remove the mysql cartridge, you'd also have to remove phpmyadmin.")) { @@ -721,12 +733,6 @@ } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.core.databinding.validation.MultiValidator#getTargets() - */ @Override public IObservableList getTargets() { WritableList targets = new WritableList(); @@ -770,12 +776,6 @@ return ValidationStatus.ok(); } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.core.databinding.validation.MultiValidator#getTargets() - */ @Override public IObservableList getTargets() { WritableList targets = new WritableList(); 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-10 22:48:07 UTC (rev 38625) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-02-10 22:54:43 UTC (rev 38626) @@ -13,10 +13,12 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; import com.openshift.express.client.IApplication; import com.openshift.express.client.ICartridge; @@ -25,7 +27,7 @@ import com.openshift.express.client.OpenShiftException; /** - * @author Andr� Dietisheim + * @author Andre Dietisheim * @author Xavier Coulon * */ @@ -35,13 +37,15 @@ public static final String PROPERTY_EXISTING_APPLICATION_NAME = "existingApplicationName"; public static final String PROPERTY_CARTRIDGES = "cartridges"; public static final String PROPERTY_EMBEDDABLE_CARTRIDGES = "embeddableCartridges"; + public static final String PROPERTY_SELECTED_EMBEDDABLE_CARTRIDGES = "selectedEmbeddableCartridges"; public static final String PROPERTY_SELECTED_CARTRIDGE = "selectedCartridge"; public static final String PROPERTY_APPLICATION_NAME = "applicationName"; public static final String PROPERTY_EXISTING_APPLICATIONS = "existingApplications"; private final OpenShiftExpressApplicationWizardModel wizardModel; - // start with a null value as a marker of non-initialized state (used during first pass validation) + // start with a null value as a marker of non-initialized state (used during + // first pass validation) private List<IApplication> existingApplications = null; private List<ICartridge> cartridges = new ArrayList<ICartridge>(); private List<IEmbeddableCartridge> embeddableCartridges = new ArrayList<IEmbeddableCartridge>(); @@ -76,6 +80,20 @@ return user.getApplications(); } + public String[] getApplicationNames() { + try { + List<IApplication> applications = getApplications(); + String[] applicationNames = new String[applications.size()]; + for (int i = 0; i < applications.size(); i++) { + applicationNames[i] = applications.get(i).getName(); + } + return applicationNames; + } catch (OpenShiftException e) { + Logger.error("Failed to retrieve list of OpenShift applications", e); + return new String[0]; + } + } + public boolean isUseExistingApplication() { return this.useExistingApplication; } @@ -138,11 +156,9 @@ public void setSelectedCartridge(ICartridge cartridge) { wizardModel.setApplicationCartridge(cartridge); firePropertyChange(PROPERTY_SELECTED_CARTRIDGE, selectedCartridge, this.selectedCartridge = cartridge); - // validateApplicationName(); } public List<IEmbeddableCartridge> loadEmbeddableCartridges() throws OpenShiftException { - // List<IEmbeddableCartridge> cartridges = wizardModel.getUser().getEmbeddableCartridges(); List<IEmbeddableCartridge> cartridges = OpenShiftUIActivator.getDefault().getUser().getEmbeddableCartridges(); setEmbeddableCartridges(cartridges); return cartridges; @@ -158,25 +174,30 @@ } public void setEmbeddableCartridges(List<IEmbeddableCartridge> cartridges) { - firePropertyChange(PROPERTY_EMBEDDABLE_CARTRIDGES, this.embeddableCartridges, - this.embeddableCartridges = cartridges); + firePropertyChange( + PROPERTY_EMBEDDABLE_CARTRIDGES, this.embeddableCartridges, this.embeddableCartridges = cartridges); } public List<IEmbeddableCartridge> getEmbeddableCartridges() { return embeddableCartridges; } - public List<IEmbeddableCartridge> getSelectedEmbeddableCartridges() throws OpenShiftException { + public Set<IEmbeddableCartridge> getSelectedEmbeddableCartridges() throws OpenShiftException { return wizardModel.getSelectedEmbeddableCartridges(); } + public void setSelectedEmbeddableCartridges(Set<IEmbeddableCartridge> selectedEmbeddableCartridges) { + firePropertyChange(PROPERTY_SELECTED_EMBEDDABLE_CARTRIDGES, + wizardModel.getSelectedEmbeddableCartridges(), + wizardModel.setSelectedEmbeddableCartridges(selectedEmbeddableCartridges)); + } + public boolean hasApplication(ICartridge cartridge) { try { - // return wizardModel.getUser().hasApplication(cartridge); return getUser().hasApplication(cartridge); } catch (OpenShiftException e) { - OpenShiftUIActivator.log(OpenShiftUIActivator - .createErrorStatus("Could not get application by cartridge", e)); + OpenShiftUIActivator.log( + OpenShiftUIActivator.createErrorStatus("Could not get application by cartridge", e)); return false; } } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizard.java 2012-02-10 22:48:07 UTC (rev 38625) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizard.java 2012-02-10 22:54:43 UTC (rev 38626) @@ -10,7 +10,9 @@ ******************************************************************************/ package org.jboss.tools.openshift.express.internal.ui.wizard; +import java.util.ArrayList; import java.util.List; +import java.util.Set; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.TimeUnit; @@ -133,12 +135,14 @@ protected IStatus run(IProgressMonitor monitor) { try { - List<IEmbeddableCartridge> selectedCartridges = + Set<IEmbeddableCartridge> selectedCartridges = getWizardModel().getSelectedEmbeddableCartridges(); final IApplication application = getWizardModel().getApplication(); if (selectedCartridges != null && !selectedCartridges.isEmpty()) { - application.addEmbbedCartridges(selectedCartridges); + List<IEmbeddableCartridge> list = new ArrayList<IEmbeddableCartridge>(); + list.addAll(selectedCartridges); + application.addEmbbedCartridges(list); } queue.offer(true); } catch (OpenShiftException e) { Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizardModel.java 2012-02-10 22:48:07 UTC (rev 38625) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizardModel.java 2012-02-10 22:54:43 UTC (rev 38626) @@ -1,7 +1,7 @@ package org.jboss.tools.openshift.express.internal.ui.wizard; -import java.util.ArrayList; -import java.util.List; +import java.util.HashSet; +import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.osgi.util.NLS; @@ -81,11 +81,11 @@ return null; } - public List<IEmbeddableCartridge> getSelectedEmbeddableCartridges() { + public Set<IEmbeddableCartridge> getSelectedEmbeddableCartridges() { @SuppressWarnings("unchecked") - List<IEmbeddableCartridge> selectedEmbeddableCartridges = (List<IEmbeddableCartridge>) dataModel.get(SELECTED_EMBEDDABLE_CARTRIDGES); + Set<IEmbeddableCartridge> selectedEmbeddableCartridges = (Set<IEmbeddableCartridge>) dataModel.get(SELECTED_EMBEDDABLE_CARTRIDGES); if(selectedEmbeddableCartridges == null) { - selectedEmbeddableCartridges = new ArrayList<IEmbeddableCartridge>(); + selectedEmbeddableCartridges = new HashSet<IEmbeddableCartridge>(); dataModel.put(SELECTED_EMBEDDABLE_CARTRIDGES, selectedEmbeddableCartridges); } return selectedEmbeddableCartridges; 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-10 22:48:07 UTC (rev 38625) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-10 22:54:43 UTC (rev 38626) @@ -13,7 +13,9 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.net.URISyntaxException; +import java.util.ArrayList; import java.util.List; +import java.util.Set; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.WorkspaceJob; @@ -151,7 +153,7 @@ } private boolean addRemoveCartridges(final IApplication application, - final List<IEmbeddableCartridge> selectedCartridges) { + final Set<IEmbeddableCartridge> selectedCartridges) { try { IStatus status = WizardUtils.runInWizard( new Job(NLS.bind("Adding selected embedded cartridges for application {0}...", getWizardModel() @@ -162,7 +164,9 @@ try { if (selectedCartridges != null && !selectedCartridges.isEmpty()) { - application.addEmbbedCartridges(selectedCartridges); + List<IEmbeddableCartridge> embeddableCartridges = new ArrayList<IEmbeddableCartridge>(); + embeddableCartridges.addAll(selectedCartridges); + application.addEmbbedCartridges(embeddableCartridges); } } catch (OpenShiftException e) { return OpenShiftUIActivator.createErrorStatus( 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-10 22:48:07 UTC (rev 38625) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-02-10 22:54:43 UTC (rev 38626) @@ -4,9 +4,10 @@ import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.net.URISyntaxException; -import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; @@ -67,8 +68,9 @@ @Override public void importProject(IProgressMonitor monitor) throws OpenShiftException, CoreException, InterruptedException, URISyntaxException, InvocationTargetException { - List<IProject> importedProjects = - new ImportNewProject(getProjectName(), getApplication(), getRemoteName(), getRepositoryFile()).execute(monitor); + List<IProject> importedProjects = + new ImportNewProject(getProjectName(), getApplication(), getRemoteName(), getRepositoryFile()) + .execute(monitor); createServerAdapter(monitor, importedProjects); } @@ -197,12 +199,8 @@ @Override public void setApplication(IApplication application) { + setUseExistingApplication(application != null); setProperty(APPLICATION, application); - if (application == null) { - setUseExistingApplication(false); - } else { - setUseExistingApplication(true); - } setApplicationCartridge(application); setApplicationName(application); } @@ -349,17 +347,22 @@ } - public List<IEmbeddableCartridge> getSelectedEmbeddableCartridges() { + public Set<IEmbeddableCartridge> getSelectedEmbeddableCartridges() { @SuppressWarnings("unchecked") - List<IEmbeddableCartridge> selectedEmbeddableCartridges = (List<IEmbeddableCartridge>) dataModel - .get(KEY_SELECTED_EMBEDDABLE_CARTRIDGES); + Set<IEmbeddableCartridge> selectedEmbeddableCartridges = + (Set<IEmbeddableCartridge>) dataModel.get(KEY_SELECTED_EMBEDDABLE_CARTRIDGES); if (selectedEmbeddableCartridges == null) { - selectedEmbeddableCartridges = new ArrayList<IEmbeddableCartridge>(); - dataModel.put(KEY_SELECTED_EMBEDDABLE_CARTRIDGES, selectedEmbeddableCartridges); + selectedEmbeddableCartridges = new HashSet<IEmbeddableCartridge>(); + setSelectedEmbeddableCartridges(selectedEmbeddableCartridges); } return selectedEmbeddableCartridges; } + public Set<IEmbeddableCartridge> setSelectedEmbeddableCartridges(Set<IEmbeddableCartridge> selectedEmbeddableCartridges) { + dataModel.put(KEY_SELECTED_EMBEDDABLE_CARTRIDGES, selectedEmbeddableCartridges); + return selectedEmbeddableCartridges; + } + public void setApplicationCartridge(ICartridge cartridge) { dataModel.put(APPLICATION_CARTRIDGE, cartridge); }