Author: jjohnstn Date: 2010-10-25 16:41:13 -0400 (Mon, 25 Oct 2010) New Revision: 26042 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java Log: 2010-10-25 Jeff Johnston <jjohnstn(a)redhat.com&gt; * src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java (getPropertyValue): Use DeltaCloud as source of cloud type constants. * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java (validate): Ditto. (createControl): Ditto. * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java (createControl): Ditto. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-25 20:40:15 UTC (rev 26041) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-25 20:41:13 UTC (rev 26042) @@ -1,3 +1,11 @@ +2010-10-25 Jeff Johnston <jjohnstn(a)redhat.com&gt; + + * src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java (getPropertyValue): Use + DeltaCloud as source of cloud type constants. + * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java (validate): Ditto. + (createControl): Ditto. + * src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java (createControl): Ditto. + 2010-10-22 Jeff Johnston <jjohnstn(a)redhat.com&gt; * src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImage.java: New file. Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java 2010-10-25 20:40:15 UTC (rev 26041) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java 2010-10-25 20:41:13 UTC (rev 26042) @@ -117,7 +117,7 @@ // it will be complete for future requests until a refresh gets the // entire list again. String key = instance.getKey(); - if (!cloud.getType().equals(DeltaCloudInstance.MOCK_TYPE)) { + if (!cloud.getType().equals(DeltaCloud.MOCK_TYPE)) { if (instance.getState().equals(DeltaCloudInstance.RUNNING) && (key == null || key.length() == 0)) { instance = cloud.refreshInstance(instance.getId()); if (instance != null) { Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-10-25 20:40:15 UTC (rev 26041) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-10-25 20:41:13 UTC (rev 26042) @@ -37,7 +37,6 @@ import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudHardwareProfile; import org.jboss.tools.deltacloud.core.DeltaCloudImage; -import org.jboss.tools.deltacloud.core.DeltaCloudInstance; import org.jboss.tools.deltacloud.core.DeltaCloudRealm; import org.jboss.tools.deltacloud.ui.Activator; import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants; @@ -168,7 +167,7 @@ complete = false; } - if (cloud.getType().equals(DeltaCloudInstance.EC2_TYPE)) { + if (cloud.getType().equals(DeltaCloud.EC2_TYPE)) { String keyname = keyText.getText(); if (keyname.length() == 0) complete = false; @@ -339,7 +338,7 @@ Control control = realm; - if (cloud.getType().equals(DeltaCloudInstance.EC2_TYPE)) { + if (cloud.getType().equals(DeltaCloud.EC2_TYPE)) { Label keyLabel = new Label(container, SWT.NULL); keyLabel.setText(WizardMessages.getString(KEY_LABEL)); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java 2010-10-25 20:40:15 UTC (rev 26041) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java 2010-10-25 20:41:13 UTC (rev 26042) @@ -49,7 +49,6 @@ import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudHardwareProfile; import org.jboss.tools.deltacloud.core.DeltaCloudImage; -import org.jboss.tools.deltacloud.core.DeltaCloudInstance; import org.jboss.tools.deltacloud.core.DeltaCloudRealm; import org.jboss.tools.deltacloud.ui.SWTImagesFactory; import org.jboss.tools.internal.deltacloud.ui.common.databinding.validator.MandatoryStringValidator; @@ -325,7 +324,7 @@ keyManage = new Button(container, SWT.NULL); keyManage.setText(WizardMessages.getString(MANAGE_BUTTON_LABEL)); keyManage.addSelectionListener(manageListener); - if (cloud.getType().equals(DeltaCloudInstance.MOCK_TYPE)) + if (cloud.getType().equals(DeltaCloud.MOCK_TYPE)) keyManage.setEnabled(false); Point p1 = nameLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT);