Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 12910 invoked from network); 31 Jan 2004 16:50:57 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 31 Jan 2004 16:50:57 -0000 Received: (qmail 97793 invoked by uid 500); 31 Jan 2004 16:50:51 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 97728 invoked by uid 500); 31 Jan 2004 16:50:50 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 97711 invoked by uid 500); 31 Jan 2004 16:50:50 -0000 Delivered-To: apmail-cocoon-2.1-cvs@apache.org Received: (qmail 97708 invoked from network); 31 Jan 2004 16:50:50 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 31 Jan 2004 16:50:50 -0000 Received: (qmail 12889 invoked by uid 1638); 31 Jan 2004 16:50:56 -0000 Date: 31 Jan 2004 16:50:56 -0000 Message-ID: <20040131165056.12888.qmail@minotaur.apache.org> From: bruno@apache.org To: cocoon-2.1-cvs@apache.org Subject: cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom FOM_JavaScriptInterpreter.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N 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()) {