cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom FOM_Cocoon.java
Date Mon, 24 Nov 2003 12:12:44 GMT
antonio     2003/11/24 04:12:44

  Modified:    src/java/org/apache/cocoon/components/flow/javascript/fom
                        FOM_Cocoon.java
  Log:
  Organizing imports
  
  Revision  Changes    Path
  1.20      +6 -6      cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
  
  Index: FOM_Cocoon.java
  ===================================================================
  RCS file: /home/cvs//cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- FOM_Cocoon.java	23 Nov 2003 20:57:03 -0000	1.19
  +++ FOM_Cocoon.java	24 Nov 2003 12:12:44 -0000	1.20
  @@ -61,6 +61,7 @@
   
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentManager;
  +import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.cocoon.components.LifecycleHelper;
  @@ -75,7 +76,6 @@
   import org.apache.cocoon.environment.Response;
   import org.apache.cocoon.environment.Session;
   import org.apache.cocoon.environment.http.HttpResponse;
  -import org.mozilla.javascript.Context;
   import org.mozilla.javascript.JavaScriptException;
   import org.mozilla.javascript.NativeJavaObject;
   import org.mozilla.javascript.Script;
  @@ -90,12 +90,12 @@
    *
    * @since 2.1 
    * @author <a href="mailto:coliver.at.apache.org">Christopher Oliver</a>
  - * @author <a href="mailto:reinhard.at.apache.org">Reinhard Ptz</a>
  + * @author <a href="mailto:reinhard.at.apache.org">Reinhard P�tz</a>
    * @version CVS $Id$
    */
   public class FOM_Cocoon extends ScriptableObject {
   
  -    private org.apache.avalon.framework.context.Context avalonContext;
  +    private Context avalonContext;
   
       private ServiceManager serviceManager;
   
  @@ -134,7 +134,7 @@
                  Environment env, 
                  ComponentManager manager,
                  ServiceManager serviceManager,
  -               org.apache.avalon.framework.context.Context avalonContext,
  +               Context avalonContext,
                  Logger logger) {
           this.interpreter = interp;
           this.environment = env;
  @@ -472,7 +472,7 @@
           }
           
           public Scriptable jsGet_cookies() {
  -            return Context.getCurrentContext().newArray(getParentScope(), jsFunction_getCookies());
  +            return org.mozilla.javascript.Context.getCurrentContext().newArray(getParentScope(),
jsFunction_getCookies());
           }
               
           public FOM_Cookie jsFunction_getCookie(String name) {
  
  
  

Mime
View raw message