modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
| 38 +++++-----
1 file changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 951047697119ea0d0dd02a02cf7cd5b92aed046c
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Nov 4 11:07:03 2011 -0400
[BZ 744273] improve variable names and extract some variables to aid debugging
of
https://bugzilla.redhat.com/show_bug.cgi?id=744273
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
index c5b2700..ddf9784 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
@@ -66,7 +66,6 @@ public class ResourceConfigurationEditView extends LocatableVLayout
implements P
private ConfigurationEditor editor;
private ToolStrip buttonbar;
private IButton saveButton;
-
private boolean refreshing = false;
public ResourceConfigurationEditView(String locatorId, ResourceComposite
resourceComposite) {
@@ -123,11 +122,11 @@ public class ResourceConfigurationEditView extends LocatableVLayout
implements P
GWTServiceLookup.getConfigurationService().getLatestResourceConfigurationUpdate(resource.getId(),
new AsyncCallback<ResourceConfigurationUpdate>() {
@Override
- public void onSuccess(final ResourceConfigurationUpdate result) {
- if (result == null) {
-
- CoreGUI.getMessageCenter().notify(new
Message(MSG.view_configurationDetails_noConfigurationFetched(), Message.Severity.Info));
-
+ public void onSuccess(final ResourceConfigurationUpdate
configurationUpdate) {
+ if (configurationUpdate == null) {
+ Message message = new
Message(MSG.view_configurationDetails_noConfigurationFetched(),
+ Message.Severity.Info);
+ CoreGUI.getMessageCenter().notify(message);
saveButton.disable();
refreshing = false;
return;
@@ -137,9 +136,9 @@ public class ResourceConfigurationEditView extends LocatableVLayout
implements P
EnumSet.of(MetadataType.resourceConfigurationDefinition), new
TypeLoadedCallback() {
@Override
public void onTypesLoaded(ResourceType type) {
-
ConfigurationGWTServiceAsync configurationService =
GWTServiceLookup.getConfigurationService();
-
configurationService.getOptionValuesForConfigDefinition(type.getResourceConfigurationDefinition(),new
AsyncCallback<ConfigurationDefinition>(){
+ configurationService.getOptionValuesForConfigDefinition(
+ type.getResourceConfigurationDefinition(), new
AsyncCallback<ConfigurationDefinition>(){
@Override
public void onFailure(Throwable throwable) {
refreshing = false;
@@ -148,17 +147,18 @@ public class ResourceConfigurationEditView extends LocatableVLayout
implements P
@Override
public void onSuccess(ConfigurationDefinition
configurationDefinition) {
-
- editor = new
ConfigurationEditor(extendLocatorId("Editor"), configurationDefinition,
result.getConfiguration());
- editor.setOverflow(Overflow.AUTO);
-
editor.addPropertyValueChangeListener(ResourceConfigurationEditView.this);
-
editor.setReadOnly(!resourcePermission.isConfigureWrite());
- addMember(editor);
-
- saveButton.disable();
- buttonbar.setVisible(true);
- markForRedraw();
- refreshing = false;
+ Configuration configuration =
configurationUpdate.getConfiguration();
+ editor = new
ConfigurationEditor(extendLocatorId("Editor"),
+ configurationDefinition, configuration);
+ editor.setOverflow(Overflow.AUTO);
+
editor.addPropertyValueChangeListener(ResourceConfigurationEditView.this);
+
editor.setReadOnly(!resourcePermission.isConfigureWrite());
+ addMember(editor);
+
+ saveButton.disable();
+ buttonbar.setVisible(true);
+ markForRedraw();
+ refreshing = false;
}
});
}