antoine 2004/07/17 09:34:40
Modified: src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
Location.java Project.java RuntimeConfigurable.java
Log:
Merge from HEAD
Javadoc fixes for RuntimeConfigurable, Project, Location
PR: 30160
Submitted by: Jesse Glick (jglick at netbeans dot org)
Revision Changes Path
No revision
No revision
1.15.2.5 +1 -1 ant/src/main/org/apache/tools/ant/Location.java
Index: Location.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Location.java,v
retrieving revision 1.15.2.4
retrieving revision 1.15.2.5
diff -u -r1.15.2.4 -r1.15.2.5
--- Location.java 9 Mar 2004 17:01:29 -0000 1.15.2.4
+++ Location.java 17 Jul 2004 16:34:40 -0000 1.15.2.5
@@ -113,7 +113,7 @@
* An error message can be appended easily. For unknown locations, an
* empty string is returned.
*
- * @return a String of the form <code>"fileName: lineNumber: "</code>
+ * @return a String of the form <code>"fileName:lineNumber: "</code>
* if both file name and line number are known,
* <code>"fileName: "</code> if only the file name is known,
* and the empty string for unknown locations.
1.154.2.11 +6 -6 ant/src/main/org/apache/tools/ant/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/Project.java,v
retrieving revision 1.154.2.10
retrieving revision 1.154.2.11
diff -u -r1.154.2.10 -r1.154.2.11
--- Project.java 28 Jun 2004 07:47:05 -0000 1.154.2.10
+++ Project.java 17 Jul 2004 16:34:40 -0000 1.154.2.11
@@ -88,31 +88,31 @@
/**
* Version constant for Java 1.0
*
- * @deprecated use org.apache.tools.ant.util.JavaEnvUtils instead
+ * @deprecated Use [EMAIL PROTECTED] JavaEnvUtils#JAVA_1_0} instead.
*/
public static final String JAVA_1_0 = JavaEnvUtils.JAVA_1_0;
/**
* Version constant for Java 1.1
*
- * @deprecated use org.apache.tools.ant.util.JavaEnvUtils instead
+ * @deprecated Use [EMAIL PROTECTED] JavaEnvUtils#JAVA_1_1} instead.
*/
public static final String JAVA_1_1 = JavaEnvUtils.JAVA_1_1;
/**
* Version constant for Java 1.2
*
- * @deprecated use org.apache.tools.ant.util.JavaEnvUtils instead
+ * @deprecated Use [EMAIL PROTECTED] JavaEnvUtils#JAVA_1_2} instead.
*/
public static final String JAVA_1_2 = JavaEnvUtils.JAVA_1_2;
/**
* Version constant for Java 1.3
*
- * @deprecated use org.apache.tools.ant.util.JavaEnvUtils instead
+ * @deprecated Use [EMAIL PROTECTED] JavaEnvUtils#JAVA_1_3} instead.
*/
public static final String JAVA_1_3 = JavaEnvUtils.JAVA_1_3;
/**
* Version constant for Java 1.4
*
- * @deprecated use org.apache.tools.ant.util.JavaEnvUtils instead
+ * @deprecated Use [EMAIL PROTECTED] JavaEnvUtils#JAVA_1_4} instead.
*/
public static final String JAVA_1_4 = JavaEnvUtils.JAVA_1_4;
1.45.2.6 +4 -2
ant/src/main/org/apache/tools/ant/RuntimeConfigurable.java
Index: RuntimeConfigurable.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/RuntimeConfigurable.java,v
retrieving revision 1.45.2.5
retrieving revision 1.45.2.6
diff -u -r1.45.2.5 -r1.45.2.6
--- RuntimeConfigurable.java 9 Mar 2004 17:01:29 -0000 1.45.2.5
+++ RuntimeConfigurable.java 17 Jul 2004 16:34:40 -0000 1.45.2.6
@@ -183,6 +183,7 @@
/** Return the attribute map.
*
* @return Attribute name to attribute value map
+ * @since Ant 1.6
*/
public Hashtable getAttributeMap() {
if (attributeMap != null) {
@@ -195,7 +196,7 @@
/**
* Returns the list of attributes for the wrapped element.
*
- * @deprecated
+ * @deprecated Deprecated since Ant 1.6 in favor of [EMAIL PROTECTED]
#getAttributeMap}.
* @return An AttributeList representing the attributes defined in the
* XML for this element. May be <code>null</code>.
*/
@@ -231,7 +232,7 @@
/**
* Returns an enumeration of all child wrappers.
* @return an enumeration of the child wrappers.
- * @since Ant 1.5.1
+ * @since Ant 1.6
*/
public Enumeration getChildren() {
if (children != null) {
@@ -282,6 +283,7 @@
* multiple fragments.
*
* @return the text content of this element.
+ * @since Ant 1.6
*/
public StringBuffer getText() {
if (characters != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
