[jbosstools-commits] JBoss Tools SVN: r40965 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2012-05-11 18:20:12 -0400 (Fri, 11 May 2012)
New Revision: 40965

Modified:
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeStrategy.java
Log:
[JBIDE-10852] corrected corrected removal strategy for mongo (remove 10gen, rockmongo)

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeStrategy.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeStrategy.java	2012-05-11 22:02:41 UTC (rev 40964)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeStrategy.java	2012-05-11 22:20:12 UTC (rev 40965)
@@ -220,28 +220,30 @@
 	}
 
 	private void removeMongoDb() throws OpenShiftException, SocketTimeoutException {
+		boolean removeMongoDb = true;
 		if (viewer.getChecked(IEmbeddableCartridge.ROCKMONGO_11)) {
 			if (MessageDialog.openQuestion(getShell(), "Remove MongoDB cartridge",
 					"If you remove the MongoDB cartridge, you'd also have to remove RockMongo.")) {
 				pageModel.unselectEmbeddedCartridges(IEmbeddableCartridge.ROCKMONGO_11);
 				viewer.setChecked(IEmbeddableCartridge.ROCKMONGO_11, false);
 			} else {
-				viewer.setChecked(IEmbeddableCartridge.MONGODB_20, true);
+				removeMongoDb = false;
 			}
 		} 
 		
-		if (!viewer.getChecked(IEmbeddableCartridge.MONGODB_20) // mongo to be removed?
+		if (removeMongoDb // mongo to be removed?
 				&& viewer.getChecked(IEmbeddableCartridge._10GEN_MMS_AGENT_01)) {
 			if (MessageDialog.openQuestion(getShell(), "Remove MongoDB cartridge",
 					"If you remove the MongoDB cartridge, you'd also have to remove 10gen MMS agent.")) {
 				pageModel.unselectEmbeddedCartridges(IEmbeddableCartridge._10GEN_MMS_AGENT_01);
 				viewer.setChecked(IEmbeddableCartridge._10GEN_MMS_AGENT_01, false);
 			} else {
-				viewer.setChecked(IEmbeddableCartridge.MONGODB_20, true);
+				removeMongoDb = false;
 			}
 		}
 		
-		if (!viewer.getChecked(IEmbeddableCartridge.MONGODB_20)) { // mongo to be removed?
+		viewer.setChecked(IEmbeddableCartridge.MONGODB_20, !removeMongoDb);
+		if (removeMongoDb) { // mongo to be removed?
 			pageModel.unselectEmbeddedCartridges(IEmbeddableCartridge.MONGODB_20);
 		}
 	}