← 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/types/resources/BaseResourceCollectionContainer.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/types/resources/BaseResourceCollectionContainer.java
82
82
        if (c == null) {
83
83
            return;
84
84
        }
 
85
        if (Project.getProject(c) == null) {
 
86
            Project p = getProject();
 
87
            if (p != null) {
 
88
                p.setProjectReference(c);
 
89
            }
 
90
        }
85
91
        rc.add(c);
86
92
        FailFast.invalidate(this);
87
93
        coll = null;
144
150
        //first the easy way, if all children are filesystem-only, return true:
145
151
        boolean goEarly = true;
146
152
        for (Iterator i = rc.iterator(); goEarly && i.hasNext();) {
147
 
            goEarly &= ((ResourceCollection) i.next()).isFilesystemOnly();
 
153
            goEarly = ((ResourceCollection) i.next()).isFilesystemOnly();
148
154
        }
149
155
        if (goEarly) {
150
156
            return true;