You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2003/03/24 02:07:10 UTC

cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets QuestionnaireAction.java

weaver      2003/03/23 17:07:09

  Modified:    src/java/org/apache/jetspeed/modules/actions/portlets
                        QuestionnaireAction.java
  Log:
  - Removed calls to the newly deprecated setTemplate() method in JspAction
    and now uses the methods provided by PortletAction
  
  Revision  Changes    Path
  1.5       +8 -4      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/QuestionnaireAction.java
  
  Index: QuestionnaireAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/QuestionnaireAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- QuestionnaireAction.java	6 Feb 2003 16:14:27 -0000	1.4
  +++ QuestionnaireAction.java	24 Mar 2003 01:07:09 -0000	1.5
  @@ -86,6 +86,7 @@
    * This action sets up the template context for retrieving stock quotes.
    *
    * @author <a href="mailto:morciuch@apache.org">Mark Orciuch</a>
  + * @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
    * @version $Id$ 
    */
   
  @@ -122,7 +123,8 @@
           // reset to default template here
           if (rundata.getRequest().getAttribute("email") == null)
           {
  -            this.setTemplate(rundata, portlet, null);
  +            //this.setTemplate(rundata, portlet, null);
  +            resetTemplate(rundata);
           }
   
       }
  @@ -135,7 +137,8 @@
        */
       public void doContinue(RunData rundata, Portlet portlet)
       {
  -        this.setTemplate(rundata, portlet, null);
  +        // this.setTemplate(rundata, portlet, null);
  +        resetTemplate(rundata);
       }
   
       /**
  @@ -234,7 +237,8 @@
               rundata.getRequest().setAttribute("email", emailBody.toString());
               String confirmTemplate = portlet.getPortletConfig().getInitParameter("confirm.template", 
                                                                                    "JetspeedQuestionnaireConfirmation.jsp");
  -            this.setTemplate(rundata, portlet, confirmTemplate);
  +           // this.setTemplate(rundata, portlet, confirmTemplate);
  +            setTemplate(rundata, confirmTemplate, true);
   
               rundata.setMessage("Email successfully sent");
           }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org