From 073153dd3797a3828591d86a2d069c8a317f893b Mon Sep 17 00:00:00 2001 From: Peter Reilly Date: Sun, 12 Aug 2007 18:24:20 +0000 Subject: [PATCH] checkstyle git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@565104 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/tools/ant/IntrospectionHelper.java | 4 +- src/main/org/apache/tools/ant/Project.java | 1 + .../org/apache/tools/ant/PropertyHelper.java | 39 +++++++++++-------- .../tools/ant/dispatch/DispatchUtils.java | 1 + .../tools/ant/helper/ProjectHelper2.java | 3 +- .../tools/ant/helper/ProjectHelperImpl.java | 3 +- .../tools/ant/listener/TimestampedLogger.java | 3 -- 7 files changed, 31 insertions(+), 23 deletions(-) diff --git a/src/main/org/apache/tools/ant/IntrospectionHelper.java b/src/main/org/apache/tools/ant/IntrospectionHelper.java index 746731baf..fd648b98c 100644 --- a/src/main/org/apache/tools/ant/IntrospectionHelper.java +++ b/src/main/org/apache/tools/ant/IntrospectionHelper.java @@ -1530,8 +1530,8 @@ public final class IntrospectionHelper { if (matchedDefinitionClass != null) { throw new BuildException( "ambiguous: restricted definitions for " - + componentName + " " + - matchedDefinitionClass + " and " + exposedClass); + + componentName + " " + + matchedDefinitionClass + " and " + exposedClass); } matchedDefinitionClass = exposedClass; definition = d; diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java index bd9dc4abe..5395ffcd3 100644 --- a/src/main/org/apache/tools/ant/Project.java +++ b/src/main/org/apache/tools/ant/Project.java @@ -1648,6 +1648,7 @@ public class Project implements ResourceFactory { /** * Get the Project instance associated with the specified object. + * @param o the object to query. * @return Project instance, if any. * @since Ant 1.7.1 */ diff --git a/src/main/org/apache/tools/ant/PropertyHelper.java b/src/main/org/apache/tools/ant/PropertyHelper.java index 92e090f9e..2cc3f6694 100644 --- a/src/main/org/apache/tools/ant/PropertyHelper.java +++ b/src/main/org/apache/tools/ant/PropertyHelper.java @@ -108,7 +108,8 @@ public class PropertyHelper implements Cloneable { }; private static final PropertyExpander DEFAULT_EXPANDER = new PropertyExpander() { - public String parsePropertyName(String s, ParsePosition pos, PropertyHelper propertyHelper) { + public String parsePropertyName( + String s, ParsePosition pos, PropertyHelper propertyHelper) { int index = pos.getIndex(); if (s.indexOf("${", index) == index) { int end = s.indexOf('}', index); @@ -124,19 +125,23 @@ public class PropertyHelper implements Cloneable { }; /** dummy */ - private static final PropertyExpander SKIP_$$ = new PropertyExpander() { - /** - * {@inheritDoc} - * @see org.apache.tools.ant.PropertyHelper.PropertyExpander#parsePropertyName(java.lang.String, java.text.ParsePosition, org.apache.tools.ant.PropertyHelper) - */ - public String parsePropertyName(String s, ParsePosition pos, PropertyHelper propertyHelper) { - int index = pos.getIndex(); - if (s.indexOf("$$", index) == index) { - pos.setIndex(++index); + private static final PropertyExpander SKIP_DOUBLE_DOLLAR + = new PropertyExpander() { + // CheckStyle:LineLengthCheck OFF see too long + /** + * {@inheritDoc} + * @see org.apache.tools.ant.PropertyHelper.PropertyExpander#parsePropertyName(java.lang.String, java.text.ParsePosition, org.apache.tools.ant.PropertyHelper) + */ + // CheckStyle:LineLengthCheck ON + public String parsePropertyName( + String s, ParsePosition pos, PropertyHelper propertyHelper) { + int index = pos.getIndex(); + if (s.indexOf("$$", index) == index) { + pos.setIndex(++index); + } + return null; } - return null; - } - }; + }; private Project project; private PropertyHelper next; @@ -164,7 +169,7 @@ public class PropertyHelper implements Cloneable { */ protected PropertyHelper() { add(TO_STRING); - add(SKIP_$$); + add(SKIP_DOUBLEDOLLAR); add(DEFAULT_EXPANDER); } @@ -457,8 +462,10 @@ public class PropertyHelper implements Cloneable { } private String parsePropertyName(String value, ParsePosition pos) { - for (Iterator iter = getDelegates(PropertyExpander.class).iterator(); iter.hasNext();) { - String propertyName = ((PropertyExpander) iter.next()).parsePropertyName(value, pos, this); + for (Iterator iter = getDelegates(PropertyExpander.class).iterator(); + iter.hasNext();) { + String propertyName = ((PropertyExpander) iter.next()) + .parsePropertyName(value, pos, this); if (propertyName == null) { continue; } diff --git a/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java b/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java index a23e3e6d4..5614be27d 100644 --- a/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java +++ b/src/main/org/apache/tools/ant/dispatch/DispatchUtils.java @@ -27,6 +27,7 @@ import java.lang.reflect.Method; /** * Determines and Executes the action method for the task. */ +// CheckStyle:HideUtilityClassConstructorCheck OFF - (bc) public class DispatchUtils { /** * Determines and Executes the action method for the task. diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java index 4a21c18b4..e7cc44990 100644 --- a/src/main/org/apache/tools/ant/helper/ProjectHelper2.java +++ b/src/main/org/apache/tools/ant/helper/ProjectHelper2.java @@ -965,7 +965,8 @@ public class ProjectHelper2 extends ProjectHelper { // be namespaced, need to extract the name // and convert from qualified name to uri/name if (ANT_TYPE.equals(name) - || (ANT_CORE_URI.equals(attrUri) && ANT_TYPE.equals(attrs.getLocalName(i)))) { + || (ANT_CORE_URI.equals(attrUri) + && ANT_TYPE.equals(attrs.getLocalName(i)))) { name = ANT_TYPE; int index = value.indexOf(":"); if (index >= 0) { diff --git a/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java b/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java index 49591be16..c72f08e49 100644 --- a/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java +++ b/src/main/org/apache/tools/ant/helper/ProjectHelperImpl.java @@ -397,7 +397,8 @@ public class ProjectHelperImpl extends ProjectHelper { baseDir = value; } else { throw new SAXParseException( - "Unexpected attribute \"" + attrs.getName(i) + "\"", helperImpl.locator); + "Unexpected attribute \"" + attrs.getName(i) + + "\"", helperImpl.locator); } } diff --git a/src/main/org/apache/tools/ant/listener/TimestampedLogger.java b/src/main/org/apache/tools/ant/listener/TimestampedLogger.java index eab9a41a5..91296e324 100644 --- a/src/main/org/apache/tools/ant/listener/TimestampedLogger.java +++ b/src/main/org/apache/tools/ant/listener/TimestampedLogger.java @@ -20,9 +20,6 @@ package org.apache.tools.ant.listener; import org.apache.tools.ant.DefaultLogger; -import java.util.Date; -import java.text.DateFormat; - /** * Like a normal logger, except with timed outputs */