Author: peterreilly
Date: Sun Nov 5 15:03:47 2006
New Revision: 471562
URL: http://svn.apache.org/viewvc?view=rev&rev=471562
Log:
checkstyle
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/DefaultLogger.java
ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
ant/core/trunk/src/main/org/apache/tools/ant/NoBannerLogger.java
ant/core/trunk/src/main/org/apache/tools/ant/ProjectComponent.java
ant/core/trunk/src/main/org/apache/tools/ant/Task.java
ant/core/trunk/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Available.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Copy.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/CopyPath.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/DefBase.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Delete.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/DiagnosticsTask.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Echo.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/EchoXML.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Exec.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Execute.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jar.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Java.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javac.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jikes.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Pack.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Property.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Recorder.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/DefaultLogger.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/DefaultLogger.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/DefaultLogger.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/DefaultLogger.java Sun Nov 5
15:03:47 2006
@@ -39,6 +39,7 @@
*/
public static final int LEFT_COLUMN_SIZE = 12;
+ // CheckStyle:VisibilityModifier OFF - bc
/** PrintStream to write non-error messages to */
protected PrintStream out;
@@ -51,11 +52,15 @@
/** Time of the start of the build */
private long startTime = System.currentTimeMillis();
+ // CheckStyle:ConstantNameCheck OFF - bc
/** Line separator */
protected static final String lSep = StringUtils.LINE_SEP;
+ // CheckStyle:ConstantNameCheck ON
/** Whether or not to use emacs-style output */
protected boolean emacsMode = false;
+ // CheckStyle:VisibilityModifier ON
+
/**
* Sole constructor.
Modified: ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java Sun Nov
5 15:03:47 2006
@@ -186,6 +186,8 @@
resetDefaultExcludes();
}
+ // CheckStyle:VisibilityModifier OFF - bc
+
/** The base directory to be scanned. */
protected File basedir;
@@ -258,6 +260,8 @@
/** Whether or not everything tested so far has been included. */
protected boolean everythingIncluded = true;
+
+ // CheckStyle:VisibilityModifier ON
/**
* Temporary table to speed up the various scanning methods.
Modified: ant/core/trunk/src/main/org/apache/tools/ant/NoBannerLogger.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/NoBannerLogger.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/NoBannerLogger.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/NoBannerLogger.java Sun Nov 5
15:03:47 2006
@@ -26,6 +26,7 @@
*/
public class NoBannerLogger extends DefaultLogger {
+ // CheckStyle:VisibilityModifier OFF - bc
/**
* Name of the current target, if it should
* be displayed on the next message. This is
@@ -34,6 +35,7 @@
* the target is logged.
*/
protected String targetName;
+ // CheckStyle:VisibilityModifier ON
/** Sole constructor. */
public NoBannerLogger() {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/ProjectComponent.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/ProjectComponent.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/ProjectComponent.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/ProjectComponent.java Sun Nov
5 15:03:47 2006
@@ -26,6 +26,7 @@
*/
public abstract class ProjectComponent implements Cloneable {
+ // CheckStyle:VisibilityModifier OFF - bc
/**
* Project object of this component.
* @deprecated since 1.6.x.
@@ -42,6 +43,7 @@
* Please use the [EMAIL PROTECTED] #getLocation()} method.
*/
protected Location location = Location.UNKNOWN_LOCATION;
+ // CheckStyle:VisibilityModifier ON
/** Sole constructor. */
public ProjectComponent() {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/Task.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/Task.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/Task.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/Task.java Sun Nov 5 15:03:47
2006
@@ -32,6 +32,7 @@
* @see Project#createTask
*/
public abstract class Task extends ProjectComponent {
+ // CheckStyle:VisibilityModifier OFF - bc
/**
* Target this task belongs to, if any.
* @deprecated since 1.6.x.
@@ -77,6 +78,8 @@
* Please use the [EMAIL PROTECTED] #getWrapper()} method.
*/
protected RuntimeConfigurable wrapper;
+
+ // CheckStyle:VisibilityModifier ON
/**
* Whether or not this task is invalid. A task becomes invalid
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
Sun Nov 5 15:03:47 2006
@@ -43,6 +43,7 @@
// default buffer size
private static final int DEFAULT_BUFFER_SIZE = 8192;
+ // CheckStyle:VisibilityModifier OFF - bc
/**
* The primary reader to which the reader chain is to be attached.
*/
@@ -60,6 +61,8 @@
/** The Ant project */
private Project project = null;
+
+ // CheckStyle:VisibilityModifier ON
/**
* Sets the primary reader
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java
Sun Nov 5 15:03:47 2006
@@ -22,6 +22,7 @@
import java.util.Enumeration;
import java.util.Vector;
+import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.Environment;
import org.apache.tools.ant.types.FileSet;
@@ -35,6 +36,7 @@
*/
public abstract class AbstractJarSignerTask extends Task {
+ // CheckStyle:VisibilityModifier OFF - bc
/**
* The name of the jar file.
*/
@@ -75,6 +77,9 @@
* name of JDK program we are looking for
*/
protected static final String JARSIGNER_COMMAND = "jarsigner";
+
+ // CheckStyle:VisibilityModifier ON
+
/**
* redirector used to talk to the jarsigner program
*/
@@ -274,7 +279,7 @@
* @throws BuildException if the property is not correctly defined.
*/
protected void declareSysProperty(
- ExecTask cmd, Environment.Variable property) {
+ ExecTask cmd, Environment.Variable property) throws BuildException {
addValue(cmd, "-J-D" + property.getContent());
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Available.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Available.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Available.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Available.java Sun
Nov 5 15:03:47 2006
@@ -475,6 +475,7 @@
/**
* @see EnumeratedAttribute#getValues
*/
+ /** [EMAIL PROTECTED] */
public String[] getValues() {
return VALUES;
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Copy.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Copy.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Copy.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Copy.java Sun Nov 5
15:03:47 2006
@@ -67,6 +67,7 @@
public class Copy extends Task {
static final File NULL_FILE_PLACEHOLDER = new File("/NULL_FILE");
static final String LINE_SEPARATOR = System.getProperty("line.separator");
+ // CheckStyle:VisibilityModifier OFF - bc
protected File file = null; // the source file
protected File destFile = null; // the destination file
protected File destDir = null; // the destination directory
@@ -92,6 +93,7 @@
private String inputEncoding = null;
private String outputEncoding = null;
private long granularity = 0;
+ // CheckStyle:VisibilityModifier ON
/**
* Copy task constructor.
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=471562&r1=471561&r2=471562
==============================================================================
--- 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 Sun Nov
5 15:03:47 2006
@@ -39,30 +39,35 @@
public class CopyPath extends Task {
- private FileNameMapper mapper;
-
- private Path path;
+ // Error messages
+ /** No destdir attribute */
+ public static final String ERROR_NO_DESTDIR = "No destDir specified";
- private File destDir;
+ /** No path */
+ public static final String ERROR_NO_PATH = "No path specified";
- protected FileUtils fileUtils;
+ /** No mapper */
+ public static final String ERROR_NO_MAPPER = "No mapper specified";
- // TODO not read, yet in a public setter
- private long granularity = 0;
+ // fileutils
+ private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
- protected boolean preserveLastModified = false;
+ // --- Fields --
+ private FileNameMapper mapper;
- public CopyPath() {
- fileUtils = FileUtils.getFileUtils();
- granularity = fileUtils.getFileTimestampGranularity();
- }
+ private Path path;
- public static final String ERROR_NO_DESTDIR = "No destDir specified";
+ private File destDir;
- public static final String ERROR_NO_PATH = "No path specified";
+ // TODO not read, yet in a public setter
+ private long granularity = FILE_UTILS.getFileTimestampGranularity();
- public static final String ERROR_NO_MAPPER = "No mapper specified";
+ private boolean preserveLastModified = false;
+ /**
+ * The dest dir attribute.
+ * @param destDir the value of the destdir attribute.
+ */
public void setDestDir(File destDir) {
this.destDir = destDir;
}
@@ -173,7 +178,7 @@
try {
log("Copying " + sourceFile + " to " + destFile,
Project.MSG_VERBOSE);
- fileUtils.copyFile(sourceFile, destFile, null, null, false,
+ FILE_UTILS.copyFile(sourceFile, destFile, null, null,
false,
preserveLastModified, null, null, getProject());
} catch (IOException ioe) {
String msg = "Failed to copy " + sourceFile + " to " +
destFile + " due to "
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/DefBase.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/DefBase.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/DefBase.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/DefBase.java Sun Nov
5 15:03:47 2006
@@ -142,6 +142,7 @@
/**
* @see org.apache.tools.ant.Task#init()
+ * @throws BuildException on error.
* @since Ant 1.6
*/
public void init() throws BuildException {
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=471562&r1=471561&r2=471562
==============================================================================
--- 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 Sun Nov
5 15:03:47 2006
@@ -97,6 +97,7 @@
public int size() { return dirs.length; }
}
+ // CheckStyle:VisibilityModifier OFF - bc
protected File file = null;
protected File dir = null;
protected Vector filesets = new Vector();
@@ -109,6 +110,7 @@
private boolean failonerror = true;
private boolean deleteOnExit = false;
private Resources rcs = null;
+ // CheckStyle:VisibilityModifier ON
/**
* Set the name of a single file to be removed.
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/DiagnosticsTask.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/DiagnosticsTask.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/DiagnosticsTask.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/DiagnosticsTask.java
Sun Nov 5 15:03:47 2006
@@ -30,6 +30,11 @@
private static final String[] ARGS = new String[0];
+ /**
+ * Execute the task.
+ * This delgates to the Diagnositics class.
+ * @throws BuildException on error.
+ */
public void execute() throws BuildException {
Diagnostics.main(ARGS);
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Echo.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Echo.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Echo.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Echo.java Sun Nov 5
15:03:47 2006
@@ -40,6 +40,7 @@
* @ant.task category="utility"
*/
public class Echo extends Task {
+ // CheckStyle:VisibilityModifier OFF - bc
protected String message = "";
protected File file = null;
protected boolean append = false;
@@ -48,6 +49,7 @@
// by default, messages are always displayed
protected int logLevel = Project.MSG_WARN;
+ // CheckStyle:VisibilityModifier ON
/**
* Does the work.
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/EchoXML.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/EchoXML.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/EchoXML.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/EchoXML.java Sun Nov
5 15:03:47 2006
@@ -46,7 +46,7 @@
private File file;
private boolean append;
- public static final String ERROR_NO_XML = "No nested XML specified";
+ private static final String ERROR_NO_XML = "No nested XML specified";
/**
* Set the output file.
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Exec.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Exec.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Exec.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Exec.java Sun Nov 5
15:03:47 2006
@@ -48,7 +48,9 @@
private String out;
private File dir;
private String command;
+ // CheckStyle:VisibilityModifier OFF - bc
protected PrintWriter fos = null;
+ // CheckStyle:VisibilityModifier ON
private boolean failOnError = false;
/**
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecTask.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecTask.java Sun Nov
5 15:03:47 2006
@@ -43,6 +43,7 @@
*/
public class ExecTask extends Task {
+ // CheckStyle:VisibilityModifier OFF - bc
private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
private String os;
@@ -70,6 +71,7 @@
protected Redirector redirector = new Redirector(this);
protected RedirectorElement redirectorElement;
+ // CheckStyle:VisibilityModifier ON
/**
* Controls whether the VM (1.3 and above) is used to execute the
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Execute.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Execute.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Execute.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Execute.java Sun Nov
5 15:03:47 2006
@@ -595,7 +595,7 @@
/**
* Did this execute return in a failure.
- * @see #isFailure(int)
+ * @see #isFailure(int)
* @return true if and only if the exit code is interpreted as a failure
* @since Ant1.7
*/
@@ -1215,7 +1215,8 @@
}
FileUtils.delete(f);
}
- }.start();
+ }
+ .start();
}
}
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java Sun
Nov 5 15:03:47 2006
@@ -49,6 +49,8 @@
*/
public class ExecuteOn extends ExecTask {
+ // CheckStyle:VisibilityModifier OFF - bc
+
// filesets has been protected so we need to keep that even after
// switching to resource collections. In fact, they will still
// get a different treatment form the other resource collections
@@ -80,6 +82,7 @@
*/
protected boolean srcIsFirst = true;
+ // CheckStyle:VisibilityModifier ON
/**
* Add a set of files upon which to operate.
* @param set the FileSet to add.
@@ -724,12 +727,15 @@
* for the type attribute.
*/
public static class FileDirBoth extends EnumeratedAttribute {
+ /** File value */
public static final String FILE = "file";
+ /** Dir value */
public static final String DIR = "dir";
/**
* @see EnumeratedAttribute#getValues
*/
- public String[] getValues() {
+ /** [EMAIL PROTECTED] */
+ public String[] getValues() {
return new String[] {FILE, DIR, "both"};
}
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java Sun Nov
5 15:03:47 2006
@@ -83,7 +83,7 @@
public class FixCRLF extends MatchingTask implements ChainableReader {
- public static final String ERROR_FILE_AND_SRCDIR
+ private static final String ERROR_FILE_AND_SRCDIR
= "srcdir and file are mutually exclusive";
private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
@@ -211,7 +211,8 @@
/**
* Specify tab length in characters.
*
- * @param tlength specify the length of tab in spaces,
+ * @param tlength specify the length of tab in spaces.
+ * @throws BuildException on error.
*/
public void setTablength(int tlength) throws BuildException {
try {
@@ -273,6 +274,7 @@
/**
* Executes the task.
+ * @throws BuildException on error.
*/
public void execute() throws BuildException {
// first off, make sure that we've got a srcdir and destdir
@@ -614,6 +616,7 @@
* Enumerated attribute with the values "asis", "add" and "remove".
*/
public static class AddAsisRemove extends EnumeratedAttribute {
+ /** [EMAIL PROTECTED] */
public String[] getValues() {
return new String[] {"add", "asis", "remove"};
}
@@ -626,6 +629,7 @@
/**
* @see EnumeratedAttribute#getValues
*/
+ /** [EMAIL PROTECTED] */
public String[] getValues() {
return new String[] {"asis", "cr", "lf", "crlf",
"mac", "unix", "dos"};
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java Sun
Nov 5 15:03:47 2006
@@ -157,6 +157,8 @@
}
}
+ // CheckStyle:VisibilityModifier OFF - bc
+
/**
* The alias of signer.
*/
@@ -177,6 +179,7 @@
protected int keysize;
protected int validity;
protected boolean verbose;
+ // CheckStyle:VisibilityModifier ON
/**
* Distinguished name list.
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=471562&r1=471561&r2=471562
==============================================================================
--- 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 Sun Nov 5
15:03:47 2006
@@ -391,7 +391,7 @@
Service service;
serviceIterator = serviceList.iterator();
- while(serviceIterator.hasNext()) {
+ while (serviceIterator.hasNext()) {
service = (Service) serviceIterator.next();
//stolen from writeManifest
super.zipFile(service.getAsStream(), zOut,
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Java.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Java.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Java.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Java.java Sun Nov 5
15:03:47 2006
@@ -65,8 +65,10 @@
private File output;
private File error;
+ // CheckStyle:VisibilityModifier OFF - bc
protected Redirector redirector = new Redirector(this);
protected RedirectorElement redirectorElement;
+ // CheckStyle:VisibilityModifier ON
private String resultProperty;
private Permissions perm = null;
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javac.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javac.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javac.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Javac.java Sun Nov 5
15:03:47 2006
@@ -104,9 +104,11 @@
private String memoryMaximumSize;
private FacadeTaskHelper facade = null;
+ // CheckStyle:VisibilityModifier OFF - bc
protected boolean failOnError = true;
protected boolean listFiles = false;
protected File[] compileList = new File[0];
+ // CheckStyle:VisibilityModifier ON
private String source;
private String debugLevel;
@@ -905,7 +907,7 @@
* attribute looks like.</p>
*
* @see #getCompilerVersion
- *
+ * @return the compiler.
* @since Ant 1.5
*/
public String getCompiler() {
@@ -931,6 +933,7 @@
* account.</p>
*
* @see #getCompiler
+ * @return the compiler.
*
* @since Ant 1.5
*/
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jikes.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jikes.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jikes.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Jikes.java Sun Nov 5
15:03:47 2006
@@ -40,9 +40,11 @@
*/
public class Jikes {
+ // CheckStyle:VisibilityModifier OFF - bc
protected JikesOutputParser jop;
protected String command;
protected Project project;
+ // CheckStyle:VisibilityModifier ON
/**
* Constructs a new Jikes object.
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/JikesOutputParser.java
Sun Nov 5 15:03:47 2006
@@ -38,6 +38,7 @@
* Use Jikes' exit value to detect compilation failure.
*/
public class JikesOutputParser implements ExecuteStreamHandler {
+ // CheckStyle:VisibilityModifier OFF - bc
protected Task task;
protected boolean errorFlag = false; // no errors so far
protected int errors;
@@ -46,6 +47,7 @@
protected boolean emacsMode;
protected BufferedReader br;
+ // CheckStyle:VisibilityModifier ON
/**
* Ignore.
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=471562&r1=471561&r2=471562
==============================================================================
--- 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 Sun
Nov 5 15:03:47 2006
@@ -56,7 +56,9 @@
public abstract class MatchingTask extends Task implements SelectorContainer {
+ // CheckStyle:VisibilityModifier OFF - bc
protected FileSet fileset = new FileSet();
+ // CheckStyle:VisibilityModifier ON
/** [EMAIL PROTECTED] */
public void setProject(Project project) {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Pack.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Pack.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Pack.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Pack.java Sun Nov 5
15:03:47 2006
@@ -36,8 +36,10 @@
public abstract class Pack extends Task {
+ // CheckStyle:VisibilityModifier OFF - bc
protected File zipFile;
protected File source;
+ // CheckStyle:VisibilityModifier ON
private Resource src;
/**
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Property.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Property.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Property.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Property.java Sun Nov
5 15:03:47 2006
@@ -70,6 +70,7 @@
*/
public class Property extends Task {
+ // CheckStyle:VisibilityModifier OFF - bc
protected String name;
protected String value;
protected File file;
@@ -82,6 +83,7 @@
private Project fallback;
protected boolean userProperty; // set read-only properties
+ // CheckStyle:VisibilityModifier ON
/**
* Constructor for Property.
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Recorder.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Recorder.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Recorder.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Recorder.java Sun Nov
5 15:03:47 2006
@@ -178,6 +178,7 @@
/**
* @see EnumeratedAttribute#getValues()
*/
+ /** [EMAIL PROTECTED] */
public String[] getValues() {
return VALUES;
}
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
Sun Nov 5 15:03:47 2006
@@ -90,6 +90,7 @@
/**
* @see org.apache.tools.ant.BuildListener#buildStarted(BuildEvent)
*/
+ /** [EMAIL PROTECTED] */
public void buildStarted(BuildEvent event) {
log("> BUILD STARTED", Project.MSG_DEBUG);
}
@@ -97,6 +98,7 @@
/**
* @see org.apache.tools.ant.BuildListener#buildFinished(BuildEvent)
*/
+ /** [EMAIL PROTECTED] */
public void buildFinished(BuildEvent event) {
log("< BUILD FINISHED", Project.MSG_DEBUG);
@@ -142,6 +144,7 @@
/**
* @see org.apache.tools.ant.BuildListener#targetStarted(BuildEvent)
*/
+ /** [EMAIL PROTECTED] */
public void targetStarted(BuildEvent event) {
log(">> TARGET STARTED -- " + event.getTarget(), Project.MSG_DEBUG);
log(StringUtils.LINE_SEP + event.getTarget().getName() + ":",
@@ -152,6 +155,7 @@
/**
* @see org.apache.tools.ant.BuildListener#targetFinished(BuildEvent)
*/
+ /** [EMAIL PROTECTED] */
public void targetFinished(BuildEvent event) {
log("<< TARGET FINISHED -- " + event.getTarget(), Project.MSG_DEBUG);
@@ -164,6 +168,7 @@
/**
* @see org.apache.tools.ant.BuildListener#taskStarted(BuildEvent)
*/
+ /** [EMAIL PROTECTED] */
public void taskStarted(BuildEvent event) {
log(">>> TASK STARTED -- " + event.getTask(), Project.MSG_DEBUG);
}
@@ -171,6 +176,7 @@
/**
* @see org.apache.tools.ant.BuildListener#taskFinished(BuildEvent)
*/
+ /** [EMAIL PROTECTED] */
public void taskFinished(BuildEvent event) {
log("<<< TASK FINISHED -- " + event.getTask(), Project.MSG_DEBUG);
flush();
@@ -179,6 +185,7 @@
/**
* @see org.apache.tools.ant.BuildListener#messageLogged(BuildEvent)
*/
+ /** [EMAIL PROTECTED] */
public void messageLogged(BuildEvent event) {
log("--- MESSAGE LOGGED", Project.MSG_DEBUG);
@@ -224,6 +231,7 @@
/**
* @see BuildLogger#setMessageOutputLevel(int)
*/
+ /** [EMAIL PROTECTED] */
public void setMessageOutputLevel(int level) {
if (level >= Project.MSG_ERR && level <= Project.MSG_DEBUG) {
loglevel = level;
@@ -233,6 +241,7 @@
/**
* @see BuildLogger#setOutputPrintStream(PrintStream)
*/
+ /** [EMAIL PROTECTED] */
public void setOutputPrintStream(PrintStream output) {
closeFile();
out = output;
@@ -242,6 +251,7 @@
/**
* @see BuildLogger#setEmacsMode(boolean)
*/
+ /** [EMAIL PROTECTED] */
public void setEmacsMode(boolean emacsMode) {
this.emacsMode = emacsMode;
}
@@ -250,6 +260,7 @@
/**
* @see BuildLogger#setErrorPrintStream(PrintStream)
*/
+ /** [EMAIL PROTECTED] */
public void setErrorPrintStream(PrintStream err) {
setOutputPrintStream(err);
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SQLExec.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SQLExec.java Sun Nov
5 15:03:47 2006
@@ -715,7 +715,7 @@
public void setSrc(File src) {
//there are places (in this file, and perhaps elsewhere, where it
is assumed
//that null is an acceptable parameter.
- if (src!=null) {
+ if (src != null) {
setSrcResource(new FileResource(src));
}
}
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=471562&r1=471561&r2=471562
==============================================================================
--- 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 Sun
Nov 5 15:03:47 2006
@@ -1060,7 +1060,8 @@
// Use '.' so a dir+"/"+name would not result in an absolute path
liaison.addParam(
fileDirParameter,
- (file.getParent()!=null) ? file.getParent().replace('\\','/')
: "." );
+ (file.getParent() != null)
+ ? file.getParent().replace('\\', '/') : ".");
}
}
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogParser.java
Sun Nov 5 15:03:47 2006
@@ -75,7 +75,7 @@
public CVSEntry[] getEntrySetAsArray() {
final CVSEntry[] array = new CVSEntry[ entries.size() ];
int i = 0;
- for(Enumeration e = entries.elements(); e.hasMoreElements();) {
+ for (Enumeration e = entries.elements(); e.hasMoreElements();) {
array[i++] = (CVSEntry) e.nextElement();
}
return array;
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=471562&r1=471561&r2=471562
==============================================================================
---
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
Sun Nov 5 15:03:47 2006
@@ -327,7 +327,7 @@
for (int i = 0; i < entrySet.length; i++) {
final CVSEntry cvsEntry = entrySet[i];
final Date date = cvsEntry.getDate();
-
+
//bug#30471
//this is caused by Date.after throwing a NullPointerException
//for some reason there's no date set in the CVSEntry
@@ -339,12 +339,12 @@
//according to the docs it doesn't throw, according to the bug
report it does
//http://java.sun.com/j2se/1.5.0/docs/api/java/util/Date.html#after(java.util.Date)
//according to the docs it does throw
-
+
//for now skip entries which are missing a date
if (null == date) {
continue;
}
-
+
if (null != startDate && startDate.after(date)) {
//Skip dates that are too early
continue;
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
Sun Nov 5 15:03:47 2006
@@ -209,12 +209,12 @@
}
//for java1.5+, we generate compatible stubs, that is, unless
//the caller asked for IDL or IIOP support.
- if (stubOption == null &&
+ if (stubOption == null &&
!attributes.getIiop() &&
!attributes.getIdl()) {
stubOption = STUB_COMPAT;
}
- if(stubOption!=null) {
+ if (stubOption != null) {
//set the non-null stubOption
cmd.createArgument().setValue(stubOption);
}
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java
Sun Nov 5 15:03:47 2006
@@ -57,7 +57,7 @@
if (i != 0) {
buf.append(", ");
}
-
+
buf.append(RMIC_CLASSNAMES[i]);
}
buf.append(" have been found. A common solution is to set the"
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java
Sun Nov 5 15:03:47 2006
@@ -68,7 +68,7 @@
*/
public static RmicAdapter getRmic(String rmicType, Task task)
throws BuildException {
- //convert to lower case in the English locale,
+ //convert to lower case in the English locale,
String compiler = rmicType.toLowerCase(Locale.ENGLISH);
//handle default specially by choosing the sun or kaffe compiler
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java?view=diff&rev=471562&r1=471561&r2=471562
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
Sun Nov 5 15:03:47 2006
@@ -15,7 +15,7 @@
* the name of this adapter for users to select
*/
public static final String COMPILER_NAME = "xnew";
-
+
public XNewRmic() {
}
@@ -24,7 +24,7 @@
* @return a command line that hands off to thw
*/
protected Commandline setupRmicCommand() {
- String options[]=new String[] {
+ String options[] = new String[] {
"-Xnew"
};
Commandline commandline = super.setupRmicCommand(options);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
