Author: adietish Date: 2010-11-23 06:02:55 -0500 (Tue, 23 Nov 2010) New Revision: 26834 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java Log: [JBIDE-7695] added check against <code>null</code> server type. fixed NPE that occurred when nonsense url was entered in connection wizard 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-11-23 10:23:17 UTC (rev 26833) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2010-11-23 11:02:55 UTC (rev 26834) @@ -19,6 +19,7 @@ import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudException; import org.jboss.tools.deltacloud.core.DeltaCloudManager; +import org.jboss.tools.deltacloud.core.client.DeltaCloudClientImpl.DeltaCloudServerType; import org.jboss.tools.deltacloud.ui.ErrorUtils; public class NewCloudConnectionWizard extends Wizard implements INewWizard, CloudConnection { @@ -67,7 +68,7 @@ String url = mainPage.getModel().getUrl(); String username = mainPage.getModel().getUsername(); String password = mainPage.getModel().getPassword(); - String type = mainPage.getModel().getType().toString(); + String type = getServerType(); try { DeltaCloud newCloud = new DeltaCloud(name, url, username, password, type); DeltaCloudManager.getDefault().addCloud(newCloud); @@ -80,6 +81,15 @@ return true; } + private String getServerType() { + DeltaCloudServerType type = mainPage.getModel().getType(); + if (type == null) { + return null; + } + + return type.toString(); + } + @Override public boolean needsProgressMonitor() { return true;