You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2002/06/12 01:54:54 UTC

cvs commit: xml-cocoon2/src/java/org/apache/cocoon/acting SetCharacterEncodingAction.java

vgritsenko    2002/06/11 16:54:54

  Modified:    src/java/org/apache/cocoon/acting
                        SetCharacterEncodingAction.java
  Log:
  Use ObjectModelHelper instead of deprecated Constants
  
  Revision  Changes    Path
  1.3       +6 -5      xml-cocoon2/src/java/org/apache/cocoon/acting/SetCharacterEncodingAction.java
  
  Index: SetCharacterEncodingAction.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/SetCharacterEncodingAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SetCharacterEncodingAction.java	22 Feb 2002 06:59:26 -0000	1.2
  +++ SetCharacterEncodingAction.java	11 Jun 2002 23:54:54 -0000	1.3
  @@ -50,13 +50,14 @@
   */
   package org.apache.cocoon.acting;
   
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.avalon.framework.parameters.Parameterizable;
   import org.apache.avalon.framework.parameters.ParameterException;
  +import org.apache.avalon.framework.parameters.Parameterizable;
  +import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.thread.ThreadSafe;
  -import org.apache.cocoon.Constants;
  -import org.apache.cocoon.environment.Request;
  +
  +import org.apache.cocoon.environment.ObjectModelHelper;
   import org.apache.cocoon.environment.Redirector;
  +import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.SourceResolver;
   
   import java.util.Map;
  @@ -89,7 +90,7 @@
        * Set character encoding of current request.
        */
       public Map act (Redirector redirector, SourceResolver resolver, Map objectModel, String src, Parameters par) throws Exception {
  -        Request request = (Request) objectModel.get(Constants.REQUEST_OBJECT);
  +        Request request = ObjectModelHelper.getRequest(objectModel);
           if (request != null) {
               String form_encoding = par.getParameter("form-encoding", global_form_encoding);
               if (form_encoding != null) {
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org