Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWF-978 - Regression of SWF-918

Browse Source 
SWF-818 - Process Temporary Contexts in AjaxTilesView
This commit is contained in:
Jeremy Grelle
2008-12-10 19:18:57 +00:00
parent 73b781a31a
commit e56877975d
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spring-js/src/main/java/org/springframework/js/ajax/tiles2/AjaxTilesView.java
View File

@@ -121,25 +121,24 @@ public class AjaxTilesView extends TilesView {
protected void flattenAttributeMap(BasicTilesContainer container, TilesRequestContext requestContext,
Map resultMap, Definition compositeDefinition, HttpServletRequest request, HttpServletResponse response)
throws Exception {
if (compositeDefinition.getAttributes() == null || compositeDefinition.getAttributes().size() == 0) {
return;
}
Iterator i = compositeDefinition.getAttributes().keySet().iterator();
while (i.hasNext()) {
Object key = i.next();
Attribute attr = (Attribute) compositeDefinition.getAttributes().get(key);
Definition nestedDefinition = container.getDefinitionsFactory().getDefinition(attr.getValue().toString(),
requestContext);
resultMap.put(key, attr);
if (nestedDefinition != null && nestedDefinition != compositeDefinition) {
flattenAttributeMap(container, requestContext, resultMap, nestedDefinition, request, response);
if (compositeDefinition.getAttributes() != null && compositeDefinition.getAttributes().size() > 0) {
Iterator i = compositeDefinition.getAttributes().keySet().iterator();
while (i.hasNext()) {
Object key = i.next();
Attribute attr = (Attribute) compositeDefinition.getAttributes().get(key);
Definition nestedDefinition = container.getDefinitionsFactory().getDefinition(
attr.getValue().toString(), requestContext);
resultMap.put(key, attr);
if (nestedDefinition != null && nestedDefinition != compositeDefinition) {
flattenAttributeMap(container, requestContext, resultMap, nestedDefinition, request, response);
}
}
}
// Process dynamic attributes
AttributeContext attributeContext = container.getAttributeContext(new Object[] { request, response });
for (i = attributeContext.getAttributeNames(); i.hasNext();) {
for (Iterator i = attributeContext.getAttributeNames(); i.hasNext();) {
String key = (String) i.next();
Attribute attr = attributeContext.getAttribute(key);
resultMap.put(key, attr);