jesse 2003/04/21 07:21:16
Modified: src/main/org/apache/tools/ant/taskdefs/optional/perforce
P4Integrate.java
src/main/org/apache/tools/ant/taskdefs/optional/net
SetProxy.java
src/main/org/apache/tools/ant/taskdefs/optional/extension
Extension.java
src/main/org/apache/tools/ant/taskdefs SQLExec.java
Parallel.java
Log:
Fix javadoc warnings
Revision Changes Path
1.5 +12 -12
ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Integrate.java
Index: P4Integrate.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Integrate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- P4Integrate.java 10 Feb 2003 14:14:19 -0000 1.4
+++ P4Integrate.java 21 Apr 2003 14:21:16 -0000 1.5
@@ -92,7 +92,7 @@
/**
* get the changelist number
*
- * @returns the changelist number set for this task
+ * @return the changelist number set for this task
*/
public String getChange() {
return change;
@@ -111,7 +111,7 @@
/**
* get the from file specification
*
- * @returns the from file specification
+ * @return the from file specification
*/
public String getFromfile() {
return fromfile;
@@ -129,7 +129,7 @@
/**
* get the to file specification
*
- * @returns the to file specification
+ * @return the to file specification
*/
public String getTofile() {
return tofile;
@@ -147,7 +147,7 @@
/**
* get the branch
*
- * @returns the name of the branch
+ * @return the name of the branch
*/
public String getBranch() {
return branch;
@@ -165,7 +165,7 @@
/**
* gets the restoredeletedrevisions flag
*
- * @returns restore deleted revisions
+ * @return restore deleted revisions
*/
public boolean isRestoreDeletedRevisions() {
return restoredeletedrevisions;
@@ -183,7 +183,7 @@
/**
* gets the forceintegrate flag
*
- * @returns restore deleted revisions
+ * @return restore deleted revisions
*/
public boolean isForceIntegrate() {
return forceintegrate;
@@ -201,7 +201,7 @@
/**
* gets the leavetargetrevision flag
*
- * @returns flag indicating if the target revision should be preserved
+ * @return flag indicating if the target revision should be preserved
*/
public boolean isLeaveTargetRevision() {
return leavetargetrevision;
@@ -219,7 +219,7 @@
/**
* gets the enablebaselessmerges flag
*
- * @returns boolean indicating if baseless merges are desired
+ * @return boolean indicating if baseless merges are desired
*/
public boolean isEnableBaselessMerges() {
return enablebaselessmerges;
@@ -237,7 +237,7 @@
/**
* gets the simulationmode flag
*
- * @returns simulation mode flag
+ * @return simulation mode flag
*/
public boolean isSimulationMode() {
return simulationmode;
@@ -254,7 +254,7 @@
/**
* returns the flag indicating if reverse branch mappings are sought
*
- * @returns reversebranchmappings flag
+ * @return reversebranchmappings flag
*/
public boolean isReversebranchmappings() {
return reversebranchmappings;
@@ -271,7 +271,7 @@
/**
* returns flag indicating if propagation of source file type is sought
*
- * @returns flag set to true if you want to propagate source file type
for existing target files
+ * @return flag set to true if you want to propagate source file type
for existing target files
*/
public boolean isPropagatesourcefiletype() {
return propagatesourcefiletype;
@@ -287,7 +287,7 @@
/**
* returns flag indicating if one wants to suppress the copying on the
local hard disk of new target files
*
- * @returns flag indicating if one wants to suppress the copying on
the local hard disk of new target files
+ * @return flag indicating if one wants to suppress the copying on the
local hard disk of new target files
*/
public boolean isNocopynewtargetfiles() {
return nocopynewtargetfiles;
1.11 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java
Index: SetProxy.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SetProxy.java 10 Feb 2003 14:14:18 -0000 1.10
+++ SetProxy.java 21 Apr 2003 14:21:16 -0000 1.11
@@ -194,7 +194,7 @@
}
/**
- * set the password for the proxy. used only if the proxyUser is set
+ * Set the password for the proxy. Used only if the proxyUser is set.
* @param proxyPassword password to go with the username
* @since Ant1.6
*/
1.6 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java
Index: Extension.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/Extension.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Extension.java 10 Feb 2003 14:14:03 -0000 1.5
+++ Extension.java 21 Apr 2003 14:21:16 -0000 1.6
@@ -177,7 +177,7 @@
/**
* Enum indicating that extension is incompatible with
* other extension in ways other than other enums
- * indicate). ie For example the other extension may have
+ * indicate). For example the other extension may have
* a different ID.
*/
public static final Compatibility INCOMPATIBLE =
1.54 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
Index: SQLExec.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- SQLExec.java 9 Apr 2003 13:15:31 -0000 1.53
+++ SQLExec.java 21 Apr 2003 14:21:16 -0000 1.54
@@ -259,8 +259,8 @@
}
/**
- * Set the delimiter that separates SQL statements;
- * optional, default ";"
+ * Set the delimiter that separates SQL statements. Defaults to
";";
+ * optional
*
* <p>For example, set this to "go" and delimitertype to "ROW" for
* Sybase ASE or MS SQL Server.</p>
1.18 +3 -2 ant/src/main/org/apache/tools/ant/taskdefs/Parallel.java
Index: Parallel.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Parallel.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Parallel.java 14 Apr 2003 11:58:04 -0000 1.17
+++ Parallel.java 21 Apr 2003 14:21:16 -0000 1.18
@@ -64,7 +64,8 @@
/**
* Executes the contained tasks in separate threads, continuing
- * once all are completed.<br/>
+ * once all are completed.
+ * <p>
* New behavior allows for the ant script to specify a maximum number of
* threads that will be executed in parallel. One should be very careful
about
* using the <code>waitFor</code> task when specifying
<code>threadCount</code>
@@ -74,7 +75,7 @@
* task is started, but it will not insure a successful completion of those
* tasks or that those tasks will finish first (i.e. it's a classic race
* condition).
- * <p>
+ * </p>
* @author Thomas Christen <a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>
* @author Conor MacNeill
* @author Danno Ferrin
