Author: hboutemy
Date: Thu Sep 10 08:56:24 2009
New Revision: 813317
URL: http://svn.apache.org/viewvc?rev=813317&view=rev
Log:
little coding style fixes (no code change) (merged from maven-3 r804535)
Modified:
maven/maven-2/branches/maven-2.2.x/maven-toolchain/ (props changed)
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.mdo
(props changed)
Propchange: maven/maven-2/branches/maven-2.2.x/maven-toolchain/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 10 08:56:24 2009
@@ -3,6 +3,6 @@
/maven/components/branches/maven-2.1.0-M1-RC/maven-toolchain:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC/maven-toolchain:688883,689695,689976,689990,752168,752428,752622,752653,753089-753090,753320,755086,755199,755215
/maven/components/branches/maven-2.1.x/maven-toolchain:751686,767628,767631,768817,768995,769010-769011
-/maven/components/trunk/maven-core:804533
+/maven/components/trunk/maven-core:804533,804535
/maven/components/trunk/maven-toolchain:572229,720001,721902,726845,729292,792073
/maven/sandbox/branches/maven/MNG-3379/maven-toolchain:678167
Modified:
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
URL:
http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java?rev=813317&r1=813316&r2=813317&view=diff
==============================================================================
---
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
(original)
+++
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
Thu Sep 10 08:56:24 2009
@@ -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
Modified:
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
URL:
http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java?rev=813317&r1=813316&r2=813317&view=diff
==============================================================================
---
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
(original)
+++
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
Thu Sep 10 08:56:24 2009
@@ -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
Propchange:
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/mdo/toolchains.mdo
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 10 08:56:24 2009
@@ -1 +1,2 @@
/maven/components/branches/maven-2.1.x/maven-toolchain/src/main/mdo/toolchains.mdo:768778,768796,768995,769010-769011
+/maven/components/trunk/maven-core/src/main/mdo/toolchains.mdo:804535
