Author: peterreilly
Date: Sat Nov 18 10:13:55 2006
New Revision: 476580
URL: http://svn.apache.org/viewvc?view=rev&rev=476580
Log:
checkstyle
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/BZip2.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Checksum.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Chmod.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Classloader.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Get.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Input.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Length.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadResource.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Redirector.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SignJar.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Sync.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Tar.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Unpack.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Untar.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/War.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/BZip2.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/BZip2.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/BZip2.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/BZip2.java Sat Nov 18
10:13:55 2006
@@ -36,6 +36,9 @@
*/
public class BZip2 extends Pack {
+ /**
+ * Compress the zipFile.
+ */
protected void pack() {
CBZip2OutputStream zOut = null;
try {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Checksum.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Checksum.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Checksum.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Checksum.java Sat Nov
18 10:13:55 2006
@@ -59,7 +59,7 @@
*/
public class Checksum extends MatchingTask implements Condition {
private static class FileUnion extends Restrict {
- Union u;
+ private Union u;
FileUnion() {
u = new Union();
super.add(u);
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Chmod.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Chmod.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Chmod.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Chmod.java Sat Nov 18
10:13:55 2006
@@ -52,6 +52,9 @@
}
/**
+ * Set the project of this task.
+ * Calls the super class and sets the project on dhe default FileSet.
+ * @param project the project for this task.
* @see org.apache.tools.ant.ProjectComponent#setProject
*/
public void setProject(Project project) {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Classloader.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Classloader.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Classloader.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Classloader.java Sat
Nov 18 10:13:55 2006
@@ -95,17 +95,26 @@
this.reset = b;
}
+ /**
+ * Set reverse attribute.
+ * @param b if true reverse the normal classloader lookup.
+ */
public void setReverse(boolean b) {
this.parentFirst = !b;
}
+ /**
+ * Set reverse attribute.
+ * @param b if true reverse the normal classloader lookup.
+ */
public void setParentFirst(boolean b) {
this.parentFirst = b;
}
- // TODO: add exceptions for delegation or reverse
-
- // TODO
+ /**
+ * Set the name of the parent.
+ * @param name the parent name.
+ */
public void setParentName(String name) {
this.parentName = name;
}
@@ -114,6 +123,8 @@
/** Specify which path will be used. If the loader already exists
* and is an AntClassLoader (or any other loader we can extend),
* the path will be added to the loader.
+ * @param pathRef a reference to a path.
+ * @throws BuildException if there is a problem.
*/
public void setClasspathRef(Reference pathRef) throws BuildException {
classpath = (Path) pathRef.getReferencedObject(getProject());
@@ -132,6 +143,10 @@
}
}
+ /**
+ * Create a classpath.
+ * @return a path for configuration.
+ */
public Path createClasspath() {
if (this.classpath == null) {
this.classpath = new Path(null);
@@ -140,6 +155,9 @@
}
+ /**
+ * do the classloader manipulation.
+ */
public void execute() {
try {
// Gump friendly - don't mess with the core loader if only
classpath
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/CopyPath.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/CopyPath.java Sat Nov
18 10:13:55 2006
@@ -116,10 +116,22 @@
return path;
}
+ /**
+ * Set the number of milliseconds leeway to give before deciding a
+ * target is out of date.
+ * TODO: This is not yet used.
+ * @param granularity the granularity used to decide if a target is out of
+ * date.
+ */
public void setGranularity(long granularity) {
this.granularity = granularity;
}
+ /**
+ * Give the copied files the same last modified time as the original files.
+ * @param preserveLastModified if true preserve the modified time;
+ * default is false.
+ */
public void setPreserveLastModified(boolean preserveLastModified) {
this.preserveLastModified = preserveLastModified;
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java Sat Nov
18 10:13:55 2006
@@ -83,8 +83,8 @@
return ((Comparable) foo).compareTo(bar) * -1;
}
};
- File basedir;
- String[] dirs;
+ private File basedir;
+ private String[] dirs;
ReverseDirs(File basedir, String[] dirs) {
this.basedir = basedir;
this.dirs = dirs;
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteWatchdog.java
Sat Nov 18 10:13:55 2006
@@ -68,6 +68,7 @@
}
/**
+ * @param timeout the timeout value to use in milliseconds.
* @see #ExecuteWatchdog(long)
* @deprecated since 1.5.x.
* Use constructor with a long type instead.
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Get.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Get.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Get.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Get.java Sat Nov 18
10:13:55 2006
@@ -343,22 +343,26 @@
extends org.apache.tools.ant.util.Base64Converter {
}
+ /**
+ * Interface implemented for reporting
+ * progess of downloading.
+ */
public interface DownloadProgress {
/**
* begin a download
*/
- public void beginDownload();
+ void beginDownload();
/**
* tick handler
*
*/
- public void onTick();
+ void onTick();
/**
* end a download
*/
- public void endDownload();
+ void endDownload();
}
/**
@@ -393,8 +397,14 @@
*/
public static class VerboseProgress implements DownloadProgress {
private int dots = 0;
+ // CheckStyle:VisibilityModifier OFF - bc
PrintStream out;
+ // CheckStyle:VisibilityModifier ON
+ /**
+ * Construct a verbose progress reporter.
+ * @param out the output stream.
+ */
public VerboseProgress(PrintStream out) {
this.out = out;
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Input.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Input.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Input.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Input.java Sat Nov 18
10:13:55 2006
@@ -127,7 +127,7 @@
new PropertyFileInputHandler(),
new GreedyInputHandler()};
- //inherit doc
+ /** [EMAIL PROTECTED] */
public String[] getValues() {
return VALUES;
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java Sat Nov 18
10:13:55 2006
@@ -144,11 +144,13 @@
*
* @since Ant 1.6.3
*/
- private ZipExtraField[] JAR_MARKER = new ZipExtraField[] {
+ private static final ZipExtraField[] JAR_MARKER = new ZipExtraField[] {
JarMarker.getInstance()
};
+ // CheckStyle:VisibilityModifier OFF - bc
protected String emptyBehavior = "create";
+ // CheckStyle:VisibilityModifier ON
/** constructor */
public Jar() {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Length.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Length.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Length.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Length.java Sat Nov
18 10:13:55 2006
@@ -261,11 +261,15 @@
}
private abstract class Handler {
- PrintStream ps;
+ private PrintStream ps;
Handler(PrintStream ps) {
this.ps = ps;
}
+ protected PrintStream getPs() {
+ return ps;
+ }
+
protected abstract void handle(Resource r);
void complete() {
@@ -278,14 +282,14 @@
super(ps);
}
protected void handle(Resource r) {
- ps.print(r.toString());
- ps.print(" : ");
+ getPs().print(r.toString());
+ getPs().print(" : ");
//when writing to the log, we'll see what's happening:
long size = r.getSize();
if (size == Resource.UNKNOWN_SIZE) {
- ps.println("unknown");
+ getPs().println("unknown");
} else {
- ps.println(size);
+ getPs().println(size);
}
}
}
@@ -295,6 +299,9 @@
AllHandler(PrintStream ps) {
super(ps);
}
+ protected long getAccum() {
+ return accum;
+ }
protected synchronized void handle(Resource r) {
long size = r.getSize();
if (size == Resource.UNKNOWN_SIZE) {
@@ -304,7 +311,7 @@
}
}
void complete() {
- ps.print(accum);
+ getPs().print(accum);
super.complete();
}
}
@@ -316,7 +323,7 @@
void complete() {
}
long getLength() {
- return accum;
+ return getAccum();
}
}
}
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadResource.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadResource.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadResource.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadResource.java Sat
Nov 18 10:13:55 2006
@@ -51,10 +51,9 @@
private boolean failOnError = true;
/**
- * suppress error message if it goes pear-shaped, sets failOnError=false
+ * suppress error message if it goes pear-shaped, sets failOnError=false
*/
private boolean quiet = false;
-
/**
* Encoding to use for filenames, defaults to the platform's default
@@ -106,7 +105,7 @@
public final void setFailonerror(final boolean fail) {
failOnError = fail;
}
-
+
/**
* If true, suppress the load error report and set the
* the failonerror value to false.
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java Sat
Nov 18 10:13:55 2006
@@ -116,6 +116,7 @@
fileset.setIncludes(includes);
}
+ // CheckStyle:MethodNameCheck OFF - bc
/**
* Set this to be the items in the base directory that you want to be
* included. You can also specify "*" for the items (ie: items="*")
@@ -167,6 +168,8 @@
}
}
}
+
+ // CheckStyle:VisibilityModifier ON
/**
* Sets whether default exclusions should be used or not.
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Redirector.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Redirector.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Redirector.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Redirector.java Sat
Nov 18 10:13:55 2006
@@ -58,8 +58,8 @@
= System.getProperty("file.encoding");
private class PropertyOutputStream extends ByteArrayOutputStream {
- String property;
- boolean closed = false;
+ private String property;
+ private boolean closed = false;
PropertyOutputStream(String property) {
super();
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SignJar.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SignJar.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SignJar.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SignJar.java Sat Nov
18 10:13:55 2006
@@ -46,6 +46,7 @@
* @since Ant 1.1
*/
public class SignJar extends AbstractJarSignerTask {
+ // CheckStyle:VisibilityModifier OFF - bc
private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
@@ -131,6 +132,7 @@
* error string for unit test verification: [EMAIL PROTECTED]
*/
public static final String ERROR_NO_STOREPASS = "storepass attribute must
be set";
+ // CheckStyle:VisibilityModifier ON
/**
* name of .SF/.DSA file; optional
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/StreamPumper.java Sat
Nov 18 10:13:55 2006
@@ -125,6 +125,7 @@
/**
* This method blocks until the stream pumper finishes.
+ * @throws InterruptedException if interrupted.
* @see #isFinished()
*/
public synchronized void waitFor()
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Sync.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Sync.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Sync.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Sync.java Sat Nov 18
10:13:55 2006
@@ -62,6 +62,8 @@
// Override Task#init
/**
+ * Initialize the sync task.
+ * @throws BuildException if there is a problem.
* @see Task#init()
*/
public void init()
@@ -85,6 +87,8 @@
// Override Task#execute
/**
+ * Execute the sync task.
+ * @throws BuildException if there is an error.
* @see Task#execute()
*/
public void execute()
@@ -368,6 +372,7 @@
/**
* @see Copy#scan(File, File, String[], String[])
*/
+ /** [EMAIL PROTECTED] */
protected void scan(File fromDir, File toDir, String[] files,
String[] dirs) {
assertTrue("No mapper", mapperElement == null);
@@ -385,6 +390,7 @@
/**
* @see Copy#scan(Resource[], File)
*/
+ /** [EMAIL PROTECTED] */
protected Map scan(Resource[] resources, File toDir) {
assertTrue("No mapper", mapperElement == null);
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Tar.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Tar.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Tar.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Tar.java Sat Nov 18
10:13:55 2006
@@ -90,6 +90,7 @@
*/
public static final String OMIT = "omit";
+ // CheckStyle:VisibilityModifier OFF - bc
File tarFile;
File baseDir;
@@ -103,6 +104,8 @@
Vector fileSetFiles = new Vector();
+ // CheckStyle:VisibilityModifier ON
+
/**
* Indicates whether the user has been warned about long files already.
*/
@@ -668,6 +671,7 @@
/**
* whether the given resource collection is a (subclass of)
* FileSet that only contains file system resources.
+ * @param rc the resource collection to check.
* @return true if the collection is a fileset.
* @since Ant 1.7
*/
@@ -678,6 +682,7 @@
/**
* Grabs all included files and directors from the FileSet and
* returns them as an array of (relative) file names.
+ * @param fs the fileset to operate on.
* @return a list of the filenames.
* @since Ant 1.7
*/
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Unpack.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Unpack.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Unpack.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Unpack.java Sat Nov
18 10:13:55 2006
@@ -33,10 +33,11 @@
*/
public abstract class Unpack extends Task {
-
+ // CheckStyle:VisibilityModifier OFF - bc
protected File source;
protected File dest;
protected Resource srcResource;
+ // CheckStyle:VisibilityModifier ON
/**
* @deprecated since 1.5.x.
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Untar.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Untar.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Untar.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Untar.java Sat Nov 18
10:13:55 2006
@@ -91,6 +91,7 @@
/**
* @see Expand#expandFile(FileUtils, File, File)
*/
+ /** [EMAIL PROTECTED] */
protected void expandFile(FileUtils fileUtils, File srcF, File dir) {
FileInputStream fis = null;
try {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/UpToDate.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/UpToDate.java Sat Nov
18 10:13:55 2006
@@ -53,7 +53,9 @@
private Vector sourceFileSets = new Vector();
private Union sourceResources = new Union();
+ // CheckStyle:VisibilityModifier OFF - bc
protected Mapper mapperElement = null;
+ // CheckStyle:VisibilityModifier ON
/**
* The property to set if the target file is more up-to-date than
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java Sat
Nov 18 10:13:55 2006
@@ -55,6 +55,7 @@
*/
private boolean certificates = false;
private BufferingOutputFilter outputCache = new BufferingOutputFilter();
+ /** Error output if there is a failure to verify the jar. */
public static final String ERROR_NO_VERIFY = "Failed to verify ";
/**
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/WaitFor.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/WaitFor.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/WaitFor.java Sat Nov
18 10:13:55 2006
@@ -179,11 +179,17 @@
*/
public static class Unit extends EnumeratedAttribute {
+ /** millisecond string */
public static final String MILLISECOND = "millisecond";
+ /** second string */
public static final String SECOND = "second";
+ /** minute string */
public static final String MINUTE = "minute";
+ /** hour string */
public static final String HOUR = "hour";
+ /** day string */
public static final String DAY = "day";
+ /** week string */
public static final String WEEK = "week";
private static final String[] UNITS = {
@@ -215,6 +221,7 @@
/**
* @see EnumeratedAttribute#getValues()
*/
+ /** [EMAIL PROTECTED] */
public String[] getValues() {
return UNITS;
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/War.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/War.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/War.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/War.java Sat Nov 18
10:13:55 2006
@@ -216,7 +216,10 @@
* gets executed.
*/
protected void cleanUp() {
- if (addedWebXmlFile == null && deploymentDescriptor==null &&
needxmlfile && !isInUpdateMode()) {
+ if (addedWebXmlFile == null
+ && deploymentDescriptor == null
+ && needxmlfile
+ && !isInUpdateMode()) {
throw new BuildException("No WEB-INF/web.xml file was added.\n"
+ "If this is your intent, set needxml='false' ");
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java Sat
Nov 18 10:13:55 2006
@@ -69,7 +69,7 @@
private String fileNameParameter = null;
/** name for XSL parameter containing the file directory */
- public String fileDirParameter = null;
+ private String fileDirParameter = null;
/** additional parameters to be passed to the stylesheets */
private Vector params = new Vector();
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java Sat Nov 18
10:13:55 2006
@@ -1658,6 +1658,7 @@
/**
* @see EnumeratedAttribute#getValues()
*/
+ /** [EMAIL PROTECTED] */
public String[] getValues() {
return new String[] {"add", "preserve", "fail"};
}
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
Sat Nov 18 10:13:55 2006
@@ -42,23 +42,35 @@
* It produces an XML output representing the list of changes.
* <pre>
* <font color=#0000ff><!-- Root element --></font>
- * <font color=#6a5acd><!ELEMENT</font> changelog <font
color=#ff00ff>(entry</font><font color=#ff00ff>+</font><font
color=#ff00ff>)</font><font color=#6a5acd>></font>
+ * <font color=#6a5acd><!ELEMENT</font> changelog <font color=#ff00ff>
+ * (entry</font><font color=#ff00ff>+</font><font color=#ff00ff>)
+ * </font><font color=#6a5acd>></font>
* <font color=#0000ff><!-- CVS Entry --></font>
- * <font color=#6a5acd><!ELEMENT</font> entry <font
color=#ff00ff>(date,author,file</font><font color=#ff00ff>+</font><font
color=#ff00ff>,msg)</font><font color=#6a5acd>></font>
+ * <font color=#6a5acd><!ELEMENT</font> entry <font color=#ff00ff>
+ * (date,author,file</font><font color=#ff00ff>+</font><font
color=#ff00ff>,msg)
+ * </font><font color=#6a5acd>></font>
* <font color=#0000ff><!-- Date of cvs entry --></font>
- * <font color=#6a5acd><!ELEMENT</font> date <font
color=#ff00ff>(#PCDATA)</font><font color=#6a5acd>></font>
+ * <font color=#6a5acd><!ELEMENT</font> date <font color=#ff00ff>(#PCDATA)
+ * </font><font color=#6a5acd>></font>
* <font color=#0000ff><!-- Author of change --></font>
- * <font color=#6a5acd><!ELEMENT</font> author <font
color=#ff00ff>(#PCDATA)</font><font color=#6a5acd>></font>
+ * <font color=#6a5acd><!ELEMENT</font> author <font color=#ff00ff>(#PCDATA)
+ * </font><font color=#6a5acd>></font>
* <font color=#0000ff><!-- List of files affected --></font>
- * <font color=#6a5acd><!ELEMENT</font> msg <font
color=#ff00ff>(#PCDATA)</font><font color=#6a5acd>></font>
+ * <font color=#6a5acd><!ELEMENT</font> msg <font color=#ff00ff>(#PCDATA)
+ * </font><font color=#6a5acd>></font>
* <font color=#0000ff><!-- File changed --></font>
- * <font color=#6a5acd><!ELEMENT</font> file <font
color=#ff00ff>(name,revision,prevrevision</font><font
color=#ff00ff>?</font><font color=#ff00ff>)</font><font
color=#6a5acd>></font>
+ * <font color=#6a5acd><!ELEMENT</font> file <font color=#ff00ff>
+ * (name,revision,prevrevision</font><font color=#ff00ff>?</font>
+ * <font color=#ff00ff>)</font><font color=#6a5acd>></font>
* <font color=#0000ff><!-- Name of the file --></font>
- * <font color=#6a5acd><!ELEMENT</font> name <font
color=#ff00ff>(#PCDATA)</font><font color=#6a5acd>></font>
+ * <font color=#6a5acd><!ELEMENT</font> name <font color=#ff00ff>(#PCDATA)
+ * </font><font color=#6a5acd>></font>
* <font color=#0000ff><!-- Revision number --></font>
- * <font color=#6a5acd><!ELEMENT</font> revision <font
color=#ff00ff>(#PCDATA)</font><font color=#6a5acd>></font>
+ * <font color=#6a5acd><!ELEMENT</font> revision <font color=#ff00ff>
+ * (#PCDATA)</font><font color=#6a5acd>></font>
* <font color=#0000ff><!-- Previous revision number --></font>
- * <font color=#6a5acd><!ELEMENT</font> prevrevision <font
color=#ff00ff>(#PCDATA)</font><font color=#6a5acd>></font>
+ * <font color=#6a5acd><!ELEMENT</font> prevrevision <font color=#ff00ff>
+ * (#PCDATA)</font><font color=#6a5acd>></font>
* </pre>
*
* @since Ant 1.5
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/EmailTask.java
Sat Nov 18 10:13:55 2006
@@ -98,7 +98,7 @@
/** Password for SMTP auth */
private String password = null;
/** indicate if the user wishes SSL-TLS */
- private boolean SSL = false;
+ private boolean ssl = false;
/**
* Set the user for SMTP auth; this requires JavaMail.
@@ -120,11 +120,11 @@
/**
* Set whether to send data over SSL.
- * @param SSL boolean; if true SSL will be used.
+ * @param ssl boolean; if true SSL will be used.
* @since Ant 1.6
*/
- public void setSSL(boolean SSL) {
- this.SSL = SSL;
+ public void setSSL(boolean ssl) {
+ this.ssl = ssl;
}
/**
@@ -360,7 +360,7 @@
/**
* Creates a Path as container for attachments. Supports any
* filesystem resource-collections that way.
- *
+ * @return the path to be configured.
* @since Ant 1.7
*/
public Path createAttachments() {
@@ -432,7 +432,7 @@
throw new BuildException("SMTP auth only possible with MIME
mail");
}
// SSL only allowed with MIME mail
- if (autoFound == false && (SSL)
+ if (!autoFound && (ssl)
&& (encoding.equals(UU) || encoding.equals(PLAIN))) {
throw new BuildException("SSL only possible with MIME mail");
}
@@ -518,7 +518,7 @@
mailer.setPort(port);
mailer.setUser(user);
mailer.setPassword(password);
- mailer.setSSL(SSL);
+ mailer.setSSL(ssl);
mailer.setMessage(message);
mailer.setFrom(from);
mailer.setReplyToList(replyToList);
@@ -559,6 +559,7 @@
* Sets the character set of mail message.
* Will be ignored if mimeType contains ....; Charset=... substring or
* encoding is not a <code>mime</code>.
+ * @param charset the character encoding to use.
* @since Ant 1.6
*/
public void setCharset(String charset) {
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java?view=diff&rev=476580&r1=476579&r2=476580
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/email/MimeMailer.java
Sat Nov 18 10:13:55 2006
@@ -58,6 +58,8 @@
* @since Ant 1.5
*/
public class MimeMailer extends Mailer {
+ private final static String SSL_FACTORY = "javax.net.ssl.SSLSocketFactory";
+
/** Default character set */
private static final String DEFAULT_CHARSET
= System.getProperty("file.encoding");
@@ -145,7 +147,6 @@
+ "security provider, check that you have JSSE in "
+ "your classpath");
}
- final String SSL_FACTORY = "javax.net.ssl.SSLSocketFactory";
// SMTP provider
props.put("mail.smtp.socketFactory.class", SSL_FACTORY);
props.put("mail.smtp.socketFactory.fallback", "false");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
