husted 02/01/23 13:40:52
Modified: contrib/scaffold/src/framework/main/org/apache/scaffold/http
HelperAction.java FindForwardAction.java
BaseHelperAction.java
Log:
Restore code to prior state to test additonal backward compatability changes in
nightly build.
Revision Changes Path
1.5 +12 -4
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/HelperAction.java
Index: HelperAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/HelperAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HelperAction.java 22 Jan 2002 22:37:50 -0000 1.4
+++ HelperAction.java 23 Jan 2002 21:40:52 -0000 1.5
@@ -41,7 +41,7 @@
* and an error condition is detected.
* <p>
* @author Ted Husted
- * @version $Revision: 1.4 $ $Date: 2002/01/22 22:37:50 $
+ * @version $Revision: 1.5 $ $Date: 2002/01/23 21:40:52 $
**/
public class HelperAction extends Action {
@@ -69,6 +69,14 @@
/**
+ * Return the application resources for this web application, if any.
+ **/
+ public MessageResources getMessageResources() {
+ return servlet.getResources();
+ }
+
+
+ /**
* Number of replacement parameters permitted in Struts 1.0.
* See also saveConfirm.
**/
@@ -211,9 +219,9 @@
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/HelperAction.java,v
1.4 2002/01/22 22:37:50 husted Exp $
- * $Revision: 1.4 $
- * $Date: 2002/01/22 22:37:50 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/HelperAction.java,v
1.5 2002/01/23 21:40:52 husted Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/01/23 21:40:52 $
*
* ====================================================================
*
1.3 +11 -24
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/FindForwardAction.java
Index: FindForwardAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/FindForwardAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FindForwardAction.java 22 Jan 2002 22:37:50 -0000 1.2
+++ FindForwardAction.java 23 Jan 2002 21:40:52 -0000 1.3
@@ -24,7 +24,7 @@
* Scan request parameters for the name of a local or global
* forward. If one is found, use it. If not, return null.
* @author Dmitri Valdin
- * @version $Revision: 1.2 $ $Date: 2002/01/22 22:37:50 $
+ * @version $Revision: 1.3 $ $Date: 2002/01/23 21:40:52 $
**/
public final class FindForwardAction extends Action {
@@ -44,49 +44,36 @@
HttpServletResponse response)
throws IOException, ServletException {
- // String forwards[] = ActionMapping.findForwards();
+ String forwards[] = mapping.findForwards();
+ /* -- non-deprecated version
ApplicationConfig config = (ApplicationConfig)
request.getAttribute(Action.APPLICATION_KEY);
ForwardConfig forwards[] = config.findForwardConfigs();
+ */
for (int i=0; i<forwards.length; i++) {
- if (request.getParameter(forwards[i].getName())!=null) {
+ if (request.getParameter(forwards[i])!=null) {
// Return the required ActionForward instance
- return mapping.findForward(forwards[i].getName());
+ return mapping.findForward(forwards[i]);
}
}
return null;
- /*
- int count=0;
- ActionForward forward = null;
- for (int i=0; i<forwards.length; i++) {
- if (request.getParameter(forwards[i])!=null) {
- forward = mapping.findForward(forwards[i]);
- count++;
- }
- }
-
- if (count>1) {
- // duplicate forward error
- }
-
- return forward;
- **/
}
} // end FindForwardAction
+
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/FindForwardAction.java,v
1.2 2002/01/22 22:37:50 husted Exp $
- * $Revision: 1.2 $
- * $Date: 2002/01/22 22:37:50 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/FindForwardAction.java,v
1.3 2002/01/23 21:40:52 husted Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/01/23 21:40:52 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.3 +12 -4
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/BaseHelperAction.java
Index: BaseHelperAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/BaseHelperAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseHelperAction.java 22 Jan 2002 22:37:50 -0000 1.2
+++ BaseHelperAction.java 23 Jan 2002 21:40:52 -0000 1.3
@@ -41,7 +41,7 @@
* and an error condition is detected.
* <p>
* @author Ted Husted
- * @version $Revision: 1.2 $ $Date: 2002/01/22 22:37:50 $
+ * @version $Revision: 1.3 $ $Date: 2002/01/23 21:40:52 $
**/
public class BaseHelperAction extends Action {
@@ -69,6 +69,14 @@
/**
+ * Return the application resources for this web application, if any.
+ **/
+ public MessageResources getMessageResources() {
+ return servlet.getResources();
+ }
+
+
+ /**
* Number of replacement parameters permitted in Struts 1.0.
* See also saveConfirm.
**/
@@ -211,9 +219,9 @@
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/BaseHelperAction.java,v
1.2 2002/01/22 22:37:50 husted Exp $
- * $Revision: 1.2 $
- * $Date: 2002/01/22 22:37:50 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/BaseHelperAction.java,v
1.3 2002/01/23 21:40:52 husted Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/01/23 21:40:52 $
*
* ====================================================================
*
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
