modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
| 42 ++++------
1 file changed, 17 insertions(+), 25 deletions(-)
New commits:
commit 24280444ac3904c3fe4e1d6a25334ff89d42ccfe
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Apr 1 15:45:33 2011 -0400
fix NPE that occurred when you edited an existing list-o-maps member map and then
clicked the member map editor modal's OK button
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
index 4d4e358..69a3c52 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
@@ -952,8 +952,8 @@ public class ConfigurationEditor extends LocatableVLayout {
PropertyMapListGridRecord record = (PropertyMapListGridRecord)
recordClickEvent.getRecord();
PropertyMap memberPropertyMap = (PropertyMap) record.getPropertyMap();
Log.debug("Editing property map: " + memberPropertyMap);
- displayMapEditor(summaryTable, record, memberPropertyDefinitionMap,
propertyList, memberPropertyMap,
- mapReadOnly);
+ displayMapEditor(summaryTable, record, propertyDefinitionList,
propertyList,
+ memberPropertyDefinitionMap, memberPropertyMap, mapReadOnly);
}
});
fieldsList.add(editField);
@@ -1005,8 +1005,8 @@ public class ConfigurationEditor extends LocatableVLayout {
addRowButton.setIcon(Window.getImgURL("[SKIN]/actions/add.png"));
addRowButton.addClickHandler(new
com.smartgwt.client.widgets.events.ClickHandler() {
public void onClick(ClickEvent clickEvent) {
- displayMapEditor(summaryTable, null, memberPropertyDefinitionMap,
- propertyList, null, mapReadOnly);
+ displayMapEditor(summaryTable, null, propertyDefinitionList,
propertyList,
+ memberPropertyDefinitionMap, null, mapReadOnly);
}
});
toolStrip.addMember(addRowButton);
@@ -1538,15 +1538,15 @@ public class ConfigurationEditor extends LocatableVLayout {
}
private void displayMapEditor(final ListGrid summaryTable, final
PropertyMapListGridRecord existingRecord,
- PropertyDefinitionMap definition, final PropertyList
list, final PropertyMap map,
+ final PropertyDefinitionList propertyDefinitionList,
final PropertyList propertyList, PropertyDefinitionMap memberMapDefinition, final
PropertyMap memberMap,
final boolean mapReadOnly) {
- final List<PropertyDefinition> memberDefinitions = new
ArrayList<PropertyDefinition>(definition
+ final List<PropertyDefinition> memberDefinitions = new
ArrayList<PropertyDefinition>(memberMapDefinition
.getPropertyDefinitions().values());
Collections.sort(memberDefinitions, new PropertyDefinitionComparator());
- final boolean newRow = (map == null);
- final PropertyMap workingMap = (newRow) ? new PropertyMap(definition.getName()) :
map.deepCopy(true);
+ final boolean newRow = (memberMap == null);
+ final PropertyMap workingMap = (newRow) ? new
PropertyMap(memberMapDefinition.getName()) : memberMap.deepCopy(true);
final LocatableWindow popup = new
LocatableWindow(extendLocatorId("MapEditor"));
String title = (mapReadOnly) ? MSG.view_configEdit_viewRow() :
MSG.view_configEdit_editRow();
@@ -1582,25 +1582,17 @@ public class ConfigurationEditor extends LocatableVLayout {
return;
}
if (newRow) {
- try {
- list.add(workingMap);
- int index = list.getList().size() - 1;
- PropertyMapListGridRecord record = new
PropertyMapListGridRecord(workingMap, index,
- memberDefinitions);
- summaryTable.addData(record);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ propertyList.add(workingMap);
+ int index = propertyList.getList().size() - 1;
+ PropertyMapListGridRecord record = new
PropertyMapListGridRecord(workingMap, index,
+ memberDefinitions);
+ summaryTable.addData(record);
} else {
- try {
- mergePropertyMap(workingMap, map, memberDefinitions);
- existingRecord.refresh();
- summaryTable.updateData(existingRecord);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ mergePropertyMap(workingMap, memberMap, memberDefinitions);
+ existingRecord.refresh();
+ summaryTable.updateData(existingRecord);
}
- firePropertyChangedEvent(list, null, true);
+ firePropertyChangedEvent(propertyList, propertyDefinitionList,
true);
summaryTable.redraw();
}