struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hus...@apache.org
Subject cvs commit: jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http HelperAction.java FindForwardAction.java BaseHelperAction.java
Date Tue, 22 Jan 2002 22:37:50 GMT
husted      02/01/22 14:37:50

  Modified:    contrib/scaffold/src/framework/main/org/apache/scaffold/http
                        HelperAction.java FindForwardAction.java
                        BaseHelperAction.java
  Log:
  Update to build under the "Big Checkin".
  
  Revision  Changes    Path
  1.4       +4 -12     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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HelperAction.java	1 Jan 2002 13:44:04 -0000	1.3
  +++ HelperAction.java	22 Jan 2002 22:37:50 -0000	1.4
  @@ -41,7 +41,7 @@
    * and an error condition is detected.
    * <p>
    * @author Ted Husted
  - * @version $Revision: 1.3 $ $Date: 2002/01/01 13:44:04 $
  + * @version $Revision: 1.4 $ $Date: 2002/01/22 22:37:50 $
   **/
   public class HelperAction extends Action {
   
  @@ -69,14 +69,6 @@
   
   
       /**
  -     * 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.
       **/
  @@ -219,9 +211,9 @@
   
   
   /*
  - * $Header: /home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/HelperAction.java,v
1.3 2002/01/01 13:44:04 husted Exp $
  - * $Revision: 1.3 $
  - * $Date: 2002/01/01 13:44:04 $
  + * $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 $
    *
    * ====================================================================
    *
  
  
  
  1.2       +13 -6     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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FindForwardAction.java	1 Jan 2002 13:44:04 -0000	1.1
  +++ FindForwardAction.java	22 Jan 2002 22:37:50 -0000	1.2
  @@ -13,6 +13,10 @@
   import org.apache.struts.action.ActionMapping;
   import org.apache.struts.action.ActionServlet;
   
  +import org.apache.struts.config.ApplicationConfig;
  +import org.apache.struts.config.ForwardConfig;
  +
  +
   import org.apache.scaffold.lang.Tokens;
   
   
  @@ -20,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.1 $ $Date: 2002/01/01 13:44:04 $
  + * @version $Revision: 1.2 $ $Date: 2002/01/22 22:37:50 $
   **/
   public final class FindForwardAction extends Action {
   
  @@ -40,11 +44,14 @@
                    HttpServletResponse response)
       throws IOException, ServletException {
   
  -        String forwards[] = mapping.findForwards();
  +        //   String forwards[] = ActionMapping.findForwards();
  +        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])!=null) {
  +            if (request.getParameter(forwards[i].getName())!=null) {
                    // Return the required ActionForward instance
  -                 return mapping.findForward(forwards[i]);
  +                 return mapping.findForward(forwards[i].getName());
                }
            }
   
  @@ -71,9 +78,9 @@
   } // end FindForwardAction
   
   /*
  - * $Header: /home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/FindForwardAction.java,v
1.1 2002/01/01 13:44:04 husted Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/01/01 13:44:04 $
  + * $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 $
    *
    * ====================================================================
    *
  
  
  
  1.2       +3 -11     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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BaseHelperAction.java	1 Jan 2002 13:44:04 -0000	1.1
  +++ BaseHelperAction.java	22 Jan 2002 22:37:50 -0000	1.2
  @@ -41,7 +41,7 @@
    * and an error condition is detected.
    * <p>
    * @author Ted Husted
  - * @version $Revision: 1.1 $ $Date: 2002/01/01 13:44:04 $
  + * @version $Revision: 1.2 $ $Date: 2002/01/22 22:37:50 $
   **/
   public class BaseHelperAction extends Action {
   
  @@ -69,14 +69,6 @@
   
   
       /**
  -     * 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.
       **/
  @@ -219,9 +211,9 @@
   
   
   /*
  - * $Header: /home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/BaseHelperAction.java,v
1.1 2002/01/01 13:44:04 husted Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/01/01 13:44:04 $
  + * $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 $
    *
    * ====================================================================
    *
  
  
  

--
To unsubscribe, e-mail:   <mailto:struts-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@jakarta.apache.org>


Mime
View raw message