Author: peterreilly
Date: Thu Nov 2 15:02:59 2006
New Revision: 470587
URL: http://svn.apache.org/viewvc?view=rev&rev=470587
Log:
checkstyle
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Echo.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/GUnzip.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Recorder.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Replace.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SignJar.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SubAnt.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/Touch.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Tstamp.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/XmlProperty.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Zip.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java
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=470587&r1=470586&r2=470587
==============================================================================
--- 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 Thu Nov 2
15:02:59 2006
@@ -61,7 +61,7 @@
Writer out = null;
try {
String filename = file.getAbsolutePath();
- if(encoding == null || encoding.length() == 0) {
+ if (encoding == null || encoding.length() == 0) {
out = new FileWriter(filename, append);
} else {
out = new BufferedWriter(
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/GUnzip.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/GUnzip.java?view=diff&rev=470587&r1=470586&r2=470587
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/GUnzip.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/GUnzip.java Thu Nov
2 15:02:59 2006
@@ -87,7 +87,7 @@
* support non-file resources needs to override this method. We
* need to do so for backwards compatibility reasons since we
* can't expect subclasses to support resources.</p>
- *
+ * @return true if this task supports non file resources.
* @since Ant 1.7
*/
protected boolean supportsNonFileResources() {
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=470587&r1=470586&r2=470587
==============================================================================
--- 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 Thu Nov
2 15:02:59 2006
@@ -127,7 +127,7 @@
/**
* Sets the level to which this recorder entry should log to.
- *
+ * @param level the level to set.
* @see VerbosityLevelChoices
*/
public void setLoglevel(VerbosityLevelChoices level) {
@@ -224,7 +224,7 @@
/**
* Empty implementation required by SubBuildListener interface.
- *
+ * @param event ignored.
* @since Ant 1.7
*/
public void buildStarted(BuildEvent event) {
@@ -232,7 +232,7 @@
/**
* Empty implementation required by SubBuildListener interface.
- *
+ * @param event ignored.
* @since Ant 1.7
*/
public void subBuildStarted(BuildEvent event) {
@@ -240,7 +240,7 @@
/**
* Empty implementation required by SubBuildListener interface.
- *
+ * @param event ignored.
* @since Ant 1.7
*/
public void targetStarted(BuildEvent event) {
@@ -248,7 +248,7 @@
/**
* Empty implementation required by SubBuildListener interface.
- *
+ * @param event ignored.
* @since Ant 1.7
*/
public void targetFinished(BuildEvent event) {
@@ -256,7 +256,7 @@
/**
* Empty implementation required by SubBuildListener interface.
- *
+ * @param event ignored.
* @since Ant 1.7
*/
public void taskStarted(BuildEvent event) {
@@ -264,7 +264,7 @@
/**
* Empty implementation required by SubBuildListener interface.
- *
+ * @param event ignored.
* @since Ant 1.7
*/
public void taskFinished(BuildEvent event) {
@@ -272,7 +272,7 @@
/**
* Empty implementation required by SubBuildListener interface.
- *
+ * @param event ignored.
* @since Ant 1.7
*/
public void messageLogged(BuildEvent event) {
@@ -280,7 +280,7 @@
/**
* Cleans recorder registry.
- *
+ * @param event ignored.
* @since Ant 1.7
*/
public void buildFinished(BuildEvent event) {
@@ -290,7 +290,7 @@
/**
* Cleans recorder registry, if this is the subbuild the task has
* been created in.
- *
+ * @param event ignored.
* @since Ant 1.7
*/
public void subBuildFinished(BuildEvent event) {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Replace.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Replace.java?view=diff&rev=470587&r1=470586&r2=470587
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Replace.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Replace.java Thu Nov
2 15:02:59 2006
@@ -352,7 +352,7 @@
void close() throws IOException {
reader.close();
}
-
+
/**
* Closes file but doesn't throw exception
*/
@@ -426,7 +426,7 @@
void close() throws IOException {
writer.close();
}
-
+
/**
* Closes file but doesn't throw exception
*/
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=470587&r1=470586&r2=470587
==============================================================================
--- 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 Thu Nov
2 15:02:59 2006
@@ -150,7 +150,7 @@
* Print SQL stats (rows affected)
*/
private boolean showtrailers = true;
-
+
/**
* Results Output file.
*/
@@ -204,7 +204,7 @@
/**
* Enable property expansion inside nested text
*
- * @param expandProperties
+ * @param expandProperties if true expand properties.
* @since Ant 1.7
*/
public void setExpandProperties(boolean expandProperties) {
@@ -323,7 +323,7 @@
public void setShowtrailers(boolean showtrailers) {
this.showtrailers = showtrailers;
}
-
+
/**
* Set the output file;
* optional, defaults to the Ant log.
@@ -673,7 +673,7 @@
}
/*
- * Closes an unused connection after an error and doesn't rethrow
+ * Closes an unused connection after an error and doesn't rethrow
* a possible SQLException
* @since Ant 1.7
*/
@@ -686,7 +686,7 @@
}
}
}
-
+
/**
* The action a task should perform on an error,
* one of "continue", "stop" and "abort"
@@ -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));
}
}
@@ -747,6 +747,7 @@
/**
* Set the source resource.
+ * @param a the source resource collection.
* @since Ant 1.7
*/
public void addConfigured(ResourceCollection a) {
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=470587&r1=470586&r2=470587
==============================================================================
--- 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 Thu Nov
2 15:02:59 2006
@@ -112,7 +112,8 @@
/**
* error string for unit test verification [EMAIL PROTECTED]
*/
- public static final String ERROR_SIGNEDJAR_AND_PATHS = "You cannot specify
the signed JAR when using paths or filesets";
+ public static final String ERROR_SIGNEDJAR_AND_PATHS
+ = "You cannot specify the signed JAR when using paths or filesets";
/**
* error string for unit test verification: [EMAIL PROTECTED]
*/
@@ -120,7 +121,8 @@
/**
* error string for unit test verification: [EMAIL PROTECTED]
*/
- public static final String ERROR_MAPPER_WITHOUT_DEST = "The destDir
attribute is required if a mapper is set";
+ public static final String ERROR_MAPPER_WITHOUT_DEST
+ = "The destDir attribute is required if a mapper is set";
/**
* error string for unit test verification: [EMAIL PROTECTED]
*/
@@ -192,7 +194,7 @@
* add a mapper to determine file naming policy. Only used with toDir
* processing.
*
- * @param newMapper
+ * @param newMapper the mapper to add.
* @since Ant 1.7
*/
public void add(FileNameMapper newMapper) {
@@ -222,7 +224,7 @@
/**
*
- * @param tsaurl
+ * @param tsaurl the tsa url.
* @since Ant 1.7
*/
public void setTsaurl(String tsaurl) {
@@ -240,7 +242,7 @@
/**
* set the alias in the keystore of the TSA to use;
- * @param tsacert
+ * @param tsacert the cert alias.
*/
public void setTsacert(String tsacert) {
this.tsacert = tsacert;
@@ -394,11 +396,11 @@
//alias is required for signing
addValue(cmd, alias);
- log("Signing JAR: " +
- jarSource.getAbsolutePath()
- +" to " +
- targetFile.getAbsolutePath()
- + " as " + alias);
+ log("Signing JAR: "
+ + jarSource.getAbsolutePath()
+ + " to "
+ + targetFile.getAbsolutePath()
+ + " as " + alias);
cmd.execute();
@@ -412,10 +414,10 @@
* If the tsa parameters are set, this passes them to the command.
* There is no validation of java version, as third party JDKs
* may implement this on earlier/later jarsigner implementations.
- * @param cmd
+ * @param cmd the exec task.
*/
private void addTimestampAuthorityCommands(final ExecTask cmd) {
- if(tsaurl!=null) {
+ if (tsaurl != null) {
addValue(cmd, "-tsa");
addValue(cmd, tsaurl);
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SubAnt.java?view=diff&rev=470587&r1=470586&r2=470587
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SubAnt.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SubAnt.java Thu Nov
2 15:02:59 2006
@@ -81,8 +81,6 @@
/** the targets to call on the new project */
private Vector/*<TargetElement>*/ targets = new Vector();
-
-
/**
* Pass output sent to System.out to the new project.
@@ -282,11 +280,11 @@
ant = createAntTask(directory);
String antfilename = file.getAbsolutePath();
ant.setAntfile(antfilename);
- for (int i=0; i<targets.size(); i++) {
- TargetElement targetElement = (TargetElement)targets.get(i);
+ for (int i = 0; i < targets.size(); i++) {
+ TargetElement targetElement = (TargetElement) targets.get(i);
ant.addConfiguredTarget(targetElement);
}
-
+
try {
ant.execute();
} catch (BuildException e) {
@@ -367,7 +365,7 @@
}
targets.add(t);
}
-
+
/**
* Enable/ disable verbose log messages showing when each sub-build path
is entered/ exited.
* The default value is "false".
@@ -606,4 +604,4 @@
}
}
-} // END class SubAnt
\ No newline at end of file
+} // END class SubAnt
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=470587&r1=470586&r2=470587
==============================================================================
--- 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 Thu Nov 2
15:02:59 2006
@@ -415,6 +415,7 @@
/**
* Yes, we can.
+ * @return true always.
* @since Ant 1.7
*/
protected boolean supportsNonFileResources() {
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=470587&r1=470586&r2=470587
==============================================================================
--- 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 Thu Nov 2
15:02:59 2006
@@ -133,7 +133,7 @@
/**
* Set is the name/location of where to create the tar file.
* @param tarFile the location of the tar file.
- * @deprecated since 1.5.x.
+ * @deprecated since 1.5.x.
* For consistency with other tasks, please use setDestFile().
*/
public void setTarfile(File tarFile) {
@@ -426,8 +426,9 @@
if (!r.isDirectory()) {
if (r.size() > TarConstants.MAXSIZE) {
- throw new BuildException("Resource: " + r + " larger than " +
- TarConstants.MAXSIZE + " bytes.");
+ throw new BuildException(
+ "Resource: " + r + " larger than "
+ + TarConstants.MAXSIZE + " bytes.");
}
te.setSize(r.getSize());
// override permissions if set explicitly
@@ -480,7 +481,7 @@
* Is the archive up to date in relationship to a list of files.
* @param files the files to check
* @return true if the archive is up to date.
- * @deprecated since 1.5.x.
+ * @deprecated since 1.5.x.
* use the two-arg version instead.
*/
protected boolean archiveIsUpToDate(String[] files) {
@@ -521,7 +522,7 @@
* support non-file resources needs to override this method. We
* need to do so for backwards compatibility reasons since we
* can't expect subclasses to support resources.</p>
- *
+ * @return true for this task.
* @since Ant 1.7
*/
protected boolean supportsNonFileResources() {
@@ -619,6 +620,7 @@
*
* @param rc the collection containing resources to add
* @param tOut stream writing to the archive.
+ * @throws IOException on error.
* @since Ant 1.7
*/
protected void tar(ResourceCollection rc, TarOutputStream tOut)
@@ -666,6 +668,7 @@
/**
* whether the given resource collection is a (subclass of)
* FileSet that only contains file system resources.
+ * @return true if the collection is a fileset.
* @since Ant 1.7
*/
protected static final boolean isFileFileSet(ResourceCollection rc) {
@@ -675,7 +678,7 @@
/**
* Grabs all included files and directors from the FileSet and
* returns them as an array of (relative) file names.
- *
+ * @return a list of the filenames.
* @since Ant 1.7
*/
protected static final String[] getFileNames(FileSet fs) {
@@ -695,6 +698,7 @@
* it already is a TarFileSet).
*
* @param archiveFileSet fileset to copy attributes from, may be null
+ * @return a new TarFileSet.
* @since Ant 1.7
*/
protected TarFileSet asTarFileSet(ArchiveFileSet archiveFileSet) {
@@ -715,9 +719,9 @@
tfs.integerSetDirMode(archiveFileSet
.getDirMode(getProject()));
}
-
- if (archiveFileSet instanceof
- org.apache.tools.ant.types.TarFileSet) {
+
+ if (archiveFileSet
+ instanceof org.apache.tools.ant.types.TarFileSet) {
org.apache.tools.ant.types.TarFileSet t =
(org.apache.tools.ant.types.TarFileSet) archiveFileSet;
if (t.hasUserNameBeenSet()) {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Touch.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Touch.java?view=diff&rev=470587&r1=470586&r2=470587
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Touch.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Touch.java Thu Nov 2
15:02:59 2006
@@ -209,7 +209,7 @@
/**
* Add a collection of resources to touch.
- *
+ * @param rc the collection to add.
* @since Ant 1.7
*/
public void add(ResourceCollection rc) {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Tstamp.java?view=diff&rev=470587&r1=470586&r2=470587
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Tstamp.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Tstamp.java Thu Nov
2 15:02:59 2006
@@ -144,7 +144,7 @@
/**
* The date/time pattern to be used. The values are as
* defined by the Java SimpleDateFormat class.
- * @param pattern
+ * @param pattern the pattern to use.
* @see java.text.SimpleDateFormat
*/
public void setPattern(String pattern) {
@@ -157,7 +157,7 @@
* either variant or variant and country may be omitted.
* For more information please refer to documentation
* for the java.util.Locale class.
- * @param locale
+ * @param locale the locale to use.
* @see java.util.Locale
*/
public void setLocale(String locale) {
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=470587&r1=470586&r2=470587
==============================================================================
--- 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 Thu Nov
2 15:02:59 2006
@@ -39,7 +39,7 @@
protected Resource srcResource;
/**
- * @deprecated since 1.5.x.
+ * @deprecated since 1.5.x.
* setSrc(String) is deprecated and is replaced with
* setSrc(File) to make Ant's Introspection
* mechanism do the work and also to encapsulate operations on
@@ -54,7 +54,7 @@
}
/**
- * @deprecated since 1.5.x.
+ * @deprecated since 1.5.x.
* setDest(String) is deprecated and is replaced with
* setDest(File) to make Ant's Introspection
* mechanism do the work and also to encapsulate operations on
@@ -176,7 +176,7 @@
* Whether this task can deal with non-file resources.
*
* <p>This implementation returns false.</p>
- *
+ * @return false for this task.
* @since Ant 1.7
*/
protected boolean supportsNonFileResources() {
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=470587&r1=470586&r2=470587
==============================================================================
--- 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 Thu Nov 2
15:02:59 2006
@@ -131,7 +131,7 @@
throws IOException {
TarInputStream tis = null;
try {
- tis =
+ tis =
new TarInputStream(compression.decompress(name,
new
BufferedInputStream(stream)));
log("Expanding: " + name + " into " + dir, Project.MSG_INFO);
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=470587&r1=470586&r2=470587
==============================================================================
--- 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 Thu Nov
2 15:02:59 2006
@@ -112,6 +112,7 @@
/**
* Nested resource collections as sources.
+ * @return the source resources to configure.
* @since Ant 1.7
*/
public Union createSrcResources() {
@@ -207,10 +208,9 @@
if (upToDate) {
Resource[] r = sourceResources.listResources();
- upToDate = upToDate &&
- (ResourceUtils.selectOutOfDateSources(this, r, getMapper(),
- getProject()).length
- == 0);
+ upToDate = upToDate
+ && (ResourceUtils.selectOutOfDateSources(
+ this, r, getMapper(), getProject()).length == 0);
}
return upToDate;
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=470587&r1=470586&r2=470587
==============================================================================
--- 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 Thu
Nov 2 15:02:59 2006
@@ -53,13 +53,13 @@
/**
* certification flag
*/
- private boolean certificates=false;
+ private boolean certificates = false;
private BufferingOutputFilter outputCache = new BufferingOutputFilter();
public static final String ERROR_NO_VERIFY = "Failed to verify ";
/**
* Ask for certificate information to be printed
- * @param certificates
+ * @param certificates if true print certificates.
*/
public void setCertificates(boolean certificates) {
this.certificates = certificates;
@@ -67,7 +67,7 @@
/**
* verify our jar files
- * @throws BuildException
+ * @throws BuildException on error.
*/
public void execute() throws BuildException {
//validation logic
@@ -101,12 +101,12 @@
/**
* verify a JAR.
- * @param jar
+ * @param jar the jar to verify.
* @throws BuildException if the file could not be verified
*/
private void verifyOneJar(File jar) {
- if(!jar.exists()) {
- throw new BuildException(ERROR_NO_FILE+jar);
+ if (!jar.exists()) {
+ throw new BuildException(ERROR_NO_FILE + jar);
}
final ExecTask cmd = createJarSigner();
@@ -116,15 +116,14 @@
//verify special operations
addValue(cmd, "-verify");
- if(certificates) {
+ if (certificates) {
addValue(cmd, "-certs");
}
//JAR is required
addValue(cmd, jar.getPath());
- log("Verifying JAR: " +
- jar.getAbsolutePath());
+ log("Verifying JAR: " + jar.getAbsolutePath());
outputCache.clear();
BuildException ex = null;
try {
@@ -165,7 +164,7 @@
}
public void clear() {
- if(buffer!=null) {
+ if (buffer != null) {
buffer.clear();
}
}
@@ -178,17 +177,17 @@
private Reader next;
- private StringBuffer buffer=new StringBuffer();
+ private StringBuffer buffer = new StringBuffer();
public BufferingOutputFilterReader(Reader next) {
this.next = next;
}
- public int read(char cbuf[], int off, int len) throws IOException {
+ public int read(char[] cbuf, int off, int len) throws IOException {
//hand down
- int result=next.read(cbuf,off,len);
+ int result = next.read(cbuf, off, len);
//cache
- buffer.append(cbuf,off,len);
+ buffer.append(cbuf, off, len);
//return
return result;
}
@@ -202,7 +201,7 @@
}
public void clear() {
- buffer=new StringBuffer();
+ buffer = new StringBuffer();
}
}
}
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=470587&r1=470586&r2=470587
==============================================================================
--- 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 Thu Nov
2 15:02:59 2006
@@ -155,7 +155,7 @@
* @since Ant1.7
*/
protected void processSuccess() {
- log(getTaskName()+": condition was met", Project.MSG_VERBOSE);
+ log(getTaskName() + ": condition was met", Project.MSG_VERBOSE);
}
/**
@@ -166,7 +166,7 @@
* @since Ant1.7
*/
protected void processTimeout() {
- log(getTaskName() +": timeout", Project.MSG_VERBOSE);
+ log(getTaskName() + ": timeout", Project.MSG_VERBOSE);
if (timeoutProperty != null) {
getProject().setNewProperty(timeoutProperty, "true");
}
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=470587&r1=470586&r2=470587
==============================================================================
--- 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 Thu Nov 2
15:02:59 2006
@@ -55,7 +55,7 @@
/**
* flag set if the descriptor is added
*/
- private boolean needxmlfile=true;
+ private boolean needxmlfile = true;
private File addedWebXmlFile;
private static final FileUtils FILE_UTILS = FileUtils.getFileUtils();
@@ -189,16 +189,16 @@
//check to see if we warn or not
if (!FILE_UTILS.fileNameEquals(addedWebXmlFile, file)) {
log("Warning: selected " + archiveType
- +" files include a second " +XML_DESCRIPTOR_PATH
+ + " files include a second " + XML_DESCRIPTOR_PATH
+ " which will be ignored.\n"
- + "The duplicate entry is at " +file +'\n'
+ + "The duplicate entry is at " + file + '\n'
+ "The file that will be used is "
+ addedWebXmlFile,
Project.MSG_WARN);
}
} else {
//no added file, yet
- addedWebXmlFile=file;
+ addedWebXmlFile = file;
//there is no web.xml file, so add it
addFile = true;
//and remember that we did
@@ -216,9 +216,9 @@
* gets executed.
*/
protected void cleanUp() {
- if(addedWebXmlFile==null && needxmlfile && !isInUpdateMode()) {
+ if (addedWebXmlFile == null && needxmlfile && !isInUpdateMode()) {
throw new BuildException("No WEB-INF/web.xml file was added.\n"
- +"If this is your intent, set needxml='false' ");
+ + "If this is your intent, set needxml='false' ");
}
addedWebXmlFile = null;
super.cleanUp();
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=470587&r1=470586&r2=470587
==============================================================================
--- 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 Thu
Nov 2 15:02:59 2006
@@ -1058,7 +1058,9 @@
File file = new File(fileName);
// Give always a slash as file separator, so the stylesheet could
be sure about that
// Use '.' so a dir+"/"+name would not result in an absolute path
- liaison.addParam(fileDirParameter, (file.getParent()!=null) ?
file.getParent().replace('\\','/') : "." );
+ liaison.addParam(
+ fileDirParameter,
+ (file.getParent()!=null) ? file.getParent().replace('\\','/')
: "." );
}
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java?view=diff&rev=470587&r1=470586&r2=470587
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XmlProperty.java Thu
Nov 2 15:02:59 2006
@@ -282,14 +282,14 @@
if (sxe.getException() != null) {
x = sxe.getException();
}
- throw new BuildException("Failed to load "+src,x);
+ throw new BuildException("Failed to load " + src, x);
} catch (ParserConfigurationException pce) {
// Parser with specified options can't be built
throw new BuildException(pce);
} catch (IOException ioe) {
// I/O error
- throw new BuildException("Failed to load " + src,ioe);
+ throw new BuildException("Failed to load " + src, ioe);
}
}
@@ -766,7 +766,7 @@
*/
private File resolveFile(String fileName) {
if (rootDirectory == null) {
- return FILE_UTILS.resolveFile(getProject().getBaseDir(),fileName);
+ return FILE_UTILS.resolveFile(getProject().getBaseDir(), fileName);
}
return FILE_UTILS.resolveFile(rootDirectory, fileName);
}
@@ -779,7 +779,7 @@
* support non-file resources needs to override this method. We
* need to do so for backwards compatibility reasons since we
* can't expect subclasses to support resources.</p>
- *
+ * @return true for this task.
* @since Ant 1.7
*/
protected boolean supportsNonFileResources() {
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=470587&r1=470586&r2=470587
==============================================================================
--- 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 Thu Nov 2
15:02:59 2006
@@ -979,7 +979,7 @@
*/
as = getNonFileSetResourcesToAdd(rc, zipFile, true);
}
-
+
Resource[][] toAdd = new Resource[rcs.length][];
int fsIndex = 0;
int restIndex = 0;
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java?view=diff&rev=470587&r1=470586&r2=470587
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.java
Thu Nov 2 15:02:59 2006
@@ -65,7 +65,7 @@
* exposed to end-users, because it was too brittle during beta testing;
classpath
* problems being the core issue.
*
- *
+ *
*
* @since Ant 1.7
*/
@@ -156,7 +156,7 @@
/**
* Run the compilation.
- *
+ * @retrun true on success.
* @throws BuildException if the compilation has problems.
*/
public boolean execute() throws BuildException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
