Author: adietish
Date: 2011-01-04 12:06:56 -0500 (Tue, 04 Jan 2011)
New Revision: 27875
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/DeltaCloudClient.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.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/CloudElementCategoryItem.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/ImagesCategoryItem.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/InstancesCategoryItem.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/DeltaCloudObjectLabelUtils.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/NewInstancePageModel.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
Log:
[JBIDE-7294] added name parameter to request again
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 2011-01-04
16:26:56 UTC (rev 27874)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2011-01-04
17:06:56 UTC (rev 27875)
@@ -563,19 +563,19 @@
}
}
- public DeltaCloudInstance createInstance(String alias, String imageId, String realmId,
String profileId,
+ public DeltaCloudInstance createInstance(String name, String imageId, String realmId,
String profileId,
String keyId, String memory, String storage) throws DeltaCloudException {
try {
Instance instance = null;
if (keyId != null) {
- instance = client.createInstance(imageId, profileId, realmId, keyId, memory,
storage);
+ instance = client.createInstance(name, imageId, profileId, realmId, keyId, memory,
storage);
} else {
- instance = client.createInstance(imageId, profileId, realmId, memory, storage);
+ instance = client.createInstance(name, imageId, profileId, realmId, memory,
storage);
}
if (instance != null) {
DeltaCloudInstancesRepository repo = getInstancesRepository();
DeltaCloudInstance[] instances = repo.get();
- DeltaCloudInstance deltaCloudInstance = DeltaCloudInstanceFactory.create(instance,
this, alias);
+ DeltaCloudInstance deltaCloudInstance = DeltaCloudInstanceFactory.create(instance,
this, name);
repo.add(deltaCloudInstance);
// TODO: remove notification with all instanceRepo, replace by
// notifying the changed instance
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2011-01-04
16:26:56 UTC (rev 27874)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2011-01-04
17:06:56 UTC (rev 27875)
@@ -115,10 +115,10 @@
* @return
* @throws DeltaCloudClientException
*/
- public Instance createInstance(String imageId, String profileId, String realmId, String
memory, String storage)
+ public Instance createInstance(String name, String imageId, String profileId, String
realmId, String memory, String storage)
throws DeltaCloudClientException;
- public Instance createInstance(String imageId, String profileId, String realmId, String
keyname, String memory,
+ public Instance createInstance(String name, String imageId, String profileId, String
realmId, String keyname, String memory,
String storage) throws DeltaCloudClientException;
/**
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 2011-01-04
16:26:56 UTC (rev 27874)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2011-01-04
17:06:56 UTC (rev 27875)
@@ -291,16 +291,16 @@
}
- public Instance createInstance(String imageId, String profileId, String realmId, String
memory,
+ public Instance createInstance(String name, String imageId, String profileId, String
realmId, String memory,
String storage) throws DeltaCloudClientException {
- return createInstance(imageId, profileId, realmId, null, memory, storage);
+ return createInstance(name, imageId, profileId, realmId, null, memory, storage);
}
- public Instance createInstance(String imageId, String profileId, String realmId, String
keyId,
+ public Instance createInstance(String name, String imageId, String profileId, String
realmId, String keyId,
String memory, String storage) throws DeltaCloudClientException {
try {
String response = requestStringResponse(
- new CreateInstanceRequest(baseUrl, imageId, profileId, realmId, keyId, memory,
storage));
+ new CreateInstanceRequest(baseUrl, name, imageId, profileId, realmId, keyId, memory,
storage));
Instance instance = buildInstance(response);
// TODO: WORKAROUND for
//
https://issues.jboss.org/browse/JBIDE-8005
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java 2011-01-04
16:26:56 UTC (rev 27874)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/request/CreateInstanceRequest.java 2011-01-04
17:06:56 UTC (rev 27875)
@@ -22,6 +22,7 @@
*/
public class CreateInstanceRequest extends AbstractDeltaCloudRequest {
+ private String name;
private String imageId;
private String profileId;
private String realmId;
@@ -30,12 +31,13 @@
private String storage;
public CreateInstanceRequest(URL baseUrl, String imageId) {
- this(baseUrl, imageId, null, null, null, null, null);
+ this(baseUrl, imageId, null, null, null, null, null, null);
}
- public CreateInstanceRequest(URL baseUrl, String imageId, String profileId, String
realmId,
+ public CreateInstanceRequest(URL baseUrl, String name, String imageId, String profileId,
String realmId,
String keyId, String memory, String storage) {
super(baseUrl, HttpMethod.POST);
+ this.name = name;
this.imageId = imageId;
this.profileId = profileId;
this.realmId = realmId;
@@ -51,6 +53,7 @@
// WORKAROUND for JBIDE-8005, STEAM-303
.parameter("key_name", keyname)
// WORKAROUND for JBIDE-8005, STEAM-303
+ .parameter("name", name)
.parameter("image_id", imageId)
.parameter("hwp_id", profileId)
.parameter("realm_id", realmId)
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/CloudElementCategoryItem.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/CloudElementCategoryItem.java 2011-01-04
16:26:56 UTC (rev 27874)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/CloudElementCategoryItem.java 2011-01-04
17:06:56 UTC (rev 27875)
@@ -38,7 +38,6 @@
public Object[] getChildren() {
if (!initialized.get()) {
asyncAddCloudElements();
- initialized.set(true);
}
return super.getChildren();
}
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/ImagesCategoryItem.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/ImagesCategoryItem.java 2011-01-04
16:26:56 UTC (rev 27874)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/ImagesCategoryItem.java 2011-01-04
17:06:56 UTC (rev 27875)
@@ -54,6 +54,7 @@
DeltaCloudImage[] images = getCloud().getImages();
clearChildren();
addChildren(images);
+ initialized.set(true);
expand();
return Status.OK_STATUS;
} catch(DeltaCloudException e) {
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/InstancesCategoryItem.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/InstancesCategoryItem.java 2011-01-04
16:26:56 UTC (rev 27874)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/InstancesCategoryItem.java 2011-01-04
17:06:56 UTC (rev 27875)
@@ -55,6 +55,7 @@
DeltaCloudInstance[] instances = getCloud().getInstances();
clearChildren();
addChildren(instances);
+ initialized.set(true);
expand();
return Status.OK_STATUS;
} catch (DeltaCloudException e) {
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/DeltaCloudObjectLabelUtils.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/DeltaCloudObjectLabelUtils.java 2011-01-04
16:26:56 UTC (rev 27874)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/DeltaCloudObjectLabelUtils.java 2011-01-04
17:06:56 UTC (rev 27875)
@@ -45,20 +45,4 @@
}
return sb.toString();
}
-
- public static String getId(String imageLabel) {
- if (imageLabel == null) {
- return null;
- }
- int idStart = imageLabel.indexOf('[');
- if (idStart == -1) {
- return imageLabel;
- }
- int idStop = imageLabel.indexOf(']');
- if (idStop == -1) {
- return imageLabel.substring(idStart + 1);
- }
- return imageLabel.substring(idStart + 1, idStop);
- }
-
}
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 2011-01-04
16:26:56 UTC (rev 27874)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-01-04
17:06:56 UTC (rev 27875)
@@ -230,7 +230,7 @@
private void bindWidgets(DataBindingContext dbc, Composite container) {
// name
- bindText(nameText, NewInstancePageModel.PROPERTY_ALIAS,
WizardMessages.getString(MUST_ENTER_A_NAME), dbc);
+ bindText(nameText, NewInstancePageModel.PROPERTY_NAME,
WizardMessages.getString(MUST_ENTER_A_NAME), dbc);
IObservableValue imageObservable = bindImage(imageText, dbc);
bindArchLabel(arch, imageObservable, dbc);
bindRealmCombo(realmCombo, dbc);
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.java 2011-01-04
16:26:56 UTC (rev 27874)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePageModel.java 2011-01-04
17:06:56 UTC (rev 27875)
@@ -26,7 +26,7 @@
public class NewInstancePageModel extends ObservableUIPojo {
public static final String PROPERTY_URL = "url"; //$NON-NLS-1$
- public static final String PROPERTY_ALIAS = "alias"; //$NON-NLS-1$
+ public static final String PROPERTY_NAME = "name"; //$NON-NLS-1$
public static final String PROPERTY_IMAGE = "image"; //$NON-NLS-1$
public static final String PROPERTY_ARCH = "arch"; //$NON-NLS-1$
public static final String PROPERTY_REALMS = "realms"; //$NON-NLS-1$
@@ -37,7 +37,7 @@
public static final String PROP_FILTERED_PROFILES = "filteredProfiles";
//$NON-NLS-1$
public static final String PROP_SELECTED_PROFILE_INDEX =
"selectedProfileIndex"; //$NON-NLS-1$
- private String alias;
+ private String name;
private DeltaCloudImage image;
private String arch;
private String keyId;
@@ -55,12 +55,12 @@
this.image = image;
}
- public String getAlias() {
- return alias;
+ public String getName() {
+ return name;
}
- public void setAlias(String alias) {
- firePropertyChange(PROPERTY_ALIAS, this.alias, this.alias = alias);
+ public void setName(String name) {
+ firePropertyChange(PROPERTY_NAME, this.name, this.name = name);
}
public DeltaCloudImage getImage() {
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-01-04
16:26:56 UTC (rev 27874)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-01-04
17:06:56 UTC (rev 27875)
@@ -91,7 +91,7 @@
String memory = model.getMemory();
String storage = model.getStorage();
String keyId = model.getKeyId();
- String alias = utf8Encode(model.getAlias());
+ String name = utf8Encode(model.getName());
// Save persistent settings for this particular cloud
cloud.setLastImageId(imageId);
@@ -122,7 +122,7 @@
prefs.putBoolean(IDeltaCloudPreferenceConstants.DONT_CONFIRM_CREATE_INSTANCE,
true);
}
}
- instance = cloud.createInstance(alias, imageId, realmId, profileId, keyId, memory,
storage);
+ instance = cloud.createInstance(name, imageId, realmId, profileId, keyId, memory,
storage);
if (instance != null) {
result = true;
}
@@ -153,7 +153,7 @@
ErrorUtils.handleError(
WizardMessages.getString(CREATE_INSTANCE_FAILURE_TITLE),
WizardMessages.getFormattedString(CREATE_INSTANCE_FAILURE_MSG,
- new String[] { alias, imageId, realmId, profileId }),
+ new String[] { name, imageId, realmId, profileId }),
e, getShell());
}
return result;