Author: adietish Date: 2011-02-01 11:34:37 -0500 (Tue, 01 Feb 2011) New Revision: 28832 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/EditCloudConnectionWizard.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java Log: [JBIDE-8148] 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 2011-02-01 16:15:06 UTC (rev 28831) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2011-02-01 16:34:37 UTC (rev 28832) @@ -77,7 +77,7 @@ private static final String NAME_PROPOSAL_KEY = "cloud/name"; private static final String USERNAME_PROPOSAL_KEY = "cloud/username"; private static final String URL_PROPOSAL_KEY = "cloud/url"; - + private static final int CLOUDTYPE_CHECK_DELAY = 1000; private static final String DESCRIPTION = "CloudConnection.desc"; //$NON-NLS-1$ @@ -306,7 +306,8 @@ } public CloudConnectionPage(String pageName, String defaultName, String defaultUrl, String defaultUsername, - String defaultPassword, DeltaCloudDriver defaultDriver, CloudConnection cloudConnection) throws MalformedURLException { + String defaultPassword, DeltaCloudDriver defaultDriver, CloudConnection cloudConnection) + throws MalformedURLException { super(pageName); this.connectionModel = new CloudConnectionPageModel(defaultName, defaultUrl, defaultUsername, defaultPassword, defaultDriver); @@ -547,7 +548,8 @@ IObservableValue cloudTypeObservable = urlToCloudTypeConverter.getCloudTypeObservable(); Object value = cloudTypeObservable.getValue(); Assert.isTrue(value == null || value instanceof DeltaCloudDriver); - DeltaCloudTypeLabelAdapter cloudTypeAdapter = new DeltaCloudTypeLabelAdapter((DeltaCloudDriver) value, typeLabel); + DeltaCloudTypeLabelAdapter cloudTypeAdapter = new DeltaCloudTypeLabelAdapter((DeltaCloudDriver) value, + typeLabel); cloudTypeObservable.addValueChangeListener(cloudTypeAdapter); ControlDecorationSupport.create(urlTypeBinding, SWT.LEFT | SWT.TOP); @@ -576,7 +578,23 @@ ControlDecorationSupport.create(nameTextBinding, SWT.LEFT | SWT.TOP); } - public CloudConnectionPageModel getModel() { - return connectionModel; + public String getUrl() { + return connectionModel.getUrl(); } + + public String getConnectionName() { + return connectionModel.getName(); + } + + public String getUsername() { + return connectionModel.getUsername(); + } + + public String getPassword() { + return connectionModel.getPassword(); + } + + public DeltaCloudDriver getDriver() { + return connectionModel.getDriver(); + } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2011-02-01 16:15:06 UTC (rev 28831) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2011-02-01 16:34:37 UTC (rev 28832) @@ -30,11 +30,11 @@ @Override public boolean performFinish() { - String name = mainPage.getModel().getName(); - String url = mainPage.getModel().getUrl(); - String username = mainPage.getModel().getUsername(); - String password = mainPage.getModel().getPassword(); - DeltaCloudDriver driver = mainPage.getModel().getDriver(); + String name = mainPage.getConnectionName(); + String url = mainPage.getUrl(); + String username = mainPage.getUsername(); + String password = mainPage.getPassword(); + DeltaCloudDriver driver = mainPage.getDriver(); try { initialCloud.update(name, url, username, password, driver); } catch (Exception e) { 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 2011-02-01 16:15:06 UTC (rev 28831) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2011-02-01 16:34:37 UTC (rev 28832) @@ -17,9 +17,9 @@ import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; import org.jboss.tools.deltacloud.core.DeltaCloud; +import org.jboss.tools.deltacloud.core.DeltaCloudDriver; import org.jboss.tools.deltacloud.core.DeltaCloudException; import org.jboss.tools.deltacloud.core.DeltaCloudManager; -import org.jboss.tools.deltacloud.core.DeltaCloudDriver; import org.jboss.tools.deltacloud.ui.Activator; import org.jboss.tools.deltacloud.ui.ErrorUtils; import org.jboss.tools.internal.deltacloud.ui.preferences.IPreferenceKeys; @@ -82,10 +82,10 @@ } public boolean performTest() { - String name = mainPage.getModel().getName(); - String url = mainPage.getModel().getUrl(); - String username = mainPage.getModel().getUsername(); - String password = mainPage.getModel().getPassword(); + String name = mainPage.getConnectionName(); + String url = mainPage.getUrl(); + String username = mainPage.getUsername(); + String password = mainPage.getPassword(); try { DeltaCloud newCloud = new DeltaCloud(name, url, username, password); return newCloud.testCredentials(); @@ -103,15 +103,15 @@ @Override public boolean performFinish() { - String name = mainPage.getModel().getName(); - String url = mainPage.getModel().getUrl(); + String name = mainPage.getConnectionName(); + String url = mainPage.getUrl(); new StringPreferenceValue(IPreferenceKeys.LAST_URL, Activator.PLUGIN_ID) .store(url); - String username = mainPage.getModel().getUsername(); - String password = mainPage.getModel().getPassword(); - DeltaCloudDriver driver = mainPage.getModel().getDriver(); + String username = mainPage.getUsername(); + String password = mainPage.getPassword(); + DeltaCloudDriver driver = mainPage.getDriver(); try { DeltaCloud newCloud = new DeltaCloud(name, url, username, password, driver);