Improve execution core

[gpl/argeo-slc.git] / runtime / org.argeo.slc.core / src / main / java / org / argeo / slc / core / execution / xml / SpecBeanDefinitionParser.java

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/xml/SpecBeanDefinitionParser.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/xml/SpecBeanDefinitionParser.java
index 60861d59cf1944b4c6d5dbe49485c81d8baa9efc..e5a4531ab920a3a8c48bf5bbb733098b1b518108 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/xml/SpecBeanDefinitionParser.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/xml/SpecBeanDefinitionParser.java
@@ -17,7 +17,6 @@ import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
 
 public class SpecBeanDefinitionParser extends
                AbstractSingleBeanDefinitionParser {
@@ -27,6 +26,9 @@ public class SpecBeanDefinitionParser extends
        @Override
        protected void doParse(Element element, ParserContext parserContext,
                        BeanDefinitionBuilder builder) {
+               builder.getBeanDefinition().setDescription(DomUtils.getChildElementValueByTagName(element, 
+               "description"));                
+               
                ManagedMap attributes = new ManagedMap();
 
                // Primitives
@@ -45,24 +47,24 @@ public class SpecBeanDefinitionParser extends
                }
 
                // Refs
-               for (Element child : (List<Element>) DomUtils
+               for (Element refAttrElem : (List<Element>) DomUtils
                                .getChildElementsByTagName(element, "ref")) {
-                       BeanDefinitionBuilder childBuilder = BeanDefinitionBuilder
+                       BeanDefinitionBuilder refAttrBuilder = BeanDefinitionBuilder
                                        .genericBeanDefinition(RefSpecAttribute.class);
-                       addCommonProperties(child, parserContext, childBuilder);
+                       addCommonProperties(refAttrElem, parserContext, refAttrBuilder);
 
-                       String targetClassName = child.getAttribute("targetClass");
+                       String targetClassName = refAttrElem.getAttribute("targetClass");
                        if (StringUtils.hasText(targetClassName))
-                               childBuilder.addPropertyValue("targetClass", targetClassName);
+                               refAttrBuilder.addPropertyValue("targetClass", targetClassName);
 
                        // Choices
-                       NodeList choicesNd = child.getElementsByTagName("choices");
-                       if (choicesNd.getLength() > 0) {
-                               Element choicesElem = (Element) choicesNd.item(0);
-                               List choices = DomUtils.getChildElementsByTagName(choicesElem,
-                                               "choice");
+                       Element choicesElem = DomUtils.getChildElementByTagName(
+                                       refAttrElem, "choices");
+                       if (choicesElem != null) {
+                               List<Element> choices = DomUtils.getChildElementsByTagName(
+                                               choicesElem, "choice");
                                ManagedList choiceBeans = new ManagedList(choices.size());
-                               for (Element choiceElem : (List<Element>) choices) {
+                               for (Element choiceElem : choices) {
                                        BeanDefinitionBuilder choiceBuilder = BeanDefinitionBuilder
                                                        .genericBeanDefinition(RefValueChoice.class);
                                        choiceBuilder.addPropertyValue("name", choiceElem
@@ -73,11 +75,11 @@ public class SpecBeanDefinitionParser extends
 
                                        choiceBeans.add(choiceBuilder.getBeanDefinition());
                                }
-
+                               refAttrBuilder.addPropertyValue("choices", choiceBeans);
                        }
 
-                       putInAttributes(attributes, child,
-                                       childBuilder.getBeanDefinition(), "ref");
+                       putInAttributes(attributes, refAttrElem, refAttrBuilder
+                                       .getBeanDefinition(), "ref");
                }
 
                builder.addPropertyValue("attributes", attributes);