|
@@ -1885,28 +1885,6 @@ public class Project implements ResourceFactory { |
|
|
parentIdProject = parent; |
|
|
parentIdProject = parent; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* Attempt to resolve an Unknown Reference using the |
|
|
|
|
|
* parsed id's - for BC. |
|
|
|
|
|
*/ |
|
|
|
|
|
private Object resolveIdReference(String key, Project callerProject) { |
|
|
|
|
|
UnknownElement origUE = (UnknownElement) idReferences.get(key); |
|
|
|
|
|
if (origUE == null) { |
|
|
|
|
|
return parentIdProject == null |
|
|
|
|
|
? null |
|
|
|
|
|
: parentIdProject.resolveIdReference(key, callerProject); |
|
|
|
|
|
} |
|
|
|
|
|
callerProject.log( |
|
|
|
|
|
"Warning: Reference " + key + " has not been set at runtime," |
|
|
|
|
|
+ " but was found during" + LINE_SEP |
|
|
|
|
|
+ "build file parsing, attempting to resolve." |
|
|
|
|
|
+ " Future versions of Ant may support" + LINE_SEP |
|
|
|
|
|
+ " referencing ids defined in non-executed targets.", MSG_WARN); |
|
|
|
|
|
UnknownElement copyUE = origUE.copy(callerProject); |
|
|
|
|
|
copyUE.maybeConfigure(); |
|
|
|
|
|
return copyUE.getRealThing(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* Add an id reference. |
|
|
* Add an id reference. |
|
|
* Used for broken build files. |
|
|
* Used for broken build files. |
|
@@ -1963,9 +1941,7 @@ public class Project implements ResourceFactory { |
|
|
if (ret != null) { |
|
|
if (ret != null) { |
|
|
return ret; |
|
|
return ret; |
|
|
} |
|
|
} |
|
|
// Check for old id behaviour |
|
|
|
|
|
ret = resolveIdReference(key, this); |
|
|
|
|
|
if (ret == null && !key.equals(MagicNames.REFID_PROPERTY_HELPER)) { |
|
|
|
|
|
|
|
|
if (!key.equals(MagicNames.REFID_PROPERTY_HELPER)) { |
|
|
try { |
|
|
try { |
|
|
if (PropertyHelper.getPropertyHelper(this).containsProperties(key)) { |
|
|
if (PropertyHelper.getPropertyHelper(this).containsProperties(key)) { |
|
|
log("Unresolvable reference " + key |
|
|
log("Unresolvable reference " + key |
|
|