ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@locus.apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant ProjectHelper.java
Date Thu, 30 Nov 2000 17:40:19 GMT
bodewig     00/11/30 09:40:19

  Modified:    src/main/org/apache/tools/ant ProjectHelper.java
  Log:
  Partially revert the last patch as it made taskdef work by breaking
  property. Now everything is as it has been before, including the
  failing taskdef.
  
  Revision  Changes    Path
  1.38      +4 -16     jakarta-ant/src/main/org/apache/tools/ant/ProjectHelper.java
  
  Index: ProjectHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/ProjectHelper.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- ProjectHelper.java	2000/11/30 17:27:54	1.37
  +++ ProjectHelper.java	2000/11/30 17:40:19	1.38
  @@ -223,12 +223,6 @@
        * Handler for the top level "project" element.
        */
       private class ProjectHandler extends AbstractHandler {
  -        /**
  -         * Tasks not living in a target need special processing
  -         * in endElement (this is the right place to call execute).
  -         */
  -        protected TaskHandler childHandler = null;
  -
           public ProjectHandler(DocumentHandler parentHandler) {
               super(parentHandler);
           }
  @@ -297,13 +291,15 @@
           }
   
           private void handleTaskdef(String name, AttributeList attrs) throws SAXParseException
{
  -            childHandler = new TaskHandler(this, null);
  +            TaskHandler childHandler = new TaskHandler(this, null);
               childHandler.init(name, attrs);
  +            childHandler.finished();
           }
   
           private void handleProperty(String name, AttributeList attrs) throws SAXParseException
{
  -            childHandler = new TaskHandler(this, null);
  +            TaskHandler childHandler = new TaskHandler(this, null);
               childHandler.init(name, attrs);
  +            childHandler.finished();
           }
   
           private void handleTarget(String tag, AttributeList attrs) throws SAXParseException
{
  @@ -314,14 +310,6 @@
               new DataTypeHandler(this).init(name, attrs);
           }
   
  -        public void endElement(String name) throws SAXException {
  -            if (childHandler != null) {
  -                childHandler.finished();
  -                childHandler = null;
  -            }
  -            
  -            super.endElement(name);
  -        }
       }
   
       /**
  
  
  

Mime
View raw message