You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by mb...@apache.org on 2008/07/11 17:48:44 UTC
svn commit: r675996 - in
/ant/core/trunk/src/main/org/apache/tools/ant/property: GetProperty.java
NullReturn.java ParseNextProperty.java ParseProperties.java
PropertyExpander.java ResolvePropertyMap.java
Author: mbenson
Date: Fri Jul 11 08:48:43 2008
New Revision: 675996
URL: http://svn.apache.org/viewvc?rev=675996&view=rev
Log:
since; ws
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/property/GetProperty.java
ant/core/trunk/src/main/org/apache/tools/ant/property/NullReturn.java
ant/core/trunk/src/main/org/apache/tools/ant/property/ParseNextProperty.java
ant/core/trunk/src/main/org/apache/tools/ant/property/ParseProperties.java
ant/core/trunk/src/main/org/apache/tools/ant/property/PropertyExpander.java
ant/core/trunk/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/property/GetProperty.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/property/GetProperty.java?rev=675996&r1=675995&r2=675996&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/property/GetProperty.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/property/GetProperty.java Fri Jul 11 08:48:43 2008
@@ -17,7 +17,10 @@
*/
package org.apache.tools.ant.property;
-/** Interface to a class (normally PropertyHelper) to get a property */
+/**
+ * Interface to a class (normally PropertyHelper) to get a property.
+ * @since Ant 1.8.0
+ */
public interface GetProperty {
/**
* Returns the value of a property if it is set.
Modified: ant/core/trunk/src/main/org/apache/tools/ant/property/NullReturn.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/property/NullReturn.java?rev=675996&r1=675995&r2=675996&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/property/NullReturn.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/property/NullReturn.java Fri Jul 11 08:48:43 2008
@@ -17,7 +17,10 @@
*/
package org.apache.tools.ant.property;
-/** Class to represent a null and to stop the chain of lookups. */
+/**
+ * Class to represent a null and to stop the chain of lookups.
+ * @since Ant 1.8.0
+ */
public final class NullReturn {
/** a value to use in a property helper to stop looking properties */
public static final NullReturn NULL = new NullReturn();
@@ -25,5 +28,11 @@
/** Private constructor */
private NullReturn() {
}
-}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString() {
+ return String.valueOf(null);
+ }
+}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/property/ParseNextProperty.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/property/ParseNextProperty.java?rev=675996&r1=675995&r2=675996&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/property/ParseNextProperty.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/property/ParseNextProperty.java Fri Jul 11 08:48:43 2008
@@ -21,7 +21,10 @@
import org.apache.tools.ant.Project;
-/** Interface to parse a property */
+/**
+ * Interface to parse a property.
+ * @since Ant 1.8.0
+ */
public interface ParseNextProperty {
/**
* Get the current project.
Modified: ant/core/trunk/src/main/org/apache/tools/ant/property/ParseProperties.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/property/ParseProperties.java?rev=675996&r1=675995&r2=675996&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/property/ParseProperties.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/property/ParseProperties.java Fri Jul 11 08:48:43 2008
@@ -24,6 +24,7 @@
/**
* Parse properties using a collection of expanders.
+ * @since Ant 1.8.0
*/
public class ParseProperties implements ParseNextProperty {
@@ -37,8 +38,7 @@
* @param expanders a sequence of exapanders
* @param getProperty property resolver.
*/
- public ParseProperties(
- Project project, Collection expanders, GetProperty getProperty) {
+ public ParseProperties(Project project, Collection expanders, GetProperty getProperty) {
this.project = project;
this.expanders = expanders;
this.getProperty = getProperty;
Modified: ant/core/trunk/src/main/org/apache/tools/ant/property/PropertyExpander.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/property/PropertyExpander.java?rev=675996&r1=675995&r2=675996&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/property/PropertyExpander.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/property/PropertyExpander.java Fri Jul 11 08:48:43 2008
@@ -21,7 +21,10 @@
import java.text.ParsePosition;
-/** Interface to a class (normally PropertyHelper) to get a property */
+/**
+ * Interface to a class (normally PropertyHelper) to get a property.
+ * @since Ant 1.8.0
+ */
public interface PropertyExpander extends PropertyHelper.Delegate {
/**
* Parse the next property name.
@@ -30,7 +33,6 @@
* @param parseNextProperty parse next property
* @return parsed String if any, else <code>null</code>.
*/
- String parsePropertyName(
- String s, ParsePosition pos, ParseNextProperty parseNextProperty);
+ String parsePropertyName(String s, ParsePosition pos, ParseNextProperty parseNextProperty);
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java?rev=675996&r1=675995&r2=675996&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/property/ResolvePropertyMap.java Fri Jul 11 08:48:43 2008
@@ -27,12 +27,13 @@
import org.apache.tools.ant.BuildException;
/**
- * Class to resolve properties in a map.
+ * Class to resolve properties in a map.
+ * @since Ant 1.8.0
*/
public class ResolvePropertyMap implements GetProperty {
- private final Set seen = new HashSet();
+ private final Set seen = new HashSet();
private final ParseProperties parseProperties;
- private final GetProperty master;
+ private final GetProperty master;
private Map map;
/**
@@ -41,8 +42,7 @@
* @param master the master property holder (usually PropertyHelper)
* @param expanders a collection of expanders (usually from PropertyHelper).
*/
- public ResolvePropertyMap(
- Project project, GetProperty master, Collection expanders) {
+ public ResolvePropertyMap(Project project, GetProperty master, Collection expanders) {
this.master = master;
this.parseProperties = new ParseProperties(project, expanders, this);
}