Author: adietish Date: 2012-02-10 18:12:28 -0500 (Fri, 10 Feb 2012) New Revision: 38632 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/appimport/ConfigureGitSharedProject.java Log: [JBIDE-10847] Embedded cartridges are now check if you select an existing app 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 23:09:04 UTC (rev 38631) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-10 23:12:28 UTC (rev 38632) @@ -11,7 +11,6 @@ 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; @@ -137,10 +136,11 @@ 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 = BeanProperties.value( - ApplicationConfigurationWizardPageModel.PROPERTY_EXISTING_APPLICATION_NAME).observe(pageModel); - final ISWTObservableValue existingAppNameTextObservable = WidgetProperties.text(SWT.Modify).observe( - existingAppNameText); + final 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) @@ -205,12 +205,7 @@ final IApplication selectedApplication = appSelectionDialog.getSelectedApplication(); if (selectedApplication != null) { 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); + pageModel.setExistingApplication(selectedApplication); } catch (OpenShiftException ex) { OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(NLS.bind( "Could not get embedded cartridges for application {0}", 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 23:09:04 UTC (rev 38631) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-02-10 23:12:28 UTC (rev 38632) @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Set; @@ -164,6 +165,19 @@ return cartridges; } + public void setExistingApplication(IApplication application) throws OpenShiftException { + if (application == null) { + return; + } + wizardModel.setApplication(application); + setExistingApplicationName(application.getName()); + setApplicationName(application.getName()); + setSelectedCartridge(application.getCartridge()); + Set<IEmbeddableCartridge> embeddedCartridges = new HashSet<IEmbeddableCartridge>(); + embeddedCartridges.addAll(application.getEmbeddedCartridges()); + setSelectedEmbeddableCartridges(embeddedCartridges); + } + public void setApplicationName(String applicationName) { wizardModel.setApplicationName(applicationName); firePropertyChange(PROPERTY_APPLICATION_NAME, this.applicationName, this.applicationName = applicationName); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-02-10 23:09:04 UTC (rev 38631) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-02-10 23:12:28 UTC (rev 38632) @@ -19,6 +19,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.regex.Pattern; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -28,8 +29,10 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.egit.core.op.AddToIndexOperation; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.transport.RemoteConfig; import org.eclipse.osgi.util.NLS; import org.jboss.ide.eclipse.as.core.util.FileUtil; +import org.jboss.ide.eclipse.as.core.util.RegExUtils; import org.jboss.tools.openshift.egit.core.EGitUtils; import org.jboss.tools.openshift.egit.core.GitIgnore; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; @@ -120,7 +123,12 @@ Repository repository = EGitUtils.getRepository(project); Assert.isTrue(repository != null); - if (EGitUtils.hasRemote(remoteName, repository)) { + RemoteConfig config = EGitUtils.getRemoteByName(remoteName, repository); + if (config != null) { + if (EGitUtils.hasRemoteUrl( + Pattern.compile(RegExUtils.escapeRegex(getApplication().getGitUri())), config)) { + return; + } // we shouldn't get here, the UI should validate the remote name and // inform about an error in this case throw new OpenShiftUIException(