ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant Project.java ProjectHelper.java Target.java
Date Thu, 18 Jan 2001 02:50:33 GMT
jon         01/01/17 18:50:33

  Modified:    src/main/org/apache/tools/ant Project.java
                        ProjectHelper.java Target.java
  Log:
  rolling back Josh's changes until he provides a better patch. :-)
  
  -jon
  
  Revision  Changes    Path
  1.52      +2 -7      jakarta-ant/src/main/org/apache/tools/ant/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Project.java,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- Project.java	2001/01/18 01:44:17	1.51
  +++ Project.java	2001/01/18 02:50:32	1.52
  @@ -90,8 +90,8 @@
       public static final String JAVA_1_2 = "1.2";
       public static final String JAVA_1_3 = "1.3";
   
  -    private String TOKEN_START;
  -    private String TOKEN_END;
  +    public static final String TOKEN_START = "@";
  +    public static final String TOKEN_END = "@";
   
       private String name;
   
  @@ -1026,11 +1026,6 @@
   
       public Hashtable getReferences() {
           return references;
  -    }
  -
  -    public void setToken(String token) {
  -        TOKEN_START=token;
  -        TOKEN_END=token;
       }
   
       protected void fireBuildStarted() {
  
  
  
  1.47      +41 -85    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.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- ProjectHelper.java	2001/01/18 01:44:17	1.46
  +++ ProjectHelper.java	2001/01/18 02:50:32	1.47
  @@ -81,8 +81,7 @@
       /**
        * Configures the Project with the contents of the specified XML file.
        */
  -    public static void configureProject(Project project, File buildFile) 
  -        throws BuildException {
  +    public static void configureProject(Project project, File buildFile) throws BuildException
{
           new ProjectHelper(project, buildFile).parse();
       }
   
  @@ -109,13 +108,11 @@
               saxParser.parse(inputStream, new RootHandler());
           }
           catch(ParserConfigurationException exc) {
  -            throw new BuildException("Parser has not been configured " + 
  -                "correctly", exc);
  +            throw new BuildException("Parser has not been configured correctly", exc);
           }
           catch(SAXParseException exc) {
               Location location =
  -                new Location(buildFile.toString(), exc.getLineNumber(), 
  -                    exc.getColumnNumber());
  +                new Location(buildFile.toString(), exc.getLineNumber(), exc.getColumnNumber());
   
               Throwable t = exc.getException();
               if (t instanceof BuildException) {
  @@ -175,19 +172,15 @@
               parser.setDocumentHandler(this);
           }
   
  -        public void startElement(String tag, AttributeList attrs) 
  -            throws SAXParseException {
  -            throw new SAXParseException("Unexpected element \"" + tag + "\"", 
  -                locator);
  +        public void startElement(String tag, AttributeList attrs) throws SAXParseException
{
  +            throw new SAXParseException("Unexpected element \"" + tag + "\"", locator);
           }
   
  -        public void characters(char[] buf, int start, int end) 
  -            throws SAXParseException {
  +        public void characters(char[] buf, int start, int end) throws SAXParseException
{
               String s = new String(buf, start, end).trim();
   
               if (s.length() > 0) {
  -                throw new SAXParseException("Unexpected text \"" + s + "\"", 
  -                    locator);
  +                throw new SAXParseException("Unexpected text \"" + s + "\"", locator);
               }
           }
   
  @@ -206,8 +199,7 @@
       }
   
       /**
  -     * Handler for the root element. It's only child must be the "project" 
  -     * element.
  +     * Handler for the root element. It's only child must be the "project" element.
        */
       private class RootHandler extends HandlerBase {
   
  @@ -235,13 +227,11 @@
               return null;
           }
   
  -        public void startElement(String tag, AttributeList attrs) 
  -            throws SAXParseException {
  +        public void startElement(String tag, AttributeList attrs) throws SAXParseException
{
               if (tag.equals("project")) {
                   new ProjectHandler(this).init(tag, attrs);
               } else {
  -                throw new SAXParseException("Config file is not of " + 
  -                    "expected XML type", locator);
  +                throw new SAXParseException("Config file is not of expected XML type",
locator);
               }
           }
   
  @@ -258,8 +248,7 @@
               super(parentHandler);
           }
   
  -        public void init(String tag, AttributeList attrs) 
  -            throws SAXParseException {
  +        public void init(String tag, AttributeList attrs) throws SAXParseException {
               String def = null;
               String name = null;
               String id = null;
  @@ -278,15 +267,15 @@
                   } else if (key.equals("basedir")) {
                       baseDir = value;
                   } else {
  -                    throw new SAXParseException("Unexpected attribute \"" + 
  -                        attrs.getName(i) + "\"", locator);
  +                    throw new SAXParseException("Unexpected attribute \"" + attrs.getName(i)
+ "\"", locator);
                   }
               }
   
               if (def == null) {
  -                throw new SAXParseException("The default attribute of " + 
  -                    "project is required", locator);
  +                throw new SAXParseException("The default attribute of project is required",

  +                                            locator);
               }
  +            
   
               project.setDefaultTarget(def);
   
  @@ -307,17 +296,14 @@
                       if ((new File(baseDir)).isAbsolute()) {
                           project.setBasedir(baseDir);
                       } else {
  -                        project.setBasedir((
  -                            new File(buildFileParent, baseDir))
  -                            .getAbsolutePath());
  +                        project.setBasedir((new File(buildFileParent, baseDir)).getAbsolutePath());
                       }
                   }
               }
   
           }
   
  -        public void startElement(String name, AttributeList attrs) 
  -            throws SAXParseException {
  +        public void startElement(String name, AttributeList attrs) throws SAXParseException
{
               if (name.equals("taskdef")) {
                   handleTaskdef(name, attrs);
               } else if (name.equals("property")) {
  @@ -327,28 +313,23 @@
               } else if (project.getDataTypeDefinitions().get(name) != null) {
                   handleDataType(name, attrs);
               } else {
  -                throw new SAXParseException("Unexpected element \"" + name + 
  -                    "\"", locator);
  +                throw new SAXParseException("Unexpected element \"" + name + "\"", locator);
               }
           }
   
  -        private void handleTaskdef(String name, AttributeList attrs) 
  -            throws SAXParseException {
  +        private void handleTaskdef(String name, AttributeList attrs) throws SAXParseException
{
               (new TaskHandler(this, null)).init(name, attrs);
           }
   
  -        private void handleProperty(String name, AttributeList attrs) 
  -            throws SAXParseException {
  +        private void handleProperty(String name, AttributeList attrs) throws SAXParseException
{
               (new TaskHandler(this, null)).init(name, attrs);
           }
   
  -        private void handleTarget(String tag, AttributeList attrs) 
  -            throws SAXParseException {
  +        private void handleTarget(String tag, AttributeList attrs) throws SAXParseException
{
               new TargetHandler(this).init(tag, attrs);
           }
   
  -        private void handleDataType(String name, AttributeList attrs) 
  -            throws SAXParseException {
  +        private void handleDataType(String name, AttributeList attrs) throws SAXParseException
{
               new DataTypeHandler(this).init(name, attrs);
           }
   
  @@ -364,15 +345,13 @@
               super(parentHandler);
           }
   
  -        public void init(String tag, AttributeList attrs) 
  -            throws SAXParseException {
  +        public void init(String tag, AttributeList attrs) throws SAXParseException {
               String name = null;
               String depends = "";
               String ifCond = null;
               String unlessCond = null;
               String id = null;
               String description = null;
  -            String token = null;
   
               for (int i = 0; i < attrs.getLength(); i++) {
                   String key = attrs.getName(i);
  @@ -390,17 +369,13 @@
                       id = value;
                   } else if (key.equals("description")) {
                       description = value;
  -                } else if (key.equals("token")) {
  -                    token = value;
                   } else {
  -                    throw new SAXParseException("Unexpected attribute \"" + 
  -                        key + "\"", locator);
  +                    throw new SAXParseException("Unexpected attribute \"" + key + "\"",
locator);
                   }
               }
   
               if (name == null) {
  -                throw new SAXParseException("target element appears without " +
  -                "a name attribute", locator);
  +                throw new SAXParseException("target element appears without a name attribute",
locator);
               }
   
               target = new Target();
  @@ -408,11 +383,6 @@
               target.setIf(ifCond);
               target.setUnless(unlessCond);
               target.setDescription(description);
  -            if (token == null) {
  -                target.setToken("@");
  -            }
  -            else
  -                target.setToken(token);
               project.addTarget(name, target);
   
               if (id != null && !id.equals(""))
  @@ -429,8 +399,7 @@
               }
           }
   
  -        public void startElement(String name, AttributeList attrs) 
  -            throws SAXParseException {
  +        public void startElement(String name, AttributeList attrs) throws SAXParseException
{
               new TaskHandler(this, target).init(name, attrs);
           }
       }
  @@ -449,8 +418,7 @@
               this.target = target;
           }
   
  -        public void init(String tag, AttributeList attrs) 
  -            throws SAXParseException {
  +        public void init(String tag, AttributeList attrs) throws SAXParseException {
               try {
                   task = project.createTask(tag);
               } catch (BuildException e) {
  @@ -463,8 +431,7 @@
                   task.setProject(project);
               }
   
  -            task.setLocation(new Location(buildFile.toString(), 
  -                locator.getLineNumber(), locator.getColumnNumber()));
  +            task.setLocation(new Location(buildFile.toString(), locator.getLineNumber(),
locator.getColumnNumber()));
               configureId(task, attrs);
   
               // Top level tasks don't have associated targets
  @@ -486,8 +453,7 @@
               }
           }
   
  -        public void characters(char[] buf, int start, int end) 
  -            throws SAXParseException {
  +        public void characters(char[] buf, int start, int end) throws SAXParseException
{
               if (wrapper == null) {
                   try {
                       addText(task, buf, start, end);
  @@ -499,8 +465,7 @@
               }
           }
   
  -        public void startElement(String name, AttributeList attrs) 
  -            throws SAXParseException {
  +        public void startElement(String name, AttributeList attrs) throws SAXParseException
{
               new NestedElementHandler(this, task, wrapper).init(name, attrs);
           }
       }
  @@ -527,8 +492,7 @@
               this.parentWrapper = parentWrapper;
           }
   
  -        public void init(String propType, AttributeList attrs) 
  -            throws SAXParseException {
  +        public void init(String propType, AttributeList attrs) throws SAXParseException
{
               Class targetClass = target.getClass();
               IntrospectionHelper ih = 
                   IntrospectionHelper.getHelper(targetClass);
  @@ -555,8 +519,7 @@
               }
           }
   
  -        public void characters(char[] buf, int start, int end) 
  -            throws SAXParseException {
  +        public void characters(char[] buf, int start, int end) throws SAXParseException
{
               if (parentWrapper == null) {
                   try {
                       addText(child, buf, start, end);
  @@ -568,10 +531,8 @@
               }
           }
   
  -        public void startElement(String name, AttributeList attrs) 
  -            throws SAXParseException {
  -            new NestedElementHandler(this, child, childWrapper)
  -                .init(name, attrs);
  +        public void startElement(String name, AttributeList attrs) throws SAXParseException
{
  +            new NestedElementHandler(this, child, childWrapper).init(name, attrs);
           }
       }
   
  @@ -585,8 +546,7 @@
               super(parentHandler);
           }
   
  -        public void init(String propType, AttributeList attrs) 
  -            throws SAXParseException {
  +        public void init(String propType, AttributeList attrs) throws SAXParseException
{
               try {
                   element = project.createDataType(propType);
                   if (element == null) {
  @@ -600,8 +560,7 @@
               }
           }
   
  -        public void characters(char[] buf, int start, int end) 
  -            throws SAXParseException {
  +        public void characters(char[] buf, int start, int end) throws SAXParseException
{
               try {
                   addText(element, buf, start, end);
               } catch (BuildException exc) {
  @@ -609,8 +568,7 @@
               }
           }
   
  -        public void startElement(String name, AttributeList attrs) 
  -            throws SAXParseException {
  +        public void startElement(String name, AttributeList attrs) throws SAXParseException
{
               new NestedElementHandler(this, element, null).init(name, attrs);
           }
       }
  @@ -667,8 +625,7 @@
   
       /** Replace ${NAME} with the property value
        */
  -    public static String replaceProperties(Project project, String value, 
  -        Hashtable keys )
  +    public static String replaceProperties(Project project, String value, Hashtable keys
)
           throws BuildException
       {
           // XXX use Map instead of proj, it's too heavy
  @@ -698,12 +655,10 @@
                   }
                   String n=value.substring( pos+2, endName );
                   if (!keys.containsKey(n)) {
  -                    project.log("Property ${" + n + "} has not been set", 
  -                        Project.MSG_VERBOSE);
  +                    project.log("Property ${" + n + "} has not been set", Project.MSG_VERBOSE);
                   }
                   
  -                String v = (keys.containsKey(n)) ? 
  -                           (String) keys.get(n) : "${"+n+"}"; 
  +                String v = (keys.containsKey(n)) ? (String) keys.get(n) : "${"+n+"}"; 
                   
                   //System.out.println("N: " + n + " " + " V:" + v);
                   sb.append( v );
  @@ -737,4 +692,5 @@
               project.addReference(id, target);
           }
       }
  +
   }
  
  
  
  1.17      +0 -10     jakarta-ant/src/main/org/apache/tools/ant/Target.java
  
  Index: Target.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Target.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Target.java	2001/01/18 01:44:17	1.16
  +++ Target.java	2001/01/18 02:50:32	1.17
  @@ -71,7 +71,6 @@
       private Vector tasks = new Vector(5);
       private Project project;
       private String description = null;
  -    private String token = null;
   
       public void setProject(Project project) {
           this.project = project;
  @@ -81,14 +80,6 @@
           return project;
       }
   
  -    public void setToken(String token) {
  -        this.token = token;
  -    }
  -
  -    public String getToken() {
  -        return token;
  -    }
  -
       public void setDepends(String depS) {
           if (depS.length() > 0) {
               StringTokenizer tok =
  @@ -152,7 +143,6 @@
   
       public void execute() throws BuildException {
           if (testIfCondition() && testUnlessCondition()) {
  -            project.setToken(token);
               Enumeration enum = tasks.elements();
               while (enum.hasMoreElements()) {
                   Task task = (Task) enum.nextElement();
  
  
  

Mime
View raw message