Author: hboutemy
Date: Thu Sep 10 22:50:38 2009
New Revision: 813628
URL: http://svn.apache.org/viewvc?rev=813628&view=rev
Log:
fixed errors reported by Checkstyle
Modified:
maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
Modified:
maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java?rev=813628&r1=813627&r2=813628&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
(original)
+++
maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
Thu Sep 10 22:50:38 2009
@@ -43,7 +43,7 @@
implements Cloneable
{
/** The Plexus component type */
- public static String MAVEN_PLUGIN = "maven-plugin";
+ public static final String MAVEN_PLUGIN = "maven-plugin";
/** "once-per-session" execution strategy */
public static final String SINGLE_PASS_EXEC_STRATEGY = "once-per-session";
@@ -57,7 +57,7 @@
private List<Parameter> parameters;
- private Map<String,Parameter> parameterMap;
+ private Map<String, Parameter> parameterMap;
/** By default, the execution strategy is "once-per-session" */
private String executionStrategy = SINGLE_PASS_EXEC_STRATEGY;
@@ -192,9 +192,9 @@
{
if ( parameters != null && parameters.contains( parameter ) )
{
- throw new DuplicateParameterException( parameter.getName() +
- " has been declared multiple times in mojo with goal: " +
getGoal() + " (implementation: " +
- getImplementation() + ")" );
+ throw new DuplicateParameterException( parameter.getName()
+ + " has been declared multiple times in mojo with goal: " +
getGoal() + " (implementation: "
+ + getImplementation() + ")" );
}
if ( parameters == null )
@@ -208,11 +208,11 @@
/**
* @return the list parameters as a Map
*/
- public Map<String,Parameter> getParameterMap()
+ public Map<String, Parameter> getParameterMap()
{
if ( parameterMap == null )
{
- parameterMap = new HashMap<String,Parameter>();
+ parameterMap = new HashMap<String, Parameter>();
if ( parameters != null )
{
@@ -262,7 +262,7 @@
* Gets the scope of (transitive) dependencies that should be collected.
Dependency collection refers to the process
* of calculating the complete dependency tree in terms of artifact
coordinates. In contrast to dependency
* resolution, this does not include the download of the files for the
dependency artifacts.
- *
+ *
* @return The scope of (transitive) dependencies that should be collected
or {...@code null} if none.
*/
public String getDependencyCollectionRequired()
Modified:
maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java?rev=813628&r1=813627&r2=813628&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
(original)
+++
maven/maven-3/trunk/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
Thu Sep 10 22:50:38 2009
@@ -232,7 +232,7 @@
/**
* Gets the artifacts that make up the plugin's class realm, excluding
artifacts shadowed by the Maven core realm
* like {...@code maven-project}.
- *
+ *
* @return The plugin artifacts, never {...@code null}.
*/
public List<Artifact> getArtifacts()
@@ -284,11 +284,11 @@
// changes above not being propogated to the map
MojoDescriptor mojoDescriptor = null;
-
+
for ( Iterator<?> i = getMojos().iterator(); i.hasNext() &&
mojoDescriptor == null; )
{
MojoDescriptor desc = (MojoDescriptor) i.next();
-
+
if ( goal.equals( desc.getGoal() ) )
{
mojoDescriptor = desc;
@@ -342,7 +342,7 @@
{
this.plugin = plugin;
}
-
+
public Plugin getPlugin()
{
return plugin;
