Author: adietish Date: 2010-12-27 17:56:43 -0500 (Mon, 27 Dec 2010) New Revision: 27757 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java Log: [JBIDE-7864] Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-12-27 21:32:12 UTC (rev 27756) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-12-27 22:56:43 UTC (rev 27757) @@ -590,7 +590,7 @@ public static Driver getServerDriver(String url) throws DeltaCloudException { try { - DeltaCloudServerType serverType = new DeltaCloudClientImpl(url, "", "").getServerType(); + DeltaCloudServerType serverType = new DeltaCloudClientImpl(url).getServerType(); return Driver.valueOf(serverType); } catch (Exception e) { // TODO internationalize strings @@ -620,7 +620,7 @@ } catch (DeltaCloudAuthClientException e) { return false; } catch (DeltaCloudClientException e) { - throw new DeltaCloudException("Could not connection to ", e); + throw new DeltaCloudException(MessageFormat.format("Could not connection to cloud \"{0}\" at \"{1}\"", name, url), e); } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2010-12-27 21:32:12 UTC (rev 27756) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2010-12-27 22:56:43 UTC (rev 27757) @@ -95,8 +95,7 @@ this(url, null, null); } - public DeltaCloudClientImpl(String url, String username, String password) - throws DeltaCloudClientException { + public DeltaCloudClientImpl(String url, String username, String password) throws DeltaCloudClientException { this.baseUrl = createUrl(url); this.username = username; this.password = password; @@ -262,16 +261,13 @@ try { String apiResponse = requestStringResponse(new TypeRequest(baseUrl)); Document document = getDocument(apiResponse); - NodeList elements = document - .getElementsByTagName(DOCUMENT_ELEMENT_API); + NodeList elements = document.getElementsByTagName(DOCUMENT_ELEMENT_API); if (elements.getLength() > 0) { Node n = elements.item(0); - Node driver = n.getAttributes().getNamedItem( - DOCUMENT_ELEMENT_DRIVER); + Node driver = n.getAttributes().getNamedItem(DOCUMENT_ELEMENT_DRIVER); if (driver != null) { String driverValue = driver.getNodeValue(); - serverType = DeltaCloudServerType.valueOf(driverValue - .toUpperCase()); + serverType = DeltaCloudServerType.valueOf(driverValue.toUpperCase()); } } } catch (Exception e) { @@ -311,11 +307,13 @@ String response = requestStringResponse( new CreateInstanceRequest(baseUrl, imageId, profileId, realmId, name, keyId, memory, storage)); Instance instance = buildInstance(response); - // TODO: WORKAROUND for https://issues.apache.org/jira/browse/DTACLOUD-11 + // TODO: WORKAROUND for + // https://issues.apache.org/jira/browse/DTACLOUD-11 if (keyId != null) { instance.setKeyId(keyId); } - // TODO: WORKAROUND for https://issues.apache.org/jira/browse/DTACLOUD-11 + // TODO: WORKAROUND for + // https://issues.apache.org/jira/browse/DTACLOUD-11 return instance; } catch (DeltaCloudClientException e) { throw e; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2010-12-27 21:32:12 UTC (rev 27756) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2010-12-27 22:56:43 UTC (rev 27757) @@ -20,6 +20,7 @@ import org.eclipse.core.databinding.DataBindingContext; 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.value.IObservableValue; import org.eclipse.core.databinding.observable.value.IValueChangeListener; import org.eclipse.core.databinding.observable.value.ValueChangeEvent; @@ -267,6 +268,23 @@ } } + private static class TrimTrailingSlashConverter extends Converter { + + public TrimTrailingSlashConverter() { + super(String.class, String.class); + } + + @Override + public Object convert(Object fromObject) { + Assert.isLegal(fromObject instanceof String); + String url = (String) fromObject; + if (url.charAt(url.length() - 1) == '/') { + return url.substring(0, url.length() - 1); + } + return url; + } + } + public CloudConnectionPage(String pageName, CloudConnection cloudConnection) { super(pageName); setDescription(WizardMessages.getString(DESCRIPTION)); @@ -325,7 +343,8 @@ BeanProperties.value( CloudConnectionPageModel.class, CloudConnectionPageModel.PROPERTY_URL).observe(connectionModel), new UpdateValueStrategy() - .setAfterGetValidator(new MandatoryStringValidator(WizardMessages.getString(MUST_ENTER_A_URL))), + .setAfterGetValidator(new MandatoryStringValidator(WizardMessages.getString(MUST_ENTER_A_URL))) + .setConverter(new TrimTrailingSlashConverter()), null); // cloud type Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2010-12-27 21:32:12 UTC (rev 27756) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2010-12-27 22:56:43 UTC (rev 27757) @@ -31,7 +31,7 @@ */ public class NewCloudConnectionWizard extends Wizard implements INewWizard, CloudConnection { - private static final String MAINPAGE_NAME = "NewCloudConnection.name"; //$NON-NLS-1$ + private static final String MAINPAGE_NAME = "CloudConnection.name"; //$NON-NLS-1$ protected CloudConnectionPage mainPage; protected DeltaCloud initialCloud; private String pageTitle; @@ -82,7 +82,7 @@ } public boolean performTest() { - String name = mainPage.getName(); + String name = mainPage.getModel().getName(); String url = mainPage.getModel().getUrl(); String username = mainPage.getModel().getUsername(); String password = mainPage.getModel().getPassword(); @@ -90,7 +90,7 @@ DeltaCloud newCloud = new DeltaCloud(name, url, username, password); return newCloud.testCredentials(); } catch (DeltaCloudException e) { - ErrorUtils.handleError(WizardMessages.getString("CloudConnectionAuthError.title"), + ErrorUtils.handleErrorAsync(WizardMessages.getString("CloudConnectionAuthError.title"), WizardMessages.getFormattedString("CloudConnectionAuthError.message", url), e, getShell()); return true; }