little coding style fixes (no code change) (merged from maven-3 r804535)
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-2/branches/maven-2.2.x@813317 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java b/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
index 604f7d0..de5992d 100644
--- a/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
+++ b/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
@@ -43,7 +43,7 @@
super( model, "jdk", logger );
}
- public String getJavaHome( )
+ public String getJavaHome()
{
return javaHome;
}
@@ -53,18 +53,17 @@
this.javaHome = javaHome;
}
- public String toString( )
+ public String toString()
{
- return "JDK[" + getJavaHome( ) + "]";
+ return "JDK[" + getJavaHome() + "]";
}
public String findTool( String toolName )
{
- File toRet = findTool( toolName,
- new File( FileUtils.normalize( getJavaHome( ) ) ) );
+ File toRet = findTool( toolName, new File( FileUtils.normalize( getJavaHome() ) ) );
if ( toRet != null )
{
- return toRet.getAbsolutePath( );
+ return toRet.getAbsolutePath();
}
return null;
}
@@ -73,15 +72,14 @@
private static File findTool( String toolName, File installFolder )
{
File bin = new File( installFolder, "bin" ); //NOI18N
- if ( bin.exists( ) )
+ if ( bin.exists() )
{
- File tool = new File( bin,
- toolName + (Os.isFamily( "windows" ) ? ".exe" : "") ); //NOI18N
- if ( tool.exists( ) )
+ File tool = new File( bin, toolName + ( Os.isFamily( "windows" ) ? ".exe" : "" ) ); // NOI18N
+ if ( tool.exists() )
{
return tool;
}
}
return null;
- }
+ }
}
\ No newline at end of file
diff --git a/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java b/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
index 1a5439b..10a1fa6 100644
--- a/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
+++ b/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
@@ -40,22 +40,24 @@
private Logger logger;
- public DefaultJavaToolchainFactory( )
+ public DefaultJavaToolchainFactory()
{
}
-
+
public ToolchainPrivate createToolchain( ToolchainModel model )
throws MisconfiguredToolchainException
{
- if (model == null) {
+ if ( model == null )
+ {
return null;
}
- DefaultJavaToolChain jtc = new DefaultJavaToolChain( model , logger);
+ DefaultJavaToolChain jtc = new DefaultJavaToolChain( model, logger );
Xpp3Dom dom = (Xpp3Dom) model.getConfiguration();
Xpp3Dom javahome = dom.getChild( DefaultJavaToolChain.KEY_JAVAHOME );
if ( javahome == null )
{
- throw new MisconfiguredToolchainException( "Java toolchain without the " + DefaultJavaToolChain.KEY_JAVAHOME + " configuration element." );
+ throw new MisconfiguredToolchainException( "Java toolchain without the "
+ + DefaultJavaToolChain.KEY_JAVAHOME + " configuration element." );
}
File normal = new File( FileUtils.normalize( javahome.getValue() ) );
if ( normal.exists() )
@@ -64,7 +66,8 @@
}
else
{
- throw new MisconfiguredToolchainException( "Non-existing JDK home configuration at " + normal.getAbsolutePath( ) );
+ throw new MisconfiguredToolchainException( "Non-existing JDK home configuration at "
+ + normal.getAbsolutePath() );
}
//now populate the provides section.
@@ -96,10 +99,10 @@
public ToolchainPrivate createDefaultToolchain()
{
//not sure it's necessary to provide a default toolchain here.
- //only version can be eventually supplied, and
+ //only version can be eventually supplied, and
return null;
}
-
+
protected Logger getLogger()
{
return logger;
@@ -109,5 +112,4 @@
{
this.logger = logger;
}
-
}
\ No newline at end of file
