Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 54105 invoked from network); 7 Jul 2004 15:43:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 7 Jul 2004 15:43:56 -0000 Received: (qmail 29470 invoked by uid 500); 7 Jul 2004 15:18:01 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 29298 invoked by uid 500); 7 Jul 2004 15:17:59 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 29187 invoked by uid 99); 7 Jul 2004 15:17:57 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received: from [213.94.219.177] (HELO corvil.com) (213.94.219.177) by apache.org (qpsmtpd/0.27.1) with ESMTP; Wed, 07 Jul 2004 08:17:56 -0700 Received: from [172.18.1.171] (angel.local.corvil.com [172.18.1.171]) by corvil.com (8.12.9/8.12.5) with ESMTP id i67FHiOC052832 for ; Wed, 7 Jul 2004 16:17:45 +0100 (IST) (envelope-from peterreilly@apache.org) Message-ID: <40EC1418.7010305@apache.org> Date: Wed, 07 Jul 2004 16:17:44 +0100 From: Peter Reilly User-Agent: Mozilla Thunderbird 0.6 (X11/20040502) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Ant Developers List Subject: Re: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/script ScriptDefBase.java ScriptDef.java References: In-Reply-To: Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Yikes!, Thanks. Peter Jose Alberto Fernandez wrote: >Peter, > >your fix below looks funny (but maybe I am out of context) >You seem to pass a parameter called instance but set a value self not >mentioned. >Is that correct? > > > >>-----Original Message----- >>From: peterreilly@apache.org [mailto:peterreilly@apache.org] >> >> >... > > >> Index: ScriptDef.java >> =================================================================== >> RCS file: >>/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ >>script/ScriptDef.java,v >> retrieving revision 1.13 >> retrieving revision 1.14 >> diff -u -r1.13 -r1.14 >> --- ScriptDef.java 23 Apr 2004 14:18:15 -0000 1.13 >> +++ ScriptDef.java 7 Jul 2004 08:32:02 -0000 1.14 >> @@ -307,13 +307,30 @@ >> * Execute the script. >> * >> * @param attributes collection of attributes >> - * >> * @param elements a list of nested element values. >> + * @deprecated use executeScript(attribute, elements, >>instance) instead >> */ >> public void executeScript(Map attributes, Map elements) { >> runner.addBean("attributes", attributes); >> runner.addBean("elements", elements); >> runner.addBean("project", getProject()); >> + runner.executeScript("scriptdef_" + name); >> + } >> + >> + /** >> + * Execute the script. >> + * This is called by the script instance to execute >>the script for this >> + * definition. >> + * >> + * @param attributes collection of attributes >> + * @param elements a list of nested element values. >> + * @param instance the script instance >> + */ >> + public void executeScript(Map attributes, Map >>elements, ScriptDefBase instance) { >> + runner.addBean("attributes", attributes); >> + runner.addBean("elements", elements); >> + runner.addBean("project", getProject()); >> + runner.addBean("self", self); >> runner.executeScript("scriptdef_" + name); >> } >> >> > >The last "+" line is the one that looks funny. Do not have a full CVS at >hand >so I may have missed something. > >Jose Alberto > >--------------------------------------------------------------------- >To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org >For additional commands, e-mail: dev-help@ant.apache.org > > > > > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org