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

Re-order parserContext calls to makes sure IDE gets info about source location

Browse Source
This commit is contained in:
dsyer
2009-02-04 16:27:02 +00:00
parent 5826cbb713
commit 35eea84747
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobExecutionListenerParser.java
View File

@@ -21,7 +21,6 @@ import static org.springframework.util.StringUtils.hasText;
import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.config.BeanReference;
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.parsing.BeanComponentDefinition;
@@ -34,7 +33,6 @@ import org.springframework.beans.factory.xml.BeanDefinitionParser;
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.NamedNodeMap;
@@ -67,8 +65,8 @@ public class JobExecutionListenerParser {
}
attributes.append(attributeNodes.item(i));
}
throw new BeanCreationException("Both 'ref' and 'class' specified; use 'class' with an optional 'id' or just 'ref' for <" +
listenerElement.getTagName() + "> element with attributes: " + attributes);
parserContext.getReaderContext().error("Both 'ref' and 'class' specified; use 'class' with an optional 'id' or just 'ref' for <" +
listenerElement.getTagName() + "> element with attributes: " + attributes, listenerElement);
}
if(hasText(listenerRef)){
@@ -77,12 +75,12 @@ public class JobExecutionListenerParser {
else if(hasText(className)){
RootBeanDefinition beanDef = new RootBeanDefinition(className, null, null);
String delegateId = parserContext.getReaderContext().generateBeanName(beanDef);
parserContext.registerBeanComponent(new BeanComponentDefinition(beanDef, delegateId));
beanDef.setSource(parserContext.extractSource(listenerElement));
parserContext.registerBeanComponent(new BeanComponentDefinition(beanDef, delegateId));
listenerBuilder.addPropertyReference("delegate", delegateId);
}
else {
throw new BeanCreationException("Neither 'ref' or 'class' specified for <" + listenerElement.getTagName() + "> element");
parserContext.getReaderContext().error("Neither 'ref' or 'class' specified for <" + listenerElement.getTagName() + "> element", listenerElement);
}
ManagedMap metaDataMap = new ManagedMap();

8
spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParser.java
View File

@@ -229,8 +229,8 @@ public class StepParser {
bd.setRole(BeanDefinition.ROLE_SUPPORT);
bd.setSource(parserContext.extractSource(stepElement));
parserContext.registerBeanComponent(new BeanComponentDefinition(bd, stepElement.getAttribute("name")));
bd.setSource(parserContext.extractSource(stepElement));
}
@@ -357,8 +357,8 @@ public class StepParser {
bd.setRole(BeanDefinition.ROLE_SUPPORT);
bd.setSource(parserContext.extractSource(stepElement));
parserContext.registerBeanComponent(new BeanComponentDefinition(bd, stepElement.getAttribute("name")));
bd.setSource(parserContext.extractSource(element));
}
@@ -449,8 +449,8 @@ public class StepParser {
if (!StringUtils.hasText(id)) {
id = parserContext.getReaderContext().generateBeanName(beanDef);
}
parserContext.registerBeanComponent(new BeanComponentDefinition(beanDef, id));
beanDef.setSource(parserContext.extractSource(listenerElement));
parserContext.registerBeanComponent(new BeanComponentDefinition(beanDef, id));
BeanReference bean = new RuntimeBeanReference(id);
beans.add(bean);
}
@@ -481,8 +481,8 @@ public class StepParser {
else if (StringUtils.hasText(className)) {
RootBeanDefinition beanDef = new RootBeanDefinition(className, null, null);
String delegateId = parserContext.getReaderContext().generateBeanName(beanDef);
parserContext.registerBeanComponent(new BeanComponentDefinition(beanDef, delegateId));
beanDef.setSource(parserContext.extractSource(listenerElement));
parserContext.registerBeanComponent(new BeanComponentDefinition(beanDef, delegateId));
listenerBuilder.addPropertyReference("delegate", delegateId);
}
else {