You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2008/11/01 18:34:04 UTC
svn commit: r709729 - in
/maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain:
ToolchainConverter.java ToolchainMojo.java Toolchains.java
Author: hboutemy
Date: Sat Nov 1 10:34:03 2008
New Revision: 709729
URL: http://svn.apache.org/viewvc?rev=709729&view=rev
Log:
fixed errors reported by Checkstyle
Modified:
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainConverter.java
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/Toolchains.java
Modified: maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainConverter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainConverter.java?rev=709729&r1=709728&r2=709729&view=diff
==============================================================================
--- maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainConverter.java (original)
+++ maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainConverter.java Sat Nov 1 10:34:03 2008
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.toolchain;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,9 +19,9 @@
* under the License.
*/
-package org.apache.maven.plugin.toolchain;
-
import java.util.HashMap;
+import java.util.Map;
+
import org.codehaus.plexus.component.configurator.ComponentConfigurationException;
import org.codehaus.plexus.component.configurator.ConfigurationListener;
import org.codehaus.plexus.component.configurator.converters.AbstractConfigurationConverter;
@@ -38,7 +40,7 @@
extends AbstractConfigurationConverter
{
- public static final String ROLE = ConfigurationConverter.class.getName( );
+ public static final String ROLE = ConfigurationConverter.class.getName();
/**
* @see org.codehaus.plexus.component.configurator.converters.ConfigurationConverter#canConvert(java.lang.Class)
@@ -59,7 +61,7 @@
ConfigurationListener listener )
throws ComponentConfigurationException
{
- Toolchains retValue = new Toolchains( );
+ Toolchains retValue = new Toolchains();
processConfiguration( retValue, configuration, expressionEvaluator );
return retValue;
@@ -70,19 +72,19 @@
ExpressionEvaluator expressionEvaluator )
throws ComponentConfigurationException
{
- HashMap map = new HashMap( );
- PlexusConfiguration[] tools = configuration.getChildren( );
+ Map map = new HashMap();
+ PlexusConfiguration[] tools = configuration.getChildren();
for ( int i = 0; i < tools.length; i++ )
{
- String type = tools[i].getName( );
- PlexusConfiguration[] params = tools[i].getChildren( );
- HashMap parameters = new HashMap( );
+ String type = tools[i].getName();
+ PlexusConfiguration[] params = tools[i].getChildren();
+ Map parameters = new HashMap();
for ( int j = 0; j < params.length; j++ )
{
try
{
- String name = params[j].getName( );
- String val = params[j].getValue( );
+ String name = params[j].getName();
+ String val = params[j].getValue();
parameters.put( name, val );
}
catch ( PlexusConfigurationException ex )
Modified: maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java?rev=709729&r1=709728&r2=709729&view=diff
==============================================================================
--- maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java (original)
+++ maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/ToolchainMojo.java Sat Nov 1 10:34:03 2008
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.toolchain;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,9 +19,6 @@
* under the License.
*/
-
-package org.apache.maven.plugin.toolchain;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -29,7 +28,6 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.toolchain.MisconfiguredToolchainException;
-import org.apache.maven.toolchain.RequirementMatcher;
import org.apache.maven.toolchain.ToolchainManagerPrivate;
import org.apache.maven.toolchain.ToolchainPrivate;
@@ -70,12 +68,12 @@
{
}
- public void execute( )
+ public void execute()
throws MojoExecutionException, MojoFailureException
{
if ( toolchains != null )
{
- Iterator en = toolchains.getToolchainsTypes().iterator( );
+ Iterator en = toolchains.getToolchainsTypes().iterator();
List nonMatchedTypes = new ArrayList();
while ( en.hasNext() )
{
Modified: maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/Toolchains.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/Toolchains.java?rev=709729&r1=709728&r2=709729&view=diff
==============================================================================
--- maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/Toolchains.java (original)
+++ maven/plugins/trunk/maven-toolchains-plugin/src/main/java/org/apache/maven/plugin/toolchain/Toolchains.java Sat Nov 1 10:34:03 2008
@@ -1,3 +1,5 @@
+package org.apache.maven.plugin.toolchain;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,8 +19,6 @@
* under the License.
*/
-package org.apache.maven.plugin.toolchain;
-
import java.util.Collections;
import java.util.Map;
import java.util.Set;
@@ -33,13 +33,13 @@
/** <String type, Map<String param, String value>> */
Map toolchains;
- public final Set getToolchainsTypes( )
+ public Set getToolchainsTypes()
{
- return Collections.unmodifiableSet( toolchains.keySet( ) );
+ return Collections.unmodifiableSet( toolchains.keySet() );
}
- public final Map getParams( String type )
+ public Map getParams( String type )
{
- return Collections.unmodifiableMap( (Map) toolchains.get(type) );
+ return Collections.unmodifiableMap( (Map) toolchains.get( type ) );
}
}
\ No newline at end of file