diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java index e5cb4a87f..820a63927 100644 --- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java +++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java @@ -578,9 +578,8 @@ public abstract class AbstractFileSet extends DataType * for FileSet references, which can be handled by all ArchiveFileSets. * NB! This method must be overridden in subclasses such as FileSet and DirSet * to distinguish between the data types. - * @return the dereferenced object. * @param p the current project - * @return the referenced FileSet + * @return the dereferenced object. */ protected AbstractFileSet getRef(Project p) { return getCheckedRef(AbstractFileSet.class, getDataTypeName(), p); diff --git a/src/main/org/apache/tools/ant/types/Reference.java b/src/main/org/apache/tools/ant/types/Reference.java index 39cd3f6dd..dc12f5318 100644 --- a/src/main/org/apache/tools/ant/types/Reference.java +++ b/src/main/org/apache/tools/ant/types/Reference.java @@ -102,6 +102,7 @@ public class Reference { /** * Resolve the reference, using the associated project if * it set, otherwise use the passed in project. + * @param desired object type * @param fallback the fallback project to use if the project attribute of * reference is not set. * @return the dereferenced object. @@ -122,6 +123,7 @@ public class Reference { /** * Resolve the reference, looking in the associated project. * @see Project#getReference + * @param desired object type * @return the dereferenced object. * @throws BuildException if the project is null or the reference cannot be dereferenced * @since Ant 1.6.3 diff --git a/src/main/org/apache/tools/ant/types/Resource.java b/src/main/org/apache/tools/ant/types/Resource.java index e517470af..abdc9f8e7 100644 --- a/src/main/org/apache/tools/ant/types/Resource.java +++ b/src/main/org/apache/tools/ant/types/Resource.java @@ -449,6 +449,11 @@ public class Resource extends DataType implements Comparable, Resource return Optional.ofNullable(as(clazz)); } + /** + * Perform the check for circular references and return the + * referenced Resource. + * @return Resource. + */ protected Resource getRef() { return getCheckedRef(Resource.class); } diff --git a/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java b/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java index b02ee398e..655a2e290 100644 --- a/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java +++ b/src/main/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.java @@ -364,6 +364,10 @@ public abstract class AbstractSelectorContainer extends DataType } } + /** + * Clone the selector container. + * @return a deep clone of a selector container. + */ public synchronized Object clone() { if (isReference()) { return getRef().clone();