bodewig 2004/04/14 08:42:41
Modified: src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
AntTypeDefinition.java ComponentHelper.java
PropertyHelper.java
src/main/org/apache/tools/ant/filters Tag: ANT_16_BRANCH
EscapeUnicode.java
src/main/org/apache/tools/ant/helper Tag: ANT_16_BRANCH
ProjectHelper2.java
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
AbstractCvsTask.java ExecTask.java SubAnt.java
Tar.java
src/main/org/apache/tools/ant/taskdefs/optional/dotnet Tag:
ANT_16_BRANCH CSharp.java DotnetCompile.java
DotnetDefine.java DotnetResource.java Ildasm.java
ImportTypelib.java
src/main/org/apache/tools/ant/taskdefs/optional/ejb Tag:
ANT_16_BRANCH IPlanetDeploymentTool.java
src/main/org/apache/tools/ant/taskdefs/optional/extension
Tag: ANT_16_BRANCH Specification.java
src/main/org/apache/tools/ant/taskdefs/optional/jsp Tag:
ANT_16_BRANCH JspC.java
src/main/org/apache/tools/ant/taskdefs/optional/perforce
Tag: ANT_16_BRANCH P4Labelsync.java
src/main/org/apache/tools/ant/taskdefs/optional/starteam
Tag: ANT_16_BRANCH TreeBasedTask.java
src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH
Assertions.java Commandline.java
CommandlineJava.java
src/main/org/apache/tools/ant/util Tag: ANT_16_BRANCH
ClasspathUtils.java
src/main/org/apache/tools/zip Tag: ANT_16_BRANCH
ZipOutputStream.java
Log:
merge
Revision Changes Path
No revision
No revision
1.7.2.6 +1 -1 ant/src/main/org/apache/tools/ant/AntTypeDefinition.java
Index: AntTypeDefinition.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/AntTypeDefinition.java,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -u -r1.7.2.5 -r1.7.2.6
--- AntTypeDefinition.java 15 Mar 2004 17:33:24 -0000 1.7.2.5
+++ AntTypeDefinition.java 14 Apr 2004 15:42:40 -0000 1.7.2.6
@@ -215,7 +215,7 @@
}
/**
- * check if the attributes are correct
+ * Checks if the attributes are correct.
* <dl>
* <li>if the class can be created.</li>
* <li>if an adapter class can be created</li>
1.28.2.7 +2 -2 ant/src/main/org/apache/tools/ant/ComponentHelper.java
Index: ComponentHelper.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/ComponentHelper.java,v
retrieving revision 1.28.2.6
retrieving revision 1.28.2.7
diff -u -r1.28.2.6 -r1.28.2.7
--- ComponentHelper.java 9 Mar 2004 17:01:29 -0000 1.28.2.6
+++ ComponentHelper.java 14 Apr 2004 15:42:40 -0000 1.28.2.7
@@ -235,9 +235,9 @@
}
/**
- * Initialization code - implementing the original ant component
+ * This method is initialization code implementing the original ant
component
* loading from /org/apache/tools/ant/taskdefs/default.properties
- * and .../types/default.properties
+ * and /org/apache/tools/ant/types/default.properties.
*/
public void initDefaultDefinitions() {
initTasks();
1.9.2.6 +3 -3 ant/src/main/org/apache/tools/ant/PropertyHelper.java
Index: PropertyHelper.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/PropertyHelper.java,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -u -r1.9.2.5 -r1.9.2.6
--- PropertyHelper.java 9 Mar 2004 17:01:29 -0000 1.9.2.5
+++ PropertyHelper.java 14 Apr 2004 15:42:40 -0000 1.9.2.6
@@ -169,9 +169,9 @@
/** Get a property. If all hooks return null, the default
* tables will be used.
*
- * @param ns
- * @param name
- * @return
+ * @param ns namespace of the sought property
+ * @param name name of the sought property
+ * @return The property, if returned by a hook, or null if none.
*/
public Object getPropertyHook(String ns, String name, boolean user) {
if (getNext() != null) {
No revision
No revision
1.4.2.5 +1 -1
ant/src/main/org/apache/tools/ant/filters/EscapeUnicode.java
Index: EscapeUnicode.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/EscapeUnicode.java,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -r1.4.2.4 -r1.4.2.5
--- EscapeUnicode.java 9 Mar 2004 17:01:31 -0000 1.4.2.4
+++ EscapeUnicode.java 14 Apr 2004 15:42:40 -0000 1.4.2.5
@@ -20,7 +20,7 @@
import java.io.Reader;
/**
- * Converts non latin characters to unicode escapes
+ * This method converts non-latin characters to unicode escapes.
* Useful to load properties containing non latin
* Example:
*
No revision
No revision
1.33.2.12 +2 -2
ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java
Index: ProjectHelper2.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java,v
retrieving revision 1.33.2.11
retrieving revision 1.33.2.12
diff -u -r1.33.2.11 -r1.33.2.12
--- ProjectHelper2.java 10 Mar 2004 09:34:21 -0000 1.33.2.11
+++ ProjectHelper2.java 14 Apr 2004 15:42:40 -0000 1.33.2.12
@@ -317,8 +317,8 @@
}
/**
- * Called when this element and all elements nested into it have been
- * handled (i.e. at the </end_tag_of_the_element> ).
+ * This method is called when this element and all elements nested
into it have been
+ * handled. I.e., this happens at the
</end_tag_of_the_element>.
* @param uri the namespace uri for this element
* @param tag the element name
* @param context the current context
No revision
No revision
1.26.2.7 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
Index: AbstractCvsTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java,v
retrieving revision 1.26.2.6
retrieving revision 1.26.2.7
diff -u -r1.26.2.6 -r1.26.2.7
--- AbstractCvsTask.java 9 Mar 2004 17:01:32 -0000 1.26.2.6
+++ AbstractCvsTask.java 14 Apr 2004 15:42:40 -0000 1.26.2.7
@@ -599,7 +599,7 @@
}
/**
- * add a command line argument to an external command
+ * This method adds a command line argument to an external command.
*
* I do not understand what this method does in this class ???
* particularly not why it is public ????
1.61.2.7 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
Index: ExecTask.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java,v
retrieving revision 1.61.2.6
retrieving revision 1.61.2.7
diff -u -r1.61.2.6 -r1.61.2.7
--- ExecTask.java 9 Mar 2004 17:01:33 -0000 1.61.2.6
+++ ExecTask.java 14 Apr 2004 15:42:40 -0000 1.61.2.7
@@ -327,9 +327,9 @@
/**
- * Attempt to figure out where the executable is so that we can feed
- * the full path - first try basedir, then the exec dir and then
- * fallback to the straight executable name (i.e. on ther path)
+ * The method attempts to figure out where the executable is so that we
can feed
+ * the full path. We first try basedir, then the exec dir, and then
+ * fallback to the straight executable name (i.e. on ther path).
*
* @param exec the name of the executable
* @param searchPath if true, the excutable will be looked up in
1.9.2.7 +8 -6 ant/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
Index: SubAnt.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/SubAnt.java,v
retrieving revision 1.9.2.6
retrieving revision 1.9.2.7
diff -u -r1.9.2.6 -r1.9.2.7
--- SubAnt.java 9 Mar 2004 17:01:34 -0000 1.9.2.6
+++ SubAnt.java 14 Apr 2004 15:42:40 -0000 1.9.2.7
@@ -197,9 +197,10 @@
}
/**
- * Build file name, to use in conjunction with directories.<br/>
- * Defaults to "build.xml".<br/>
- * If <code>genericantfile</code> is set, this attribute is ignored.
+ * This method builds the file name to use in conjunction with
directories.
+ *
+ * <p>Defaults to "build.xml".
+ * If <code>genericantfile</code> is set, this attribute is ignored.</p>
*
* @param antfile the short build file name. Defaults to "build.xml".
*/
@@ -208,9 +209,10 @@
}
/**
- * Build file path, to use in conjunction with directories.<br/>
- * Use <code>genericantfile</code>, in order to run the same build file
- * with different basedirs.<br/>
+ * This method builds a file path to use in conjunction with directories.
+ *
+ * <p>Use <code>genericantfile</code>, in order to run the same build
file
+ * with different basedirs.</p>
* If this attribute is set, <code>antfile</code> is ignored.
*
* @param afile (path of the generic ant file, absolute or relative to
1.46.2.7 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Tar.java
Index: Tar.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Tar.java,v
retrieving revision 1.46.2.6
retrieving revision 1.46.2.7
diff -u -r1.46.2.6 -r1.46.2.7
--- Tar.java 15 Mar 2004 15:32:41 -0000 1.46.2.6
+++ Tar.java 14 Apr 2004 15:42:40 -0000 1.46.2.7
@@ -540,7 +540,7 @@
/**
* The uid for the tar entry
* This is not the same as the User name.
- * @param userName the user name for the tar entry.
+ * @param uid the id of the user for the tar entry.
*/
public void setUid(int uid) {
this.uid = uid;
@@ -572,7 +572,7 @@
/**
* The GID for the tar entry; optional, default="0"
* This is not the same as the group name.
- * @param groupName the group name string.
+ * @param gid the group id.
*/
public void setGid(int gid) {
this.gid = gid;
No revision
No revision
1.36.2.7 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
Index: CSharp.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java,v
retrieving revision 1.36.2.6
retrieving revision 1.36.2.7
diff -u -r1.36.2.6 -r1.36.2.7
--- CSharp.java 9 Mar 2004 17:01:44 -0000 1.36.2.6
+++ CSharp.java 14 Apr 2004 15:42:40 -0000 1.36.2.7
@@ -361,7 +361,7 @@
// end execute
/**
- * how does C# separate references? with a semi colon
+ * Returns the delimiter which C# uses to separate references, i.e., a
semi colon.
*/
public String getReferenceDelimiter() {
return ";";
@@ -369,8 +369,8 @@
/**
- * extension is '.cs'
- * @return
+ * This method indicates the filename extension for C# files.
+ * @return the file extension for C#, i.e., "cs" (without the dot).
*/
public String getFileExtension() {
return "cs";
1.17.2.7 +5 -5
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java
Index: DotnetCompile.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.java,v
retrieving revision 1.17.2.6
retrieving revision 1.17.2.7
diff -u -r1.17.2.6 -r1.17.2.7
--- DotnetCompile.java 9 Mar 2004 17:01:44 -0000 1.17.2.6
+++ DotnetCompile.java 14 Apr 2004 15:42:40 -0000 1.17.2.7
@@ -711,8 +711,8 @@
}
/**
- * what is the executable?
- * @return
+ * This method gets the name of the executable.
+ * @return the name of the executable
*/
protected String getExecutable() {
return executable;
@@ -764,7 +764,7 @@
/**
* getter for flag
- * @return
+ * @return The flag indicating whether the compilation is using a
response file.
*/
public boolean isUseResponseFile() {
return useResponseFile;
@@ -922,8 +922,8 @@
protected abstract void addCompilerSpecificOptions(NetCommand command);
/**
- * override point for delimiting definitions
- * @return
+ * override point for delimiting definitions.
+ * @return The definitions limiter, i.e., ";"
*/
public String getDefinitionsDelimiter() {
return ";";
1.5.2.4 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.java
Index: DotnetDefine.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.java,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -r1.5.2.3 -r1.5.2.4
--- DotnetDefine.java 9 Feb 2004 22:12:27 -0000 1.5.2.3
+++ DotnetDefine.java 14 Apr 2004 15:42:40 -0000 1.5.2.4
@@ -62,10 +62,10 @@
}
/**
- * get the value of this definition. Will be null if a condition
+ * This method gets the value of this definition. Will be null if a
condition
* was declared and not met
* @param owner owning task
- * @return
+ * @return The value of the definition.
* @throws BuildException
*/
public String getValue(Task owner) throws BuildException {
1.2.2.4 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.java
Index: DotnetResource.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- DotnetResource.java 9 Feb 2004 22:12:27 -0000 1.2.2.3
+++ DotnetResource.java 14 Apr 2004 15:42:40 -0000 1.2.2.4
@@ -98,7 +98,7 @@
/**
* build the C# style parameter (which has no public/private option)
- * @return
+ * @return the built C# style parameter
*/
public String getCSharpStyleParameter() {
StringBuffer buffer = new StringBuffer();
@@ -117,8 +117,8 @@
}
/**
- * get the style of param used by VB and javascript
- * @return
+ * This method gets the style of param used by VB and javascript
+ * @return The style VB parameter being used.
*/
public String getVbStyleParameter() {
StringBuffer buffer = new StringBuffer();
1.3.2.5 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java
Index: Ildasm.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.java,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- Ildasm.java 9 Feb 2004 22:12:27 -0000 1.3.2.4
+++ Ildasm.java 14 Apr 2004 15:42:40 -0000 1.3.2.5
@@ -280,7 +280,7 @@
setSourceFile(sourceFile);
}
/**
- * visibility options: one or more of the following, with + signs to
+ * This method sets the visibility options. It chooses one or more of
the following, with + signs to
* concatenate them:
* <pre>
* pub : Public
@@ -425,9 +425,9 @@
}
/**
- * map from an encoding enum to an encoding option
+ * This method maps from an encoding enum to an encoding option.
* @param enumValue
- * @return
+ * @return The encoding option indicated by the enum value.
*/
public static String getEncodingOption(String enumValue) {
if (UNICODE.equals(enumValue)) {
1.6.2.6 +7 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java
Index: ImportTypelib.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.java,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -u -r1.6.2.5 -r1.6.2.6
--- ImportTypelib.java 9 Mar 2004 17:01:44 -0000 1.6.2.5
+++ ImportTypelib.java 14 Apr 2004 15:42:40 -0000 1.6.2.6
@@ -76,7 +76,9 @@
private String extraOptions = null;
/**
- * name the output file. required
+ * This method names the output file.
+ *
+ * This is an operation which is required to have been performed.
* @param destFile
*/
public void setDestFile(File destFile) {
@@ -84,7 +86,8 @@
}
/**
- * what namespace is the typelib to be in. required
+ * This method sets what namespace the typelib is to be in.
+ * This is an operation which is required to have been performed.
* @param namespace
*/
public void setNamespace(String namespace) {
@@ -92,7 +95,8 @@
}
/**
- * what is the source .tlb file? required.
+ * This method sets which is the source .tlb file.
+ * This is an operation which is required to have been performed.
* @param srcFile
*/
public void setSrcFile(File srcFile) {
No revision
No revision
1.10.2.5 +1 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java
Index: IPlanetDeploymentTool.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.java,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -u -r1.10.2.4 -r1.10.2.5
--- IPlanetDeploymentTool.java 9 Mar 2004 17:01:45 -0000 1.10.2.4
+++ IPlanetDeploymentTool.java 14 Apr 2004 15:42:41 -0000 1.10.2.5
@@ -292,8 +292,7 @@
*
* @param ejbFiles Hashtable of EJB class (and other) files to be added
to
* the completed JAR file.
- * @param baseName String name of the EJB JAR file to be written (without
- * a filename extension).
+ * @param ddPrefix not used
*/
protected void addVendorFiles(Hashtable ejbFiles, String ddPrefix) {
ejbFiles.put(META_DIR + IAS_DD, new File(getConfig().descriptorDir,
No revision
No revision
1.4.2.5 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java
Index: Specification.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/extension/Specification.java,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -r1.4.2.4 -r1.4.2.5
--- Specification.java 9 Mar 2004 17:01:45 -0000 1.4.2.4
+++ Specification.java 14 Apr 2004 15:42:41 -0000 1.4.2.5
@@ -108,9 +108,9 @@
new Compatibility("REQUIRE_IMPLEMENTATION_CHANGE");
/**
- * Enum indicating that extension is incompatible with
+ * This enum indicates that an extension is incompatible with
* other Package Specification in ways other than other enums
- * indicate). ie For example the other Package Specification
+ * indicate. For example, the other Package Specification
* may have a different ID.
*/
public static final Compatibility INCOMPATIBLE =
No revision
No revision
1.36.2.6 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
Index: JspC.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java,v
retrieving revision 1.36.2.5
retrieving revision 1.36.2.6
diff -u -r1.36.2.5 -r1.36.2.6
--- JspC.java 9 Mar 2004 17:01:49 -0000 1.36.2.5
+++ JspC.java 14 Apr 2004 15:42:41 -0000 1.36.2.6
@@ -297,7 +297,7 @@
/**
* Filename for web.xml.
- * @return
+ * @return The filename for web.xml.
*/
public File getWebxml() {
return this.webxml;
No revision
No revision
1.4.2.5 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Labelsync.java
Index: P4Labelsync.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Labelsync.java,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -r1.4.2.4 -r1.4.2.5
--- P4Labelsync.java 9 Mar 2004 17:01:51 -0000 1.4.2.4
+++ P4Labelsync.java 14 Apr 2004 15:42:41 -0000 1.4.2.5
@@ -27,8 +27,8 @@
import org.apache.tools.ant.util.StringUtils;
/**
- * Syncs an existing Perforce label against the Perforce client
- * or against a set of files/revisions
+ * This method syncs an existing Perforce label against the Perforce client
+ * or against a set of files/revisions.
*
*
* Example Usage:
No revision
No revision
1.20.2.6 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java
Index: TreeBasedTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.java,v
retrieving revision 1.20.2.5
retrieving revision 1.20.2.6
diff -u -r1.20.2.5 -r1.20.2.6
--- TreeBasedTask.java 9 Mar 2004 17:01:53 -0000 1.20.2.5
+++ TreeBasedTask.java 14 Apr 2004 15:42:41 -0000 1.20.2.6
@@ -483,7 +483,7 @@
/**
* returns the label being used
*
- * @return
+ * @return the label being used
*/
protected Label getLabelInUse() {
return this.labelInUse;
No revision
No revision
1.6.2.6 +1 -1 ant/src/main/org/apache/tools/ant/types/Assertions.java
Index: Assertions.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Assertions.java,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -u -r1.6.2.5 -r1.6.2.6
--- Assertions.java 9 Mar 2004 17:01:54 -0000 1.6.2.5
+++ Assertions.java 14 Apr 2004 15:42:41 -0000 1.6.2.6
@@ -277,7 +277,7 @@
/**
* create a full command string from this class
* @throws BuildException in case of trouble
- * @return
+ * @return The command string
*/
public String toCommand() {
//catch invalidness
1.32.2.5 +2 -2 ant/src/main/org/apache/tools/ant/types/Commandline.java
Index: Commandline.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Commandline.java,v
retrieving revision 1.32.2.4
retrieving revision 1.32.2.5
diff -u -r1.32.2.4 -r1.32.2.5
--- Commandline.java 9 Mar 2004 17:01:54 -0000 1.32.2.4
+++ Commandline.java 14 Apr 2004 15:42:41 -0000 1.32.2.5
@@ -452,8 +452,8 @@
}
/**
- * a deep clone of the contained object.
- * @return
+ * Generate a deep clone of the contained object.
+ * @return a clone of the contained object
*/
public Object clone() {
try {
1.47.2.5 +4 -4
ant/src/main/org/apache/tools/ant/types/CommandlineJava.java
Index: CommandlineJava.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/CommandlineJava.java,v
retrieving revision 1.47.2.4
retrieving revision 1.47.2.5
diff -u -r1.47.2.4 -r1.47.2.5
--- CommandlineJava.java 9 Mar 2004 17:01:54 -0000 1.47.2.4
+++ CommandlineJava.java 14 Apr 2004 15:42:41 -0000 1.47.2.5
@@ -109,9 +109,9 @@
}
/**
- * get the size of the sysproperties instance. This merges all
+ * This method gets the size of the sysproperties instance. This
merges all
* property sets, so is not an O(1) operation.
- * @return
+ * @return the size of the sysproperties instance
*/
public int size() {
Properties p = mergePropertySets();
@@ -427,7 +427,7 @@
/**
* Get the VM command parameters, including memory settings
- * @return
+ * @return the VM command parameters
*/
private Commandline getActualVMCommand() {
Commandline actualVMCommand = (Commandline) vmCommand.clone();
@@ -520,7 +520,7 @@
/**
* get the system properties object
- * @return
+ * @return The system properties object
*/
public SysProperties getSystemProperties() {
return sysProperties;
No revision
No revision
1.8.2.4 +9 -9
ant/src/main/org/apache/tools/ant/util/ClasspathUtils.java
Index: ClasspathUtils.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/ClasspathUtils.java,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -r1.8.2.3 -r1.8.2.4
--- ClasspathUtils.java 9 Feb 2004 22:12:43 -0000 1.8.2.3
+++ ClasspathUtils.java 14 Apr 2004 15:42:41 -0000 1.8.2.4
@@ -78,7 +78,7 @@
*
* @param p
* @param ref
- * @return
+ * @return The class loader
*/
public static ClassLoader getClassLoaderForPath(
Project p, Reference ref) {
@@ -98,7 +98,7 @@
* @param reverseLoader if set to true this new loader will take
* precedence over it's parent (which is contra the regular
* classloader behaviour)
- * @return
+ * @return The class loader
*/
public static ClassLoader getClassLoaderForPath(
Project p, Reference ref, boolean reverseLoader) {
@@ -123,7 +123,7 @@
*
* @param path
* @param loaderId
- * @return
+ * @return The class loader
*/
public static ClassLoader getClassLoaderForPath(
Project p, Path path, String loaderId) {
@@ -140,7 +140,7 @@
*
* @param path
* @param loaderId
- * @return
+ * @return The class loader
*/
public static ClassLoader getClassLoaderForPath(
Project p, Path path, String loaderId, boolean reverseLoader) {
@@ -199,7 +199,7 @@
* property and should be used with caution.</p>
* @param path the classpath for this loader
* @param reverseLoader
- * @return
+ * @return The fresh, different, not used before class loader.
*/
public static ClassLoader getUniqueClassLoaderForPath(
Project p,
@@ -225,7 +225,7 @@
*
* @param className the full qualified class name to load.
* @param userDefinedLoader the classloader to use.
- * @return
+ * @return The fresh object instance
* @throws BuildException when loading or instantiation failed.
*/
public static Object newInstance(
@@ -312,7 +312,7 @@
}
/**
- * Delegate method handling the @classpath attribute
+ * This method is a Delegate method handling the @classpath
attribute.
*
* <p>This attribute can set a path to add to the classpath</p>
*
@@ -332,7 +332,7 @@
* <p>This nested path-like structure can set a path to add to the
* classpath</p>
*
- * @return
+ * @return the created path
*/
public Path createClasspath() {
if (this.classpath == null) {
@@ -396,7 +396,7 @@
/**
* Finds or creates the classloader for this
- * @return
+ * @return The class loader
*/
public ClassLoader getClassLoader() {
ClassLoader cl;
No revision
No revision
1.17.2.6 +7 -7 ant/src/main/org/apache/tools/zip/ZipOutputStream.java
Index: ZipOutputStream.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/zip/ZipOutputStream.java,v
retrieving revision 1.17.2.5
retrieving revision 1.17.2.6
diff -u -r1.17.2.5 -r1.17.2.6
--- ZipOutputStream.java 10 Mar 2004 14:41:14 -0000 1.17.2.5
+++ ZipOutputStream.java 14 Apr 2004 15:42:41 -0000 1.17.2.6
@@ -155,7 +155,7 @@
private static final byte[] LZERO = {0, 0, 0, 0};
/**
- * Holds the offsets of the LFH starts for each entry
+ * Holds the offsets of the LFH starts for each entry.
*
* @since 1.1
*/
@@ -173,7 +173,7 @@
private String encoding = null;
/**
- * Deflater object for output
+ * This Deflater object is used for output.
*
* <p>This attribute is only protected to provide a level of API
* backwards compatibility. This class used to extend [EMAIL PROTECTED]
@@ -185,7 +185,7 @@
protected Deflater def = new Deflater(Deflater.DEFAULT_COMPRESSION,
true);
/**
- * Deflater buffer
+ * This buffer servers as a Deflater.
*
* <p>This attribute is only protected to provide a level of API
* backwards compatibility. This class used to extend [EMAIL PROTECTED]
@@ -197,7 +197,7 @@
protected byte[] buf = new byte[512];
/**
- * Optional random access output
+ * Optional random access output.
*
* @since 1.14
*/
@@ -252,8 +252,8 @@
}
/**
- * Is this archive writing to a seekable stream (i.e. a random
- * access file)?
+ * This method indicates whether this archive is writing to a seekable
stream (i.e., to a random
+ * access file).
*
* <p>For seekable streams, you don't need to calculate the CRC or
* uncompressed size for [EMAIL PROTECTED] #STORED STORED} entries before
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
