[jbosstools-commits] JBoss Tools SVN: r41441 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui: wizard and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2012-05-25 16:45:26 -0400 (Fri, 25 May 2012)
New Revision: 41441

Modified:
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/EmbedCartridgesJob.java
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
Log:
[JBIDE-12011] now skipping cartridge removal when creating an app

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/EmbedCartridgesJob.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/EmbedCartridgesJob.java	2012-05-25 20:28:24 UTC (rev 41440)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/EmbedCartridgesJob.java	2012-05-25 20:45:26 UTC (rev 41441)
@@ -35,23 +35,35 @@
 	private List<IEmbeddableCartridge> selectedCartridges;
 	private IApplication application;
 	private List<IEmbeddedCartridge> addedCartridges;
+	private boolean dontRemove;
 
-	public EmbedCartridgesJob(List<IEmbeddableCartridge> selectedCartridges, IApplication application) {
+	public EmbedCartridgesJob(List<IEmbeddableCartridge> selectedCartridges, boolean dontRemove,
+			IApplication application) {
 		super(NLS.bind(OpenShiftExpressUIMessages.ADDING_REMOVING_CARTRIDGES, application.getName()));
 		this.selectedCartridges = selectedCartridges;
+		this.dontRemove = dontRemove;
 		this.application = application;
 	}
 
+	public EmbedCartridgesJob(List<IEmbeddableCartridge> selectedCartridges, IApplication application) {
+		this(selectedCartridges, false, application);
+	}
+
 	@Override
 	protected IStatus doRun(IProgressMonitor monitor) {
 		if (monitor.isCanceled()) {
 			return Status.CANCEL_STATUS;
 		}
+
 		try {
-			removeEmbeddedCartridges(
-					getRemovedCartridges(selectedCartridges, application.getEmbeddedCartridges()), application, monitor);
+			if (!dontRemove) {
+				removeEmbeddedCartridges(
+						getRemovedCartridges(selectedCartridges, application.getEmbeddedCartridges()),
+						application, monitor);
+			}
 			this.addedCartridges = addEmbeddedCartridges(
-					getAddedCartridges(selectedCartridges, application.getEmbeddedCartridges()), application, monitor);
+					getAddedCartridges(selectedCartridges, application.getEmbeddedCartridges()), 
+					application, monitor);
 			return Status.OK_STATUS;
 		} catch (OpenShiftException e) {
 			return OpenShiftUIActivator.createErrorStatus("Could not embed cartridges for application {0}", e,

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-05-25 20:28:24 UTC (rev 41440)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java	2012-05-25 20:45:26 UTC (rev 41441)
@@ -57,7 +57,7 @@
 public abstract class OpenShiftExpressApplicationWizard extends Wizard implements IImportWizard, INewWizard {
 
 	private static final int APP_CREATE_TIMEOUT = 2 * 60 * 1000;
-	private static final int APP_WAIT_TIMEOUT = 2 * 60 * 1000;
+	private static final int APP_WAIT_TIMEOUT = 3 * 60 * 1000;
 	private static final long EMBED_CARTRIDGES_TIMEOUT = 2 * 60 * 1000;
 	private static final int IMPORT_TIMEOUT = 1 * 60 * 1000;
 
@@ -141,32 +141,30 @@
 
 	@Override
 	public boolean performFinish() {
-		boolean useExistingApp = getWizardModel().isUseExistingApplication();
-		if (!useExistingApp) {
+		if (!getWizardModel().isUseExistingApplication()) {
 
 			IStatus status = createApplication();
-			if(!processStatus("Creating the application", status)) {
+			if (!processStatus("creating the application", status)) {
 				return false;
 			}
-			
+
 			status = waitForApplication(wizardModel.getApplication());
-			if(!processStatus("Waiting to become reachable", status)) {
+			if (!processStatus("waiting to become reachable", status)) {
 				return false;
 			}
-			
-			if (!addRemoveCartridges(
-					getWizardModel().getApplication(), 
+
+			if (!addCartridges(
+					getWizardModel().getApplication(),
 					getWizardModel().getSelectedEmbeddableCartridges())) {
-					return false;
+				return false;
 			}
 		}
 
-		if (useExistingApp) {
-			useExistingApp = importProject();
-		}
+		boolean success = importProject();
 
 		wizardModel.addUserToModel();
-		return useExistingApp;
+
+		return success;
 	}
 
 	private boolean processStatus(String operation, IStatus status) {
@@ -174,15 +172,16 @@
 			if (AbstractDelegatingMonitorJob.TIMEOUTED_CANCELLED == status.getCode()) {
 				getContainer().getShell().close();
 			} else {
-				new ErrorDialog(getShell(), 
-						NLS.bind("{0} was cancelled", operation), 
-						NLS.bind("{0} timeouted and was canceled", operation), 
-						status, 
+				new ErrorDialog(getShell(),
+						NLS.bind("Operation was cancelled", operation),
+						NLS.bind("we timeouted while {0}. We therefore cancelled the operation", operation),
+						status,
 						IStatus.ERROR | IStatus.WARNING | IStatus.CANCEL | IStatus.INFO)
-				.open();
-				return true;
+						.open();
 			}
-		} else if (!JobUtils.isOk(status)) {
+		}
+
+		if (!JobUtils.isOk(status)) {
 			safeRefreshUser();
 			return false;
 		}
@@ -232,11 +231,12 @@
 		}
 	}
 
-	private boolean addRemoveCartridges(final IApplication application,
+	private boolean addCartridges(final IApplication application,
 			final Set<IEmbeddableCartridge> selectedCartridges) {
 		try {
 			EmbedCartridgesJob job = new EmbedCartridgesJob(
 					new ArrayList<IEmbeddableCartridge>(wizardModel.getSelectedEmbeddableCartridges()),
+					true, // dont remove cartridges
 					wizardModel.getApplication());
 			IStatus result = WizardUtils.runInWizard(job, job.getDelegatingProgressMonitor(), getContainer(),
 					EMBED_CARTRIDGES_TIMEOUT);