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

SWF-444 - Changing attribute from "result-type" to "type"

Browse Source
This commit is contained in:
Jeremy Grelle
2008-01-30 19:03:02 +00:00
parent ad3da7e334
commit bf1a754c1b
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/XmlFlowBuilder.java
View File

@@ -147,8 +147,6 @@ public class XmlFlowBuilder extends AbstractFlowBuilder implements ResourceHolde
private static final String METHOD_RESULT_ELEMENT = "method-result";
private static final String RESULT_TYPE_ATTRIBUTE = "result-type";
private static final String EVALUATE_ACTION_ELEMENT = "evaluate-action";
private static final String SET_ELEMENT = "set";
@@ -790,8 +788,8 @@ public class XmlFlowBuilder extends AbstractFlowBuilder implements ResourceHolde
Element resultElement = DomUtils.getChildElementByTagName(element, METHOD_RESULT_ELEMENT);
Class type = null;
if (resultElement != null) {
if (resultElement.hasAttribute(RESULT_TYPE_ATTRIBUTE)) {
type = (Class) fromStringTo(Class.class).execute(resultElement.getAttribute(RESULT_TYPE_ATTRIBUTE));
if (resultElement.hasAttribute(TYPE_ATTRIBUTE)) {
type = (Class) fromStringTo(Class.class).execute(resultElement.getAttribute(TYPE_ATTRIBUTE));
}
}
return type;

2
spring-webflow/src/main/java/org/springframework/webflow/engine/builder/xml/spring-webflow-2.0.xsd
View File

@@ -1036,7 +1036,7 @@ If not specified the default scope type is used ('request' by default).
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="result-type" type="xsd:string">
<xsd:attribute name="type" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
<![CDATA[