You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2008/07/16 21:29:11 UTC
svn commit: r677388 - in
/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun:
AntPropertyHelper.java components/AntTargetConverter.java
Author: dennisl
Date: Wed Jul 16 12:29:11 2008
New Revision: 677388
URL: http://svn.apache.org/viewvc?rev=677388&view=rev
Log:
o Fix errors reported by Checkstyle.
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntPropertyHelper.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/components/AntTargetConverter.java
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntPropertyHelper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntPropertyHelper.java?rev=677388&r1=677387&r2=677388&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntPropertyHelper.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntPropertyHelper.java Wed Jul 16 12:29:11 2008
@@ -72,9 +72,9 @@
{
Artifact artifact = (Artifact) it.next();
- String key = "maven.dependency." + artifact.getGroupId() + "." + artifact.getArtifactId() +
- ( artifact.getClassifier() != null ? "." + artifact.getClassifier() : "" ) +
- ( artifact.getType() != null ? "." + artifact.getType() : "" ) + ".path";
+ String key = "maven.dependency." + artifact.getGroupId() + "." + artifact.getArtifactId()
+ + ( artifact.getClassifier() != null ? "." + artifact.getClassifier() : "" )
+ + ( artifact.getType() != null ? "." + artifact.getType() : "" ) + ".path";
log.debug( "Storing: " + key + "=" + artifact.getFile().getPath() );
@@ -89,7 +89,7 @@
{
if ( log.isDebugEnabled() )
{
- log.debug( "getProperty(ns="+ns+", name="+name+", user="+user+")" );
+ log.debug( "getProperty(ns=" + ns + ", name=" + name + ", user=" + user + ")" );
}
/* keep old behaviour */
@@ -112,11 +112,11 @@
{
val = exprEvaluator.evaluate( "${" + name + "}" );
}
- catch (ExpressionEvaluationException e)
+ catch ( ExpressionEvaluationException e )
{
if ( log.isErrorEnabled() )
{
- log.error("Failed to evaluate expression" , e);
+ log.error( "Failed to evaluate expression", e );
}
}
}
@@ -159,7 +159,7 @@
true
);
}
- else if ( name.equals("basedir") )
+ else if ( name.equals( "basedir" ) )
{
val = ReflectionValueExtractor.evaluate(
"basedir.path",
@@ -188,7 +188,7 @@
if ( val instanceof File )
{
- val = ((File) val).getAbsoluteFile();
+ val = ( (File) val ).getAbsoluteFile();
}
return val;
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/components/AntTargetConverter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/components/AntTargetConverter.java?rev=677388&r1=677387&r2=677388&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/components/AntTargetConverter.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/components/AntTargetConverter.java Wed Jul 16 12:29:11 2008
@@ -75,12 +75,12 @@
retValue = instantiateObject( implementation );
- if (! ( retValue instanceof Target ) )
+ if ( !( retValue instanceof Target ) )
{
retValue = new Target();
}
- processConfiguration( (Target)retValue, configuration, expressionEvaluator );
+ processConfiguration( (Target) retValue, configuration, expressionEvaluator );
return retValue;
}