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 2009/08/16 00:12:01 UTC
svn commit: r804535 - in
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java:
DefaultJavaToolChain.java DefaultJavaToolchainFactory.java
Author: hboutemy
Date: Sat Aug 15 22:12:01 2009
New Revision: 804535
URL: http://svn.apache.org/viewvc?rev=804535&view=rev
Log:
little coding style fixes (no code change)
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java?rev=804535&r1=804534&r2=804535&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java Sat Aug 15 22:12:01 2009
@@ -45,7 +45,7 @@
super( model, "jdk", logger );
}
- public String getJavaHome( )
+ public String getJavaHome()
{
return javaHome;
}
@@ -55,18 +55,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;
}
@@ -74,15 +73,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
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java?rev=804535&r1=804534&r2=804535&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java Sat Aug 15 22:12:01 2009
@@ -44,22 +44,24 @@
@Requirement
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() )
@@ -68,7 +70,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.
@@ -100,13 +103,13 @@
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;
}
-
+
}
\ No newline at end of file