You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by pe...@apache.org on 2006/11/04 23:50:21 UTC
svn commit: r471289 - in /ant/core/trunk/src/main/org/apache/tools/ant: ./
filters/ filters/util/ helper/ listener/ loader/
Author: peterreilly
Date: Sat Nov 4 14:50:20 2006
New Revision: 471289
URL: http://svn.apache.org/viewvc?view=rev&rev=471289
Log:
checkstyle
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/AntTypeDefinition.java
ant/core/trunk/src/main/org/apache/tools/ant/ComponentHelper.java
ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java
ant/core/trunk/src/main/org/apache/tools/ant/Project.java
ant/core/trunk/src/main/org/apache/tools/ant/ProjectComponent.java
ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java
ant/core/trunk/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
ant/core/trunk/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java
ant/core/trunk/src/main/org/apache/tools/ant/helper/DefaultExecutor.java
ant/core/trunk/src/main/org/apache/tools/ant/helper/SingleCheckExecutor.java
ant/core/trunk/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java
ant/core/trunk/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java
ant/core/trunk/src/main/org/apache/tools/ant/listener/Log4jListener.java
ant/core/trunk/src/main/org/apache/tools/ant/listener/TimestampedLogger.java
ant/core/trunk/src/main/org/apache/tools/ant/loader/AntClassLoader2.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/AntTypeDefinition.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/AntTypeDefinition.java?view=diff&rev=471289&r1=471288&r2=471289
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/AntTypeDefinition.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/AntTypeDefinition.java Sat Nov 4 14:50:20 2006
@@ -283,7 +283,7 @@
* Inner implementation of the {@link #createAndSet(Project, Class)} logic, with no
* exception catching
* @param newclass class to create
- * @param project
+ * @param project the project to use
* @return a newly constructed and bound instance.
* @throws NoSuchMethodException no good construtor.
* @throws InstantiationException cannot initialize the object.
Modified: ant/core/trunk/src/main/org/apache/tools/ant/ComponentHelper.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/ComponentHelper.java?view=diff&rev=471289&r1=471288&r2=471289
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/ComponentHelper.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/ComponentHelper.java Sat Nov 4 14:50:20 2006
@@ -502,7 +502,7 @@
if (c == null || !(Task.class.isAssignableFrom(c))) {
return null;
}
- Object obj= createComponent(taskType);
+ Object obj = createComponent(taskType);
if (obj == null) {
return null;
}
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=471289&r1=471288&r2=471289
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/DirectoryScanner.java Sat Nov 4 14:50:20 2006
@@ -864,7 +864,7 @@
}
}
while (it.hasNext()) {
- Map.Entry entry = (Map.Entry)it.next();
+ Map.Entry entry = (Map.Entry) it.next();
String currentelement = (String) entry.getKey();
if (basedir == null && !FileUtils.isAbsolutePath(currentelement)) {
continue;
Modified: ant/core/trunk/src/main/org/apache/tools/ant/Project.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/Project.java?view=diff&rev=471289&r1=471288&r2=471289
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/Project.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/Project.java Sat Nov 4 14:50:20 2006
@@ -2282,6 +2282,7 @@
* Resolve the file relative to the project's basedir and return it as a
* FileResource.
* @param name the name of the file to resolve.
+ * @return the file resource.
* @since Ant 1.7
*/
public Resource getResource(String name) {
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=471289&r1=471288&r2=471289
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/ProjectComponent.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/ProjectComponent.java Sat Nov 4 14:50:20 2006
@@ -37,7 +37,7 @@
/**
* Location within the build file of this task definition.
- * @deprecated since 1.6.x.
+ * @deprecated since 1.6.x.
* You should not be accessing this variable directly.
* Please use the {@link #getLocation()} method.
*/
@@ -126,6 +126,8 @@
/**
* @since Ant 1.7
* @return a shallow copy of this projectcomponent.
+ * @throws CloneNotSupportedException does not happen,
+ * but is declared to allow subclasses to do so.
*/
public Object clone() throws CloneNotSupportedException {
ProjectComponent pc = (ProjectComponent) super.clone();
Modified: ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java?view=diff&rev=471289&r1=471288&r2=471289
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/UnknownElement.java Sat Nov 4 14:50:20 2006
@@ -212,7 +212,15 @@
}
/**
+ * Delegate to realThing if present and if it as task.
* @see Task#handleInput(byte[], int, int)
+ * @param buffer the buffer into which data is to be read.
+ * @param offset the offset into the buffer at which data is stored.
+ * @param length the amount of data to read.
+ *
+ * @return the number of bytes read.
+ *
+ * @exception IOException if the data cannot be read.
* @since Ant 1.6
*/
protected int handleInput(byte[] buffer, int offset, int length)
Modified: ant/core/trunk/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java?view=diff&rev=471289&r1=471288&r2=471289
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/filters/FixCrLfFilter.java Sat Nov 4 14:50:20 2006
@@ -133,7 +133,7 @@
* @return a new filter based on this configuration, but filtering the
* specified reader.
*/
- public final Reader chain(final Reader rdr) {
+ public Reader chain(final Reader rdr) {
try {
FixCrLfFilter newFilter = new FixCrLfFilter(rdr);
@@ -289,7 +289,7 @@
* if the underlying stream throws an IOException during
* reading.
*/
- public synchronized final int read() throws IOException {
+ public synchronized int read() throws IOException {
if (!initialized) {
initInternalFilters();
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java?view=diff&rev=471289&r1=471288&r2=471289
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/filters/util/JavaClassHelper.java Sat Nov 4 14:50:20 2006
@@ -40,7 +40,7 @@
* @return a StringBuffer contains the name=value pairs
* @exception IOException if an error occurs
*/
- public static final StringBuffer getConstants(byte[] bytes)
+ public static StringBuffer getConstants(byte[] bytes)
throws IOException {
final StringBuffer sb = new StringBuffer();
final ByteArrayInputStream bis = new ByteArrayInputStream(bytes);
Modified: ant/core/trunk/src/main/org/apache/tools/ant/helper/DefaultExecutor.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/helper/DefaultExecutor.java?view=diff&rev=471289&r1=471288&r2=471289
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/helper/DefaultExecutor.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/helper/DefaultExecutor.java Sat Nov 4 14:50:20 2006
@@ -32,7 +32,7 @@
private static final SingleCheckExecutor SUB_EXECUTOR = new SingleCheckExecutor();
- //inherit doc
+ /** {@inheritDoc}. */
public void executeTargets(Project project, String[] targetNames)
throws BuildException {
BuildException thrownException = null;
@@ -52,7 +52,7 @@
}
}
- //inherit doc
+ /** {@inheritDoc}. */
public Executor getSubProjectExecutor() {
return SUB_EXECUTOR;
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/helper/SingleCheckExecutor.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/helper/SingleCheckExecutor.java?view=diff&rev=471289&r1=471288&r2=471289
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/helper/SingleCheckExecutor.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/helper/SingleCheckExecutor.java Sat Nov 4 14:50:20 2006
@@ -32,14 +32,14 @@
*/
public class SingleCheckExecutor implements Executor {
- //inherit doc
+ /** {@inheritDoc}. */
public void executeTargets(Project project, String[] targetNames)
throws BuildException {
project.executeSortedTargets(
project.topoSort(targetNames, project.getTargets(), false));
}
- //inherit doc
+ /** {@inheritDoc}. */
public Executor getSubProjectExecutor() {
return this;
}
Modified: ant/core/trunk/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java?view=diff&rev=471289&r1=471288&r2=471289
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/listener/AnsiColorLogger.java Sat Nov 4 14:50:20 2006
@@ -201,6 +201,7 @@
/**
* @see DefaultLogger#printMessage
*/
+ /** {@inheritDoc}. */
protected void printMessage(final String message,
final PrintStream stream,
final int priority) {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java?view=diff&rev=471289&r1=471288&r2=471289
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/listener/CommonsLoggingListener.java Sat Nov 4 14:50:20 2006
@@ -101,9 +101,7 @@
return log;
}
- /**
- * @see BuildListener#buildStarted
- */
+ /** {@inheritDoc}. */
public void buildStarted(BuildEvent event) {
String categoryString = PROJECT_LOG;
Log log = getLog(categoryString, null);
@@ -113,9 +111,7 @@
}
}
- /**
- * @see BuildListener#buildFinished
- */
+ /** {@inheritDoc}. */
public void buildFinished(BuildEvent event) {
if (initialized) {
String categoryString = PROJECT_LOG;
@@ -133,6 +129,7 @@
/**
* @see BuildListener#targetStarted
*/
+ /** {@inheritDoc}. */
public void targetStarted(BuildEvent event) {
if (initialized) {
Log log = getLog(TARGET_LOG,
@@ -147,6 +144,7 @@
/**
* @see BuildListener#targetFinished
*/
+ /** {@inheritDoc}. */
public void targetFinished(BuildEvent event) {
if (initialized) {
String targetName = event.getTarget().getName();
@@ -165,6 +163,7 @@
/**
* @see BuildListener#taskStarted
*/
+ /** {@inheritDoc}. */
public void taskStarted(BuildEvent event) {
if (initialized) {
Task task = event.getTask();
@@ -186,6 +185,7 @@
/**
* @see BuildListener#taskFinished
*/
+ /** {@inheritDoc}. */
public void taskFinished(BuildEvent event) {
if (initialized) {
Task task = event.getTask();
@@ -214,6 +214,7 @@
/**
* @see BuildListener#messageLogged
*/
+ /** {@inheritDoc}. */
public void messageLogged(BuildEvent event) {
if (initialized) {
Object categoryObject = event.getTask();
Modified: ant/core/trunk/src/main/org/apache/tools/ant/listener/Log4jListener.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/listener/Log4jListener.java?view=diff&rev=471289&r1=471288&r2=471289
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/listener/Log4jListener.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/listener/Log4jListener.java Sat Nov 4 14:50:20 2006
@@ -58,6 +58,7 @@
/**
* @see BuildListener#buildStarted
*/
+ /** {@inheritDoc}. */
public void buildStarted(BuildEvent event) {
if (initialized) {
Logger log = Logger.getLogger(Project.class.getName());
@@ -68,6 +69,7 @@
/**
* @see BuildListener#buildFinished
*/
+ /** {@inheritDoc}. */
public void buildFinished(BuildEvent event) {
if (initialized) {
Logger log = Logger.getLogger(Project.class.getName());
@@ -82,6 +84,7 @@
/**
* @see BuildListener#targetStarted
*/
+ /** {@inheritDoc}. */
public void targetStarted(BuildEvent event) {
if (initialized) {
Logger log = Logger.getLogger(Target.class.getName());
@@ -92,6 +95,7 @@
/**
* @see BuildListener#targetFinished
*/
+ /** {@inheritDoc}. */
public void targetFinished(BuildEvent event) {
if (initialized) {
String targetName = event.getTarget().getName();
@@ -108,6 +112,7 @@
/**
* @see BuildListener#taskStarted
*/
+ /** {@inheritDoc}. */
public void taskStarted(BuildEvent event) {
if (initialized) {
Task task = event.getTask();
@@ -119,6 +124,7 @@
/**
* @see BuildListener#taskFinished
*/
+ /** {@inheritDoc}. */
public void taskFinished(BuildEvent event) {
if (initialized) {
Task task = event.getTask();
@@ -135,6 +141,7 @@
/**
* @see BuildListener#messageLogged
*/
+ /** {@inheritDoc}. */
public void messageLogged(BuildEvent event) {
if (initialized) {
Object categoryObject = event.getTask();
Modified: ant/core/trunk/src/main/org/apache/tools/ant/listener/TimestampedLogger.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/listener/TimestampedLogger.java?view=diff&rev=471289&r1=471288&r2=471289
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/listener/TimestampedLogger.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/listener/TimestampedLogger.java Sat Nov 4 14:50:20 2006
@@ -54,6 +54,10 @@
return super.getBuildSuccessfulMessage() + SPACER + getTimestamp();
}
+ /**
+ * Get the current time.
+ * @return the current time as a formatted string.
+ */
protected String getTimestamp() {
Date date = new Date(System.currentTimeMillis());
DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
Modified: ant/core/trunk/src/main/org/apache/tools/ant/loader/AntClassLoader2.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/loader/AntClassLoader2.java?view=diff&rev=471289&r1=471288&r2=471289
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/loader/AntClassLoader2.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/loader/AntClassLoader2.java Sat Nov 4 14:50:20 2006
@@ -25,5 +25,7 @@
* Just use {@link AntClassLoader} itself.
*/
public class AntClassLoader2 extends AntClassLoader {
- public AntClassLoader2() {}
+ /** No args constructor. */
+ public AntClassLoader2() {
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org