You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/02/16 00:07:29 UTC
svn commit: r1446806 - in
/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help:
ActiveProfilesMojo.java AllProfilesMojo.java DescribeMojo.java
EffectiveSettingsMojo.java EvaluateMojo.java ExpressionsMojo.java
Author: rfscholte
Date: Fri Feb 15 23:07:28 2013
New Revision: 1446806
URL: http://svn.apache.org/r1446806
Log:
formatting
Modified:
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AllProfilesMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java
Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java?rev=1446806&r1=1446805&r2=1446806&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ActiveProfilesMojo.java Fri Feb 15 23:07:28 2013
@@ -124,10 +124,10 @@ public class ActiveProfilesMojo
@SuppressWarnings( "unchecked" )
List<Profile> profiles = new ArrayList<Profile>( project.getActiveProfiles() );
- for( Profile profile : profiles )
+ for ( Profile profile : profiles )
{
List<String> profileIds = activeProfileIds.get( profile.getSource() );
- if( profileIds == null )
+ if ( profileIds == null )
{
profileIds = new ArrayList<String>();
activeProfileIds.put( profile.getSource(), profileIds );
Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AllProfilesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AllProfilesMojo.java?rev=1446806&r1=1446805&r2=1446806&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AllProfilesMojo.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/AllProfilesMojo.java Fri Feb 15 23:07:28 2013
@@ -261,7 +261,7 @@ public class AllProfilesMojo
}
MavenProject parent = project.getParent();
- while( parent != null )
+ while ( parent != null )
{
List<Profile> profiles2 = parent.getModel().getProfiles();
for ( Profile profile : profiles2 )
Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java?rev=1446806&r1=1446805&r2=1446806&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java Fri Feb 15 23:07:28 2013
@@ -473,7 +473,7 @@ public class DescribeMojo
if ( descriptor == null )
{
throw new MojoFailureException( "Plugin could not be found. If you believe it is correct,"
- + " check your pluginGroups setting, and run with -U to update the remote configuration" );
+ + " check your pluginGroups setting, and run with -U to update the remote configuration" );
}
return descriptor;
Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java?rev=1446806&r1=1446805&r2=1446806&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EffectiveSettingsMojo.java Fri Feb 15 23:07:28 2013
@@ -202,7 +202,7 @@ public class EffectiveSettingsMojo
clone.setServers( clonedServers );
List<Proxy> clonedProxies = new ArrayList<Proxy>( settings.getProxies().size() );
- for( Proxy proxy : settings.getProxies() )
+ for ( Proxy proxy : settings.getProxies() )
{
Proxy clonedProxy = new Proxy();
clonedProxy.setActive( proxy.isActive() );
Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java?rev=1446806&r1=1446805&r2=1446806&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java Fri Feb 15 23:07:28 2013
@@ -354,11 +354,11 @@ public class EvaluateMojo
}
/**
- * @param expression the user expression asked.
+ * @param expr the user expression asked.
* @throws MojoExecutionException if any
* @throws MojoFailureException if any reflection exceptions occur or missing components.
*/
- private void handleResponse( String expression )
+ private void handleResponse( String expr )
throws MojoExecutionException, MojoFailureException
{
StringBuilder response = new StringBuilder();
@@ -366,14 +366,14 @@ public class EvaluateMojo
Object obj;
try
{
- obj = getEvaluator().evaluate( expression );
+ obj = getEvaluator().evaluate( expr );
}
catch ( ExpressionEvaluationException e )
{
throw new MojoExecutionException( "Error when evaluating the Maven expression", e );
}
- if ( obj != null && expression.equals( obj.toString() ) )
+ if ( obj != null && expr.equals( obj.toString() ) )
{
getLog().warn( "The Maven expression was invalid. Please use a valid expression." );
return;
@@ -464,18 +464,18 @@ public class EvaluateMojo
else
{
// others Maven objects
- response.append( toXML( expression, obj ) );
+ response.append( toXML( expr, obj ) );
}
getLog().info( "\n" + response.toString() );
}
/**
- * @param expression the user expression.
+ * @param expr the user expression.
* @param obj a not null.
* @return the XML for the given object.
*/
- private String toXML( String expression, Object obj )
+ private String toXML( String expr, Object obj )
{
XStream currentXStream = getXStream();
@@ -493,9 +493,9 @@ public class EvaluateMojo
else
{
// try to detect the alias from question
- if ( expression.indexOf( '.' ) != -1 )
+ if ( expr.indexOf( '.' ) != -1 )
{
- String name = expression.substring( expression.indexOf( '.' ) + 1, expression.indexOf( '}' ) );
+ String name = expr.substring( expr.indexOf( '.' ) + 1, expr.indexOf( '}' ) );
currentXStream.alias( name, List.class );
}
}
Modified: maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java?rev=1446806&r1=1446805&r2=1446806&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/main/java/org/apache/maven/plugins/help/ExpressionsMojo.java Fri Feb 15 23:07:28 2013
@@ -55,7 +55,7 @@ public class ExpressionsMojo
public void execute()
throws MojoExecutionException, MojoFailureException
{
- Map<String,Expression> m;
+ Map<String, Expression> m;
try
{
m = ExpressionDocumenter.load();
@@ -74,7 +74,7 @@ public class ExpressionsMojo
sb.append( "\n\n" );
}
- for ( Map.Entry<String,Expression> entry : m.entrySet() )
+ for ( Map.Entry<String, Expression> entry : m.entrySet() )
{
String key = entry.getKey();
Expression expression = entry.getValue();