husted 2003/01/15 02:19:26
Modified: contrib/scaffold/src/java/org/apache/struts/scaffold
ProcessFormAction.java ProcessDispatchAction.java
ProcessAction.java
Log:
+ Add response parameter to CheckOutcome and friends.
Revision Changes Path
1.9 +4 -2
jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessFormAction.java
Index: ProcessFormAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessFormAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ProcessFormAction.java 2 Jan 2003 19:43:45 -0000 1.8
+++ ProcessFormAction.java 15 Jan 2003 10:19:26 -0000 1.9
@@ -2,6 +2,7 @@
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.apache.commons.beanutils.BeanUtils;
@@ -56,6 +57,7 @@
*/
protected void exposeInScope(
HttpServletRequest request,
+ HttpServletResponse response,
String name,
String scope,
Object bean) {
@@ -63,7 +65,7 @@
if (null==scope) {
servlet.log(Log.PROCESS_BEAN_NULL_SCOPE,Log.DEBUG);
}
- if (null==bean) super.exposeInScope(request,name,scope,bean);
+ if (null==bean) super.exposeInScope(request,response,name,scope,bean);
else if (Tokens.REQUEST.equals(scope)) {
Object form = request.getAttribute(name);
if (null==form) {
1.9 +2 -2
jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessDispatchAction.java
Index: ProcessDispatchAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessDispatchAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ProcessDispatchAction.java 8 Dec 2002 08:14:29 -0000 1.8
+++ ProcessDispatchAction.java 15 Jan 2003 10:19:26 -0000 1.9
@@ -166,7 +166,7 @@
}
// Execute business logic, using map
- checkOutcome(mapping,request,result);
+ checkOutcome(mapping,request,response,result);
}
} // end ProcessDispatchAction
1.10 +15 -9
jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessAction.java
Index: ProcessAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ProcessAction.java 2 Jan 2003 19:43:27 -0000 1.9
+++ ProcessAction.java 15 Jan 2003 10:19:26 -0000 1.10
@@ -43,6 +43,7 @@
*/
protected void exposeInScope(
HttpServletRequest request,
+ HttpServletResponse response,
String name,
String scope,
Object bean) {
@@ -87,6 +88,7 @@
protected void checkDataSingle(
ActionMapping mapping,
HttpServletRequest request,
+ HttpServletResponse response,
ProcessResult result) {
String name = result.getName();
@@ -112,7 +114,7 @@
}
}
if (result.isExposed()) {
- exposeInScope(request,name,scope,bean);
+ exposeInScope(request,response,name,scope,bean);
}
@@ -134,10 +136,11 @@
protected void checkData(
ActionMapping mapping,
HttpServletRequest request,
+ HttpServletResponse response,
ProcessResult result) {
if (result.isSingleForm()) {
- checkDataSingle(mapping,request,result);
+ checkDataSingle(mapping,request,response,result);
}
else {
@@ -150,7 +153,7 @@
Object bean = result.getData();
if (result.isExposed()) {
- exposeInScope(request,name,scope,bean);
+ exposeInScope(request,response,name,scope,bean);
}
}
@@ -167,6 +170,7 @@
protected void checkMessages(
ActionMapping mapping,
HttpServletRequest request,
+ HttpServletResponse response,
ProcessResult processResult) {
saveMessages(request,processResult.getMessages());
@@ -194,6 +198,7 @@
protected void checkDispatch(
ActionMapping mapping,
HttpServletRequest request,
+ HttpServletResponse response,
ProcessResult processResult) {
String dispatch = processResult.getDispatch();
@@ -317,6 +322,7 @@
protected void checkOutcome(
ActionMapping mapping,
HttpServletRequest request,
+ HttpServletResponse response,
ProcessResult result) throws Exception {
if (result!=null) {
@@ -331,20 +337,20 @@
while (iterator.hasNext()) {
ProcessResult nextResult =
(ProcessResult) iterator.next();
- checkOutcome(mapping,request,nextResult);
+ checkOutcome(mapping,request,response,nextResult);
}
}
else {
// call extension points for whatever is returned
if (result.isData())
- checkData(mapping,request,result);
+ checkData(mapping,request,response,result);
if (result.isMessages())
- checkMessages(mapping,request,result);
+ checkMessages(mapping,request,response,result);
if (result.isDispatch())
- checkDispatch(mapping,request,result);
+ checkDispatch(mapping,request,response,result);
}
}
@@ -477,7 +483,7 @@
dataBean.execute(properties);
// Analyze result of business logic
- checkOutcome(mapping,request,result);
+ checkOutcome(mapping,request,response,result);
} // end for
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
