Author: peterreilly
Date: Sun Aug 12 11:22:24 2007
New Revision: 565103
URL: http://svn.apache.org/viewvc?view=rev&rev=565103
Log:
merge checkstyle
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Available.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Concat.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/DependSet.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Ear.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Expand.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Java.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Retry.java
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Truncate.java
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Available.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Available.java?view=diff&rev=565103&r1=565102&r2=565103
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Available.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Available.java
Sun Aug 12 11:22:24 2007
@@ -328,9 +328,9 @@
// ** full-pathname specified == path in list
// ** simple name specified == path in list
- if (path.exists() &&
- (filename.equals(paths[i])
- || filename.equals(path.getName()))) {
+ if (path.exists()
+ && (filename.equals(paths[i])
+ || filename.equals(path.getName()))) {
if (type == null) {
log("Found: " + path, Project.MSG_VERBOSE);
return true;
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Concat.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Concat.java?view=diff&rev=565103&r1=565102&r2=565103
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Concat.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Concat.java
Sun Aug 12 11:22:24 2007
@@ -218,7 +218,7 @@
* The concatentated result can then be filtered as
* a single stream.
*/
- private class MultiReader extends Reader {
+ private final class MultiReader extends Reader {
private Reader reader = null;
private int lastPos = 0;
private char[] lastChars = new char[eolString.length()];
@@ -374,7 +374,7 @@
}
}
- private class ConcatResource extends Resource {
+ private final class ConcatResource extends Resource {
private ResourceCollection c;
private ConcatResource(ResourceCollection c) {
@@ -618,7 +618,7 @@
newRc.setProject(getProject());
newRc.add(rc);
rc = newRc;
- }
+ }
((Resources) rc).add(c);
}
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/DependSet.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/DependSet.java?view=diff&rev=565103&r1=565102&r2=565103
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/DependSet.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/DependSet.java
Sun Aug 12 11:22:24 2007
@@ -28,7 +28,6 @@
import org.apache.tools.ant.types.Resource;
import org.apache.tools.ant.types.TimeComparison;
import org.apache.tools.ant.types.ResourceCollection;
-import org.apache.tools.ant.types.resources.Sort;
import org.apache.tools.ant.types.resources.Union;
import org.apache.tools.ant.types.resources.Restrict;
import org.apache.tools.ant.types.resources.Resources;
@@ -88,14 +87,15 @@
= new org.apache.tools.ant.types.resources.comparators.Date();
private static final ResourceComparator REVERSE_DATE = new Reverse(DATE);
- private static class NonExistent extends Restrict {
+ private static final class NonExistent extends Restrict {
private NonExistent(ResourceCollection rc) {
super.add(rc);
super.add(NOT_EXISTS);
}
}
- private static class HideMissingBasedir implements ResourceCollection {
+ private static final class HideMissingBasedir
+ implements ResourceCollection {
private FileSet fs;
private HideMissingBasedir(FileSet fs) {
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Ear.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Ear.java?view=diff&rev=565103&r1=565102&r2=565103
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Ear.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Ear.java
Sun Aug 12 11:22:24 2007
@@ -131,7 +131,7 @@
|| !FILE_UTILS.fileNameEquals(deploymentDescriptor, file)
|| descriptorAdded) {
log("Warning: selected " + archiveType
- + " files include a "+ XML_DESCRIPTOR_PATH +" which will"
+ + " files include a " + XML_DESCRIPTOR_PATH + " which will"
+ " be ignored (please use appxml attribute to "
+ archiveType + " task)",
Project.MSG_WARN);
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Expand.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Expand.java?view=diff&rev=565103&r1=565102&r2=565103
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Expand.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Expand.java
Sun Aug 12 11:22:24 2007
@@ -144,9 +144,10 @@
log("expand complete", Project.MSG_VERBOSE);
} catch (IOException ioe) {
- throw new BuildException("Error while expanding " + srcF.getPath()
- +"\n"+ioe.toString(),
- ioe);
+ throw new BuildException(
+ "Error while expanding " + srcF.getPath()
+ + "\n" + ioe.toString(),
+ ioe);
} finally {
ZipFile.closeQuietly(zf);
}
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Java.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Java.java?view=diff&rev=565103&r1=565102&r2=565103
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Java.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Java.java
Sun Aug 12 11:22:24 2007
@@ -202,6 +202,7 @@
/**
* Execute the specified CommandlineJava.
* @param commandLine CommandLineJava instance.
+ * @return the exit value of the process if forked, 0 otherwise.
*/
protected int executeJava(CommandlineJava commandLine) {
try {
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java?view=diff&rev=565103&r1=565102&r2=565103
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/ManifestTask.java
Sun Aug 12 11:22:24 2007
@@ -49,7 +49,7 @@
* Specifies the valid characters which can be used in attribute names.
* [EMAIL PROTECTED]
*/
- public final String VALID_ATTRIBUTE_CHARS =
+ public static final String VALID_ATTRIBUTE_CHARS =
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ012345679-_";
/**
@@ -105,7 +105,8 @@
throws ManifestException {
Enumeration attributeKeys = section.getAttributeKeys();
while (attributeKeys.hasMoreElements()) {
- Attribute attribute =
section.getAttribute((String)attributeKeys.nextElement());
+ Attribute attribute = section.getAttribute(
+ (String) attributeKeys.nextElement());
checkAttribute(attribute);
}
nestedManifest.addConfiguredSection(section);
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Retry.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Retry.java?view=diff&rev=565103&r1=565102&r2=565103
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Retry.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Retry.java
Sun Aug 12 11:22:24 2007
@@ -54,6 +54,7 @@
/**
* perform the work
+ * @throws BuildException if there is an error.
*/
public void execute() throws BuildException {
StringBuffer errorMessages = new StringBuffer();
Modified:
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Truncate.java
URL:
http://svn.apache.org/viewvc/ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Truncate.java?view=diff&rev=565103&r1=565102&r2=565103
==============================================================================
---
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Truncate.java
(original)
+++
ant/core/branches/ANT_17_BRANCH/src/main/org/apache/tools/ant/taskdefs/Truncate.java
Sun Aug 12 11:22:24 2007
@@ -84,7 +84,7 @@
/**
* Set the length to which files should be set.
* It is permissible to append K / M / G / T / P.
- * @param adjust (positive) adjustment amount.
+ * @param length (positive) adjustment amount.
*/
public void setLength(Long length) {
this.length = length;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
