Author: adietish Date: 2010-10-11 05:02:28 -0400 (Mon, 11 Oct 2010) New Revision: 25707 Removed: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudType.java Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionModel.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/EditCloudConnection.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java Log: [JBIDE-7282] [JBIDE-7283] [JBIDE-7284] implementing complete validation/enablement handling. Added default texts, added "name already exists" validation. Connection credentials test to be done (imminent) Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionModel.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionModel.java 2010-10-11 08:25:24 UTC (rev 25706) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionModel.java 2010-10-11 09:02:28 UTC (rev 25707) @@ -19,8 +19,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -30,12 +28,7 @@ import org.eclipse.core.databinding.validation.IValidator; import org.eclipse.core.databinding.validation.ValidationStatus; import org.eclipse.core.runtime.Assert; -import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.IJobChangeEvent; -import org.eclipse.core.runtime.jobs.IJobChangeListener; -import org.eclipse.core.runtime.jobs.Job; import org.jboss.tools.deltacloud.ui.common.databinding.ObservablePojo; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -49,7 +42,7 @@ public static final String PROPERTY_NAME = "name"; public static final String PROPERTY_PASSWORD = "password"; public static final String PROPERTY_USERNAME = "username"; - public static final String PROPERTY_CLOUDTYPE = "cloudType"; + public static final String PROPERTY_TYPE = "type"; public static final String UNKNOWN_TYPE_LABEL = "UnknownType.label"; //$NON-NLS-1$ public static final String INVALID_URL = "ErrorInvalidURL.text"; //$NON-NLS-1$ @@ -95,11 +88,10 @@ Document document = db.parse( new InputSource(new StringReader(getXML((InputStream) o)))); - NodeList elements = document.getElementsByTagName(DOCUMENT_ELEMENT_API); //$NON-NLS-1$ + NodeList elements = document.getElementsByTagName(DOCUMENT_ELEMENT_API); if (elements.getLength() > 0) { Node n = elements.item(0); - Node driver = n.getAttributes().getNamedItem( - DOCUMENT_ELEMENT_DRIVER); //$NON-NLS-1$ + Node driver = n.getAttributes().getNamedItem(DOCUMENT_ELEMENT_DRIVER); if (driver != null) { String driverValue = driver.getNodeValue(); cloudType = driverValue.toUpperCase(); @@ -140,7 +132,7 @@ private Object getURLContent(String url) throws IOException { URL u = new URL(url); URLConnection connection = u.openConnection(); - connection.setRequestProperty(HTTPHEADER_KEY_ACCEPT, HTTPHEADER_VALUE_ACCEPTXML); //$NON-NLS-1$ $NON-NLS-2$ + connection.setRequestProperty(HTTPHEADER_KEY_ACCEPT, HTTPHEADER_VALUE_ACCEPTXML); return connection.getContent(); } @@ -194,11 +186,11 @@ getPropertyChangeSupport().firePropertyChange(PROPERTY_URL, this.url, this.url = url); } - public String getCloudType() { + public String getType() { return cloudType; } - public void setCloudType(String cloudType) { - getPropertyChangeSupport().firePropertyChange(PROPERTY_CLOUDTYPE, this.cloudType, this.cloudType = cloudType); + public void setType(String cloudType) { + getPropertyChangeSupport().firePropertyChange(PROPERTY_TYPE, this.cloudType, this.cloudType = cloudType); } } 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-10-11 08:25:24 UTC (rev 25706) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2010-10-11 09:02:28 UTC (rev 25707) @@ -18,6 +18,8 @@ import org.eclipse.core.databinding.beans.BeanProperties; import org.eclipse.core.databinding.observable.value.IValueChangeListener; import org.eclipse.core.databinding.observable.value.ValueChangeEvent; +import org.eclipse.core.databinding.validation.IValidator; +import org.eclipse.core.databinding.validation.ValidationStatus; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.databinding.fieldassist.ControlDecorationSupport; import org.eclipse.jface.databinding.swt.WidgetProperties; @@ -27,7 +29,6 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; @@ -40,8 +41,10 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; +import org.jboss.tools.deltacloud.core.DeltaCloudManager; import org.jboss.tools.deltacloud.ui.Activator; import org.jboss.tools.deltacloud.ui.SWTImagesFactory; +import org.jboss.tools.deltacloud.ui.common.databinding.validator.CompositeValidator; import org.jboss.tools.deltacloud.ui.common.databinding.validator.MandatoryStringValidator; public class CloudConnectionPage extends WizardPage { @@ -51,7 +54,6 @@ private static final String URL_LABEL = "Url.label"; //$NON-NLS-1$ private static final String NAME_LABEL = "Name.label"; //$NON-NLS-1$ private static final String USERNAME_LABEL = "UserName.label"; //$NON-NLS-1$ - private static final String TYPE_LABEL = "Type.label"; //$NON-NLS-1$ private static final String PASSWORD_LABEL = "Password.label"; //$NON-NLS-1$ private static final String TESTBUTTON_LABEL = "TestButton.label"; //$NON-NLS-1$ private static final String EC2_USER_INFO = "EC2UserNameLink.text"; //$NON-NLS-1$ @@ -61,27 +63,12 @@ private static final String TEST_SUCCESSFUL = "NewCloudConnectionTest.success"; //$NON-NLS-1$ private static final String TEST_FAILURE = "NewCloudConnectionTest.failure"; //$NON-NLS-1$ - private CloudConnection wizard; - - // private Button testButton; - - private Text nameText; - private Text urlText; - private Label typeLabel; - private Text usernameText; - private Text passwordText; - - private String name; - private String url; - private String username; - private String password; - private String cloudTypeLabel; - private String defaultName = ""; - private String defaultURL = ""; + private String defaultUrl = ""; private String defaultUsername = ""; private String defaultPassword = ""; - + private String defaultType = ""; + private CloudConnectionModel connectionModel; private Listener linkListener = new Listener() { @@ -94,71 +81,36 @@ Activator.log(e); } } - }; - private SelectionListener buttonListener = new SelectionAdapter() { - - public void widgetSelected(SelectionEvent event) { - // boolean successful = false; - // if (getURLValid()) { - // successful = wizard.performTest(); - // } - // if (successful) { - // setMessage(WizardMessages.getString(TEST_SUCCESSFUL)); - // } else { - // setErrorMessage(WizardMessages.getString(TEST_FAILURE)); - // } - } - - }; - public CloudConnectionPage(String pageName, CloudConnection wizard) { super(pageName); - this.wizard = wizard; setDescription(WizardMessages.getString(DESCRIPTION)); setTitle(WizardMessages.getString(TITLE)); setImageDescriptor(SWTImagesFactory.DESC_DELTA_LARGE); - // setPageComplete(false); this.connectionModel = new CloudConnectionModel(); } - public CloudConnectionPage(String pageName, String defaultName, String defaultURL, - String defaultUsername, String defaultPassword, String defaultCloudType, + public CloudConnectionPage(String pageName, String defaultName, String defaultUrl, + String defaultUsername, String defaultPassword, String defaultType, CloudConnection wizard) { super(pageName); - this.wizard = wizard; this.defaultName = defaultName; - this.defaultURL = defaultURL; + this.defaultUrl = defaultUrl; this.defaultUsername = defaultUsername; this.defaultPassword = defaultPassword; - this.cloudTypeLabel = defaultCloudType; + this.connectionModel = new CloudConnectionModel(); + this.defaultType = defaultType; setDescription(WizardMessages.getString(DESCRIPTION)); setTitle(WizardMessages.getString(TITLE)); setImageDescriptor(SWTImagesFactory.DESC_DELTA_LARGE); setPageComplete(false); } - public String getName() { - return connectionModel.getName(); + public CloudConnectionModel getModel() { + return connectionModel; } - - public String getURL() { - return connectionModel.getUrl(); - } - - public String getUsername() { - return connectionModel.getUsername(); - } - - public String getPassword() { - return connectionModel.getPassword(); - } - - public String getType() { - return connectionModel.getCloudType(); - } - + @Override public void createControl(Composite parent) { DataBindingContext dbc = new DataBindingContext(); @@ -172,88 +124,66 @@ Label dummyLabel = new Label(container, SWT.NULL); + // name Label nameLabel = new Label(container, SWT.NULL); nameLabel.setText(WizardMessages.getString(NAME_LABEL)); - nameText = new Text(container, SWT.BORDER | SWT.SINGLE); + Text nameText = new Text(container, SWT.BORDER | SWT.SINGLE); nameText.setText(defaultName); - Binding nameTextBinding = dbc.bindValue( - WidgetProperties.text(SWT.Modify).observe(nameText), - BeanProperties.value(CloudConnectionModel.class, CloudConnectionModel.PROPERTY_NAME) - .observe(connectionModel), - new UpdateValueStrategy().setBeforeSetValidator(new MandatoryStringValidator("name must be defined")), - null); - ControlDecorationSupport.create(nameTextBinding, SWT.LEFT|SWT.TOP); + bindName(dbc, nameText); + // url Label urlLabel = new Label(container, SWT.NULL); urlLabel.setText(WizardMessages.getString(URL_LABEL)); Point p1 = urlLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT); - - urlText = new Text(container, SWT.BORDER | SWT.SINGLE); - Binding urlTextBinding = dbc.bindValue( + Text urlText = new Text(container, SWT.BORDER | SWT.SINGLE); + urlText.setText(defaultUrl); + dbc.bindValue( WidgetProperties.text(SWT.Modify).observeDelayed(500, urlText), BeanProperties.value(CloudConnectionModel.class, CloudConnectionModel.PROPERTY_URL) - .observe(connectionModel)); - - final Label typeLabel = new Label(container, SWT.NULL); + .observe(connectionModel)); + + // cloud type + Label typeLabel = new Label(container, SWT.NULL); + typeLabel.setText(defaultType); UpdateValueStrategy url2TypeStrategy = new UpdateValueStrategy(); url2TypeStrategy.setConverter(new CloudConnectionModel.CloudTypeConverter()); url2TypeStrategy.setBeforeSetValidator(new CloudConnectionModel.CloudTypeValidator()); - Binding urlBinding = dbc.bindValue( - WidgetProperties.text(SWT.Modify).observeDelayed(100, urlText), - BeanProperties.value(CloudConnectionModel.PROPERTY_CLOUDTYPE).observe(connectionModel), - url2TypeStrategy, - new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER)); - urlBinding.getValidationStatus().addValueChangeListener(new IValueChangeListener() { + Binding urlBinding = bindCloudTypeLabel(dbc, urlText, typeLabel, url2TypeStrategy); - @Override - public void handleValueChange(ValueChangeEvent event) { - IStatus status = (IStatus) event.diff.getNewValue(); - if (status.isOK()) { - typeLabel.setText(connectionModel.getCloudType()); - } else { - typeLabel.setText(""); - } - } - }); - ControlDecorationSupport.create(urlBinding, SWT.LEFT|SWT.TOP); - Label usernameLabel = new Label(container, SWT.NULL); usernameLabel.setText(WizardMessages.getString(USERNAME_LABEL)); DataBindingContext credentialsDbc = new DataBindingContext(); - usernameText = new Text(container, SWT.BORDER | SWT.SINGLE); + // username + Text usernameText = new Text(container, SWT.BORDER | SWT.SINGLE); + usernameText.setText(defaultUsername); credentialsDbc.bindValue( WidgetProperties.text(SWT.Modify).observe(usernameText), BeanProperties.value(CloudConnectionModel.class, CloudConnectionModel.PROPERTY_USERNAME).observe( connectionModel)); + // password Label passwordLabel = new Label(container, SWT.NULL); passwordLabel.setText(WizardMessages.getString(PASSWORD_LABEL)); - - passwordText = new Text(container, SWT.BORDER | SWT.PASSWORD | SWT.SINGLE); + Text passwordText = new Text(container, SWT.BORDER | SWT.PASSWORD | SWT.SINGLE); + passwordText.setText(defaultPassword); credentialsDbc.bindValue( WidgetProperties.text(SWT.Modify).observe(passwordText), BeanProperties.value(CloudConnectionModel.class, CloudConnectionModel.PROPERTY_PASSWORD).observe( connectionModel)); - + // test button final Button testButton = new Button(container, SWT.NULL); testButton.setText(WizardMessages.getString(TESTBUTTON_LABEL)); testButton.setEnabled(false); - urlBinding.getValidationStatus().addValueChangeListener(new IValueChangeListener() { + bindTestButton(urlBinding, testButton); - @Override - public void handleValueChange(ValueChangeEvent event) { - IStatus status = (IStatus) event.diff.getNewValue(); - testButton.setEnabled(status.isOK()); - } - }); - testButton.addSelectionListener(buttonListener); - + // ec2 user link Link ec2userLink = new Link(container, SWT.NULL); ec2userLink.setText(WizardMessages.getString(EC2_USER_INFO)); ec2userLink.addListener(SWT.Selection, linkListener); + // ec2 pw link Link ec2pwLink = new Link(container, SWT.NULL); ec2pwLink.setText(WizardMessages.getString(EC2_PASSWORD_INFO)); ec2pwLink.addListener(SWT.Selection, linkListener); @@ -338,4 +268,76 @@ setControl(container); // validate(); } + + private void bindTestButton(Binding urlBinding, final Button testButton) { + urlBinding.getValidationStatus().addValueChangeListener(new IValueChangeListener() { + + @Override + public void handleValueChange(ValueChangeEvent event) { + IStatus status = (IStatus) event.diff.getNewValue(); + testButton.setEnabled(status.isOK()); + } + }); + + testButton.addSelectionListener(new SelectionAdapter() { + + public void widgetSelected(SelectionEvent event) { + // boolean successful = false; + // if (getURLValid()) { + // successful = wizard.performTest(); + // } + // if (successful) { + // setMessage(WizardMessages.getString(TEST_SUCCESSFUL)); + // } else { + // setErrorMessage(WizardMessages.getString(TEST_FAILURE)); + // } + } + }); + } + + private Binding bindCloudTypeLabel(DataBindingContext dbc, Text urlText, final Label typeLabel, + UpdateValueStrategy url2TypeStrategy) { + Binding urlBinding = dbc.bindValue( + WidgetProperties.text(SWT.Modify).observeDelayed(100, urlText), + BeanProperties.value(CloudConnectionModel.PROPERTY_TYPE).observe(connectionModel), + url2TypeStrategy, + new UpdateValueStrategy(UpdateValueStrategy.POLICY_NEVER)); + urlBinding.getValidationStatus().addValueChangeListener(new IValueChangeListener() { + + @Override + public void handleValueChange(ValueChangeEvent event) { + IStatus status = (IStatus) event.diff.getNewValue(); + if (status.isOK()) { + typeLabel.setText(connectionModel.getType()); + } else { + typeLabel.setText(""); + } + } + }); + ControlDecorationSupport.create(urlBinding, SWT.LEFT | SWT.TOP); + return urlBinding; + } + + private void bindName(DataBindingContext dbc, final Text nameText) { + Binding nameTextBinding = dbc.bindValue( + WidgetProperties.text(SWT.Modify).observe(nameText), + BeanProperties.value(CloudConnectionModel.class, CloudConnectionModel.PROPERTY_NAME) + .observe(connectionModel), + new UpdateValueStrategy().setBeforeSetValidator( + new CompositeValidator( + new MandatoryStringValidator("name must be defined"), + new IValidator() { + + @Override + public IStatus validate(Object value) { + if (nameText.getText() != null && DeltaCloudManager.getDefault().findCloud(nameText.getText()) != null) { + return ValidationStatus.error(NAME_ALREADY_IN_USE); + } else { + return ValidationStatus.ok(); + } + } + })), + null); + ControlDecorationSupport.create(nameTextBinding, SWT.LEFT | SWT.TOP); + } } Deleted: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudType.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudType.java 2010-10-11 08:25:24 UTC (rev 25706) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudType.java 2010-10-11 09:02:28 UTC (rev 25707) @@ -1,131 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.internal.deltacloud.ui.wizards; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.StringReader; -import java.io.UnsupportedEncodingException; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLConnection; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; - -public class CloudType { - - private static final String HTTPHEADER_KEY_ACCEPT = "Accept"; //$NON-NLS-1$ - private static final String HTTPHEADER_VALUE_ACCEPTXML = "application/xml;q=1.0"; //$NON-NLS-1$ - private static final String DOCUMENT_ELEMENT_DRIVER = "driver"; //$NON-NLS-1$ - private static final String DOCUMENT_ELEMENT_API = "api"; //$NON-NLS-1$ - private static final String URLCONNECTION_ENCODING = "UTF-8"; //$NON-NLS-1$ - - public static final String UNKNOWN_TYPE_LABEL = "UnknownType.label"; //$NON-NLS-1$ - private static final String INVALID_URL = "ErrorInvalidURL.text"; //$NON-NLS-1$ - private static final String NONCLOUD_URL = "ErrorNonCloudURL.text"; //$NON-NLS-1$ - - private String label = WizardMessages.getString(UNKNOWN_TYPE_LABEL); - private boolean isValid; - private String url; - - public CloudType(String url) { - init(url); - } - - /** - * Initializes this instance, sets the cloud type label and the validity. It - * tries to connect to the cloud instance that's supposed at the given url, - * requests an API response and parses the xml that's returned. - * - * @param url - * the cloud instance url to connect to - */ - private void init(String url) { - this.url = url; - try { - Object o = getURLContent(url + "/api?format=xml"); //$NON-NLS-1$ - if (o instanceof InputStream) { - DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - DocumentBuilder db = dbf.newDocumentBuilder(); - Document document = db.parse( - new InputSource(new StringReader(getXML((InputStream) o)))); - - NodeList elements = document.getElementsByTagName(DOCUMENT_ELEMENT_API); //$NON-NLS-1$ - if (elements.getLength() > 0) { - Node n = elements.item(0); - Node driver = n.getAttributes().getNamedItem( - DOCUMENT_ELEMENT_DRIVER); //$NON-NLS-1$ - if (driver != null) { - isValid = true; - String driverValue = driver.getNodeValue(); - label = driverValue.toUpperCase(); - } - } - } - } catch (MalformedURLException e) { - label = WizardMessages.getString(INVALID_URL); - } catch (IOException e) { - label = WizardMessages.getString(NONCLOUD_URL); - } catch (ParserConfigurationException e) { - label = WizardMessages.getString(NONCLOUD_URL); - } catch (SAXException e) { - label = WizardMessages.getString(NONCLOUD_URL); - } catch (Exception e) { - label = WizardMessages.getString(INVALID_URL); - } - } - - private String getXML(InputStream is) throws UnsupportedEncodingException, IOException { - try { - if (is == null) { - return ""; - } - StringBuilder sb = new StringBuilder(); - String line = ""; - BufferedReader reader = new BufferedReader(new InputStreamReader(is, URLCONNECTION_ENCODING)); - while ((line = reader.readLine()) != null) { - sb.append(line).append("\n"); //$NON-NLS-1$ - } - return sb.toString(); - } finally { - is.close(); - } - } - - public boolean isValid() { - return isValid; - } - - public String getLabel() { - return label; - } - - public String getUrl() { - return url; - } - - private Object getURLContent(String url) throws IOException { - URL u = new URL(url); - URLConnection connection = u.openConnection(); - connection.setRequestProperty(HTTPHEADER_KEY_ACCEPT, HTTPHEADER_VALUE_ACCEPTXML); //$NON-NLS-1$ $NON-NLS-2$ - return connection.getContent(); - } -} Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnection.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnection.java 2010-10-11 08:25:24 UTC (rev 25706) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnection.java 2010-10-11 09:02:28 UTC (rev 25707) @@ -62,9 +62,9 @@ public boolean performTest() { String name = mainPage.getName(); - String url = mainPage.getURL(); - String username = mainPage.getUsername(); - String password = mainPage.getPassword(); + String url = mainPage.getModel().getUrl(); + String username = mainPage.getModel().getUsername(); + String password = mainPage.getModel().getPassword(); try { DeltaCloud newCloud = new DeltaCloud(name, url, username, password); return newCloud.testConnection(); @@ -77,10 +77,10 @@ @Override public boolean performFinish() { String name = mainPage.getName(); - String url = mainPage.getURL(); - String username = mainPage.getUsername(); - String password = mainPage.getPassword(); - String type = mainPage.getType(); + String url = mainPage.getModel().getUrl(); + String username = mainPage.getModel().getUsername(); + String password = mainPage.getModel().getPassword(); + String type = mainPage.getModel().getType(); try { String oldName = cloud.getName(); cloud.editCloud(name, url, username, password, type); 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-10-11 08:25:24 UTC (rev 25706) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnection.java 2010-10-11 09:02:28 UTC (rev 25707) @@ -48,9 +48,9 @@ public boolean performTest() { String name = mainPage.getName(); - String url = mainPage.getURL(); - String username = mainPage.getUsername(); - String password = mainPage.getPassword(); + String url = mainPage.getModel().getUrl(); + String username = mainPage.getModel().getUsername(); + String password = mainPage.getModel().getPassword(); try { DeltaCloud newCloud = new DeltaCloud(name, url, username, password); return newCloud.testConnection(); @@ -63,10 +63,10 @@ @Override public boolean performFinish() { String name = mainPage.getName(); - String url = mainPage.getURL(); - String username = mainPage.getUsername(); - String password = mainPage.getPassword(); - String type = mainPage.getType(); + String url = mainPage.getModel().getUrl(); + String username = mainPage.getModel().getUsername(); + String password = mainPage.getModel().getPassword(); + String type = mainPage.getModel().getType(); try { DeltaCloud newCloud = new DeltaCloud(name, url, username, password, type, true); DeltaCloudManager.getDefault().addCloud(newCloud);