← Back to branch summary

~ubuntu-branches/ubuntu/maverick/ant/maverick

« back to all changes in this revision

Viewing changes to src/main/org/apache/tools/ant/taskdefs/Available.java

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2008-09-30 14:47:45 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20080930144745-0x8uzivd9t15dua3
Tags: 1.7.1-0ubuntu1
* New upstream version (bug fix release).
  - mainly a bugfix release.
  - has extended support for Java6 features.
  - <script> now has support for JavaFX.
  - release notes: http://apache.linux-mirror.org/ant/README.html
* Remove debian/patches/05_ant-bug433444.patch. Obsoleted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main/org/apache/tools/ant/taskdefs/Available.java
323
323
        } else {
324
324
            String[] paths = filepath.list();
325
325
            for (int i = 0; i < paths.length; ++i) {
326
 
                log("Searching " + paths[i], Project.MSG_DEBUG);
 
326
                log("Searching " + paths[i], Project.MSG_VERBOSE);
327
327
                File path = new File(paths[i]);
328
328
 
329
329
                // **   full-pathname specified == path in list
330
330
                // **   simple name specified   == path in list
331
 
                if (path.exists() && filename.equals(paths[i])) {
 
331
                if (path.exists()
 
332
                    && (filename.equals(paths[i])
 
333
                        || filename.equals(path.getName()))) {
332
334
                    if (type == null) {
333
335
                        log("Found: " + path, Project.MSG_VERBOSE);
334
336
                        return true;
365
367
                        return true;
366
368
                    }
367
369
                }
 
370
 
368
371
                // **   simple name specified   == parent dir + name
369
372
                while (searchParents && parent != null && parent.exists()) {
370
373
                    if (checkFile(new File(parent, filename),