[jbosstools-commits] JBoss Tools SVN: r24357 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/internal/deltacloud/ui/wizards and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: jjohnstn
Date: 2010-08-20 18:11:13 -0400 (Fri, 20 Aug 2010)
New Revision: 24357

Modified:
   trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
   trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java
   trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java
   trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java
Log:
2010-08-20  Jeff Johnston  <jjohnstn at redhat.com>

	* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java (performFinish): Store the
	type of cloud connection when it is created for real.
	* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java (getType): New method.
	* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java (performFinish): Return true on
	failure so dialog closes. 



Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog	2010-08-20 22:05:26 UTC (rev 24356)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog	2010-08-20 22:11:13 UTC (rev 24357)
@@ -1,3 +1,11 @@
+2010-08-20  Jeff Johnston  <jjohnstn at redhat.com>
+
+	* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java (performFinish): Store the
+	type of cloud connection when it is created for real.
+	* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java (getType): New method.
+	* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java (performFinish): Return true on
+	failure so dialog closes. 
+
 2010-08-19  Jeff Johnston  <jjohnstn at redhat.com>
 
 	* META-INF/MANIFEST.MF: Add dependency on rse.
@@ -7,7 +15,7 @@
 	RSE action. 
 	(fillContextMenu): Add connect to RSE action skeleton and enable/disable depending on instance
 	state. 
-
+	
 2010-08-18  Jeff Johnston  <jjohnstn at redhat.com>
 
 	* src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java (listChanged): Get

Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java	2010-08-20 22:05:26 UTC (rev 24356)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java	2010-08-20 22:11:13 UTC (rev 24357)
@@ -56,8 +56,9 @@
 		String url = mainPage.getURL();
 		String username = mainPage.getUsername();
 		String password = mainPage.getPassword();
+		String type = mainPage.getType();
 		try {
-			DeltaCloud newCloud = new DeltaCloud(name, url, username, password, true);
+			DeltaCloud newCloud = new DeltaCloud(name, url, username, password, type, true);
 			DeltaCloudManager.getDefault().addCloud(newCloud);
 		} catch (MalformedURLException e) {
 			Activator.log(e);

Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java	2010-08-20 22:05:26 UTC (rev 24356)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionPage.java	2010-08-20 22:11:13 UTC (rev 24357)
@@ -154,6 +154,10 @@
 		return password;
 	}
 	
+	public String getType() {
+		return typeText.getText();
+	}
+	
 	private void validate() {
 		boolean complete = true;
 		boolean errorFree = true;

Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java	2010-08-20 22:05:26 UTC (rev 24356)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstance.java	2010-08-20 22:11:13 UTC (rev 24357)
@@ -16,7 +16,6 @@
 import org.jboss.tools.deltacloud.core.DeltaCloudException;
 import org.jboss.tools.deltacloud.core.DeltaCloudImage;
 import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
-import org.jboss.tools.deltacloud.core.DeltaCloudManager;
 import org.jboss.tools.deltacloud.ui.Activator;
 import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants;
 import org.osgi.service.prefs.Preferences;
@@ -160,7 +159,7 @@
 					WizardMessages.getFormattedString(CREATE_INSTANCE_FAILURE_MSG, new String[] {name, imageId, realmId, profileId}),
 					new Status(IStatus.ERROR, Activator.PLUGIN_ID, errorMessage));
 		}
-		return result;
+		return true;
 	}
 
 }