[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xml-cocoon-cvs
Subject:    cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom FOM_JavaScriptInter
From:       bruno () apache ! org
Date:       2004-01-31 16:50:56
Message-ID: 20040131165056.12888.qmail () minotaur ! apache ! org
[Download RAW message or body]

bruno       2004/01/31 08:50:56

  Modified:    src/java/org/apache/cocoon/components/flow/javascript/fom
                        FOM_JavaScriptInterpreter.java
  Log:
  Fix JDK 1.3 runtime errors (NoSuchMethodError on referencing protected
  member from parent of outer class)
  
  Revision  Changes    Path
  1.20      +11 -2     \
cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
  
  Index: FOM_JavaScriptInterpreter.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- FOM_JavaScriptInterpreter.java	19 Jan 2004 17:53:38 -0000	1.19
  +++ FOM_JavaScriptInterpreter.java	31 Jan 2004 16:50:56 -0000	1.20
  @@ -66,6 +66,7 @@
   import java.util.StringTokenizer;
   
   import org.apache.avalon.framework.CascadingRuntimeException;
  +import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
  @@ -159,6 +160,14 @@
       JSErrorReporter errorReporter;
       boolean enableDebugger = false;
   
  +    /**
  +     * Needed to get things working with JDK 1.3. Can be removed once we
  +     * don't support that platform any more.
  +     */
  +    private ComponentManager getComponentManager() {
  +        return manager;
  +    }
  +
       class MyClassRepository implements CompilingClassLoader.ClassRepository {
   
           Map javaSource = new HashMap();
  @@ -180,7 +189,7 @@
   
           public synchronized boolean upToDateCheck() throws Exception {
               SourceResolver sourceResolver = (SourceResolver)
  -                manager.lookup(SourceResolver.ROLE);
  +                getComponentManager().lookup(SourceResolver.ROLE);
               Iterator iter = javaSource.entrySet().iterator();
               List invalid = new LinkedList();
               while (iter.hasNext()) {
  
  
  


[prev in list] [next in list] [prev in thread] [next in thread]