You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mk...@apache.org on 2007/09/20 21:56:52 UTC
svn commit: r577897 - in
/maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain:
./ java/
Author: mkleint
Date: Thu Sep 20 12:56:51 2007
New Revision: 577897
URL: http://svn.apache.org/viewvc?rev=577897&view=rev
Log:
reformat
Modified:
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/Toolchain.java
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
Modified: maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java?rev=577897&r1=577896&r2=577897&view=diff
==============================================================================
--- maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java (original)
+++ maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java Thu Sep 20 12:56:51 2007
@@ -26,32 +26,40 @@
*
* @author mkleint
*/
-public abstract class DefaultToolchain implements Toolchain, ToolchainPrivate {
-
+public abstract class DefaultToolchain
+ implements Toolchain, ToolchainPrivate
+{
+
private String type;
- private Map provides = new HashMap/*<String,RequirementMatcher>*/();
+
+ private Map provides = new HashMap /*<String,RequirementMatcher>*/ ( );
+
public static final String KEY_TYPE = "type"; //NOI18N
- protected DefaultToolchain() {
+ protected DefaultToolchain( )
+ {
}
-
- protected DefaultToolchain(String type) {
+
+ protected DefaultToolchain( String type )
+ {
this.type = type;
}
- public final String getType() {
+ public final String getType( )
+ {
return type;
}
- public final String getStorageKey() {
+ public final String getStorageKey( )
+ {
return "toolchain-" + type; //NOI18N
}
- public Map getData()
+ public Map getData( )
{
Map data = new HashMap( 2 );
data.put( KEY_TYPE, type );
-
+
return data;
}
@@ -59,14 +67,15 @@
{
type = (String) data.get( KEY_TYPE );
}
-
- public final void addProvideToken(String type, RequirementMatcher matcher) {
- provides.put(type, matcher);
- }
- public Map getRequirementMatchers() {
- return new HashMap(provides);
+ public final void addProvideToken( String type,
+ RequirementMatcher matcher )
+ {
+ provides.put( type, matcher );
}
-
-}
+ public Map getRequirementMatchers( )
+ {
+ return new HashMap( provides );
+ }
+}
\ No newline at end of file
Modified: maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java?rev=577897&r1=577896&r2=577897&view=diff
==============================================================================
--- maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java (original)
+++ maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchainManager.java Thu Sep 20 12:56:51 2007
@@ -43,97 +43,138 @@
*
* @author mkleint
*/
-public class DefaultToolchainManager implements ToolchainManager, Contextualizable {
+public class DefaultToolchainManager
+ implements ToolchainManager,
+ Contextualizable
+{
- /**
+ /**
* @component
*/
private PlexusContainer container;
- public DefaultToolchainManager() {
+ public DefaultToolchainManager( )
+ {
}
- public void contextualize(Context context) throws ContextException {
- container = (PlexusContainer)context.get(PlexusConstants.PLEXUS_KEY);
+ public void contextualize( Context context )
+ throws ContextException
+ {
+ container = (PlexusContainer) context.get(PlexusConstants.PLEXUS_KEY);
}
- public ToolchainPrivate[] getToolchainsForType(String type) throws MisconfiguredToolchainException {
- try {
- PersistedToolchains pers = readToolchainSettings();
- Map factories = container.lookupMap(ToolchainFactory.ROLE);
- List toRet = new ArrayList();
- if (pers != null) {
- List lst = pers.getToolchains();
- if (lst != null) {
- Iterator it = lst.iterator();
- while (it.hasNext()) {
+ public ToolchainPrivate[] getToolchainsForType( String type )
+ throws MisconfiguredToolchainException
+ {
+ try
+ {
+ PersistedToolchains pers = readToolchainSettings( );
+ Map factories = container.lookupMap( ToolchainFactory.ROLE );
+ List toRet = new ArrayList( );
+ if ( pers != null )
+ {
+ List lst = pers.getToolchains( );
+ if ( lst != null )
+ {
+ Iterator it = lst.iterator( );
+ while ( it.hasNext( ) )
+ {
ToolchainModel toolchainModel = (ToolchainModel) it.next();
- ToolchainFactory fact = (ToolchainFactory)factories.get(toolchainModel.getType());
- if (fact != null) {
- toRet.add(fact.createToolchain(toolchainModel));
- } else {
+ ToolchainFactory fact = (ToolchainFactory) factories.get(toolchainModel.getType());
+ if ( fact != null )
+ {
+ toRet.add( fact.createToolchain( toolchainModel ) );
+ }
+ else
+ {
//TODO log the missing factory.
- System.out.println("missing factory.." + toolchainModel);
+ System.out.println( "missing factory.." + toolchainModel );
}
}
}
}
- Iterator it = factories.values().iterator();
- while (it.hasNext()) {
- ToolchainFactory fact = (ToolchainFactory)it.next();
- ToolchainPrivate tool = fact.createDefaultToolchain();
- if (tool != null) {
- toRet.add(tool);
+ Iterator it = factories.values( ).iterator( );
+ while ( it.hasNext( ) )
+ {
+ ToolchainFactory fact = (ToolchainFactory) it.next();
+ ToolchainPrivate tool = fact.createDefaultToolchain( );
+ if ( tool != null )
+ {
+ toRet.add( tool );
}
}
- ToolchainPrivate[] tc = new ToolchainPrivate[toRet.size()];
+ ToolchainPrivate[] tc = new ToolchainPrivate[toRet.size( )];
return (ToolchainPrivate[]) toRet.toArray(tc);
- } catch (ComponentLookupException ex) {
+ }
+ catch ( ComponentLookupException ex )
+ {
//TODO
- ex.printStackTrace();
+ ex.printStackTrace( );
}
return new ToolchainPrivate[0];
}
- public Toolchain getToolchainFromBuildContext(String type, BuildContext context) {
- try {
+ public Toolchain getToolchainFromBuildContext( String type,
+ BuildContext context )
+ {
+ try
+ {
ToolchainFactory fact = (ToolchainFactory) container.lookup(ToolchainFactory.ROLE, type);
- Toolchain dt = fact.createToolchain(context);
- if (dt != null) {
+ Toolchain dt = fact.createToolchain( context );
+ if ( dt != null )
+ {
return dt;
}
return null;
- } catch (ComponentLookupException ex) {
+ }
+ catch ( ComponentLookupException ex )
+ {
//TODO report
- ex.printStackTrace();
- } catch (MisconfiguredToolchainException ex) {
+ ex.printStackTrace( );
+ }
+ catch ( MisconfiguredToolchainException ex )
+ {
//TODO report
- ex.printStackTrace();
+ ex.printStackTrace( );
}
return null;
}
-
- public void storeToolchainToBuildContext(ToolchainPrivate toolchain, BuildContext context) {
- context.store(toolchain);
+
+ public void storeToolchainToBuildContext( ToolchainPrivate toolchain,
+ BuildContext context )
+ {
+ context.store( toolchain );
}
-
- private PersistedToolchains readToolchainSettings() throws MisconfiguredToolchainException {
+
+ private PersistedToolchains readToolchainSettings( )
+ throws MisconfiguredToolchainException
+ {
//TODO how to point to the local path?
- File tch = new File(System.getProperty("user.home"), ".m2/toolchains.xml");
- if (tch.exists()) {
- MavenToolchainsXpp3Reader reader = new MavenToolchainsXpp3Reader();
+ File tch = new File( System.getProperty( "user.home" ),
+ ".m2/toolchains.xml" );
+ if ( tch.exists( ) )
+ {
+ MavenToolchainsXpp3Reader reader = new MavenToolchainsXpp3Reader( );
InputStreamReader in = null;
- try {
- in = new InputStreamReader(new BufferedInputStream(new FileInputStream(tch)));
- return reader.read(in);
- } catch (Exception ex) {
- throw new MisconfiguredToolchainException("Cannot read toolchains file at " + tch.getAbsolutePath(), ex);
- } finally {
- IOUtil.close(in);
+ try
+ {
+ in = new InputStreamReader( new BufferedInputStream( new FileInputStream( tch ) ) );
+ return reader.read( in );
+ }
+ catch ( Exception ex )
+ {
+ throw new MisconfiguredToolchainException( "Cannot read toolchains file at " + tch.getAbsolutePath( ),
+ ex );
}
- } else {
+ finally
+ {
+ IOUtil.close( in );
+ }
+ }
+ else
+ {
//TODO log the fact that no toolchains file was found.
}
return null;
}
-}
+}
\ No newline at end of file
Modified: maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java?rev=577897&r1=577896&r2=577897&view=diff
==============================================================================
--- maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java (original)
+++ maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/MisconfiguredToolchainException.java Thu Sep 20 12:56:51 2007
@@ -23,13 +23,18 @@
*
* @author mkleint
*/
-public class MisconfiguredToolchainException extends Exception {
+public class MisconfiguredToolchainException
+ extends Exception
+{
- public MisconfiguredToolchainException(String message) {
- super(message);
+ public MisconfiguredToolchainException( String message )
+ {
+ super( message );
}
-
- public MisconfiguredToolchainException(String message, Throwable orig) {
- super(message, orig);
+
+ public MisconfiguredToolchainException( String message,
+ Throwable orig )
+ {
+ super( message, orig );
}
-}
+}
\ No newline at end of file
Modified: maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java?rev=577897&r1=577896&r2=577897&view=diff
==============================================================================
--- maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java (original)
+++ maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcher.java Thu Sep 20 12:56:51 2007
@@ -23,8 +23,8 @@
*
* @author mkleint
*/
-public interface RequirementMatcher {
-
- boolean matches(String requirement);
-
-}
+public interface RequirementMatcher
+{
+
+ boolean matches( String requirement );
+}
\ No newline at end of file
Modified: maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java?rev=577897&r1=577896&r2=577897&view=diff
==============================================================================
--- maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java (original)
+++ maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java Thu Sep 20 12:56:51 2007
@@ -23,39 +23,55 @@
*
* @author mkleint
*/
-public final class RequirementMatcherFactory {
-
- private RequirementMatcherFactory() {}
-
- public static RequirementMatcher createExactMatcher(String provideValue) {
- return new ExactMatcher(provideValue);
+public final class RequirementMatcherFactory
+{
+
+ private RequirementMatcherFactory( )
+ {
+ }
+
+ public static RequirementMatcher createExactMatcher( String provideValue )
+ {
+ return new ExactMatcher( provideValue );
}
-
- public static RequirementMatcher createVersionMatcher(String provideValue) {
- return new VersionMatcher(provideValue);
+
+ public static RequirementMatcher createVersionMatcher( String provideValue )
+ {
+ return new VersionMatcher( provideValue );
}
-
- private static final class ExactMatcher implements RequirementMatcher {
+
+ private static final class ExactMatcher
+ implements RequirementMatcher
+ {
+
private String provides;
- private ExactMatcher(String provides) {
+
+ private ExactMatcher( String provides )
+ {
this.provides = provides;
}
- public boolean matches(String requirement) {
- return provides.equalsIgnoreCase(requirement);
+ public boolean matches( String requirement )
+ {
+ return provides.equalsIgnoreCase( requirement );
}
}
-
- private static final class VersionMatcher implements RequirementMatcher {
+
+ private static final class VersionMatcher
+ implements RequirementMatcher
+ {
+
private String version;
-
- private VersionMatcher(String version) {
+
+ private VersionMatcher( String version )
+ {
this.version = version;
}
-
- public boolean matches(String requirement) {
+
+ public boolean matches( String requirement )
+ {
//TODO have exact the same version resolution as the enforcer has..
- return version.equals(requirement);
+ return version.equals( requirement );
}
}
-}
+}
\ No newline at end of file
Modified: maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/Toolchain.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/Toolchain.java?rev=577897&r1=577896&r2=577897&view=diff
==============================================================================
--- maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/Toolchain.java (original)
+++ maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/Toolchain.java Thu Sep 20 12:56:51 2007
@@ -25,11 +25,11 @@
* @author Milos Kleint
* @author Jason van Zyl
*/
-public interface Toolchain extends ManagedBuildData
+public interface Toolchain
+ extends ManagedBuildData
{
-
- String getType();
-
+
+ String getType( );
/**
* Gets the platform tool executable.
@@ -38,5 +38,4 @@
* @return file representing the tool executable, or null if the tool can not be found
*/
String findTool( String toolName );
-
-}
+}
\ No newline at end of file
Modified: maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java?rev=577897&r1=577896&r2=577897&view=diff
==============================================================================
--- maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java (original)
+++ maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java Thu Sep 20 12:56:51 2007
@@ -23,25 +23,27 @@
import org.apache.maven.toolchain.model.ToolchainModel;
/**
- *
+ *
* @author mkleint
*/
-public interface ToolchainFactory {
+public interface ToolchainFactory
+{
- String ROLE = ToolchainFactory.class.getName();
+ String ROLE = ToolchainFactory.class.getName( );
- Toolchain createToolchain(BuildContext context) throws MisconfiguredToolchainException;
+ Toolchain createToolchain( BuildContext context )
+ throws MisconfiguredToolchainException;
/**
* Create instance of toolchain.
**/
- ToolchainPrivate createToolchain(ToolchainModel model) throws MisconfiguredToolchainException;
+ ToolchainPrivate createToolchain( ToolchainModel model )
+ throws MisconfiguredToolchainException;
/**
* Returns the default instance of the particular type of toolchain, can return null
* if not applicable.
* TODO keep around??
**/
- ToolchainPrivate createDefaultToolchain();
-
-}
+ ToolchainPrivate createDefaultToolchain( );
+}
\ No newline at end of file
Modified: maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManager.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManager.java?rev=577897&r1=577896&r2=577897&view=diff
==============================================================================
--- maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManager.java (original)
+++ maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainManager.java Thu Sep 20 12:56:51 2007
@@ -25,23 +25,26 @@
*
* @author mkleint
*/
-public interface ToolchainManager {
+public interface ToolchainManager
+{
+
+ String ROLE = ToolchainManager.class.getName( );
- String ROLE = ToolchainManager.class.getName();
-
/**
* to be called from toolchains-plugin only.. TODO split?
- */
- ToolchainPrivate[] getToolchainsForType(String type) throws MisconfiguredToolchainException;
+ */
+ ToolchainPrivate[] getToolchainsForType( String type )
+ throws MisconfiguredToolchainException;
/**
* to be used from plugins capable of working with toolchains.
- */
- Toolchain getToolchainFromBuildContext(String type, BuildContext context);
-
+ */
+ Toolchain getToolchainFromBuildContext( String type,
+ BuildContext context );
+
/**
* to be called from toolchains-plugin only.. TODO split?
- */
- void storeToolchainToBuildContext(ToolchainPrivate toolchain, BuildContext context);
-
-}
+ */
+ void storeToolchainToBuildContext( ToolchainPrivate toolchain,
+ BuildContext context );
+}
\ No newline at end of file
Modified: maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java?rev=577897&r1=577896&r2=577897&view=diff
==============================================================================
--- maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java (original)
+++ maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java Thu Sep 20 12:56:51 2007
@@ -25,7 +25,9 @@
* a private contract between the toolchains plugin and the components.
* @author mkleint
*/
-public interface ToolchainPrivate extends Toolchain {
+public interface ToolchainPrivate
+ extends Toolchain
+{
- Map getRequirementMatchers();
-}
+ Map getRequirementMatchers( );
+}
\ No newline at end of file
Modified: maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java?rev=577897&r1=577896&r2=577897&view=diff
==============================================================================
--- maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java (original)
+++ maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolChain.java Thu Sep 20 12:56:51 2007
@@ -29,56 +29,71 @@
/**
* @author Milos Kleint
*/
-public class DefaultJavaToolChain extends DefaultToolchain implements JavaToolChain
+public class DefaultJavaToolChain
+ extends DefaultToolchain
+ implements JavaToolChain
{
+
private String javaHome;
+
public static final String KEY_JAVAHOME = "jdkHome"; //NOI18N
- public DefaultJavaToolChain() {
- super("jdk");
+ public DefaultJavaToolChain( )
+ {
+ super( "jdk" );
}
-
- public String getJavaHome() {
+
+ public String getJavaHome( )
+ {
return javaHome;
}
- public void setJavaHome(String javaHome) {
+ public void setJavaHome( String javaHome )
+ {
this.javaHome = javaHome;
}
- public String toString() {
- return "JDK[" + getJavaHome() + "]";
+ public String toString( )
+ {
+ return "JDK[" + getJavaHome( ) + "]";
}
-
-
- public String findTool(String toolName) {
- File toRet = findTool(toolName, new File(FileUtils.normalize(getJavaHome())));
- if (toRet != null) {
- return toRet.getAbsolutePath();
+
+ public String findTool( String toolName )
+ {
+ File toRet = findTool( toolName,
+ new File( FileUtils.normalize( getJavaHome( ) ) ) );
+ if ( toRet != null )
+ {
+ return toRet.getAbsolutePath( );
}
return null;
}
- public Map getData() {
- Map map = super.getData();
- map.put(KEY_JAVAHOME, javaHome);
+ public Map getData( )
+ {
+ Map map = super.getData( );
+ map.put( KEY_JAVAHOME, javaHome );
return map;
}
- public void setData(Map data) {
- super.setData(data);
- javaHome = (String)data.get(KEY_JAVAHOME);
+ public void setData( Map data )
+ {
+ super.setData( data );
+ javaHome = (String) data.get(KEY_JAVAHOME);
}
- private static File findTool (String toolName, File installFolder) {
- File bin = new File(installFolder, "bin"); //NOI18N
- if (bin.exists()) {
- File tool = new File (bin, toolName + (Os.isFamily("windows") ? ".exe" : "")); //NOI18N
- if (tool.exists()) {
+ private static File findTool( String toolName, File installFolder )
+ {
+ File bin = new File( installFolder, "bin" ); //NOI18N
+ if ( bin.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/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java?rev=577897&r1=577896&r2=577897&view=diff
==============================================================================
--- maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java (original)
+++ maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/java/DefaultJavaToolchainFactory.java Thu Sep 20 12:56:51 2007
@@ -34,56 +34,74 @@
*
* @author mkleint
*/
-public class DefaultJavaToolchainFactory implements ToolchainFactory {
+public class DefaultJavaToolchainFactory
+ implements ToolchainFactory
+{
- public DefaultJavaToolchainFactory() {
+ public DefaultJavaToolchainFactory( )
+ {
}
- public ToolchainPrivate createToolchain(ToolchainModel model) throws MisconfiguredToolchainException {
- DefaultJavaToolChain jtc = new DefaultJavaToolChain();
- 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.");
+ public ToolchainPrivate createToolchain( ToolchainModel model )
+ throws MisconfiguredToolchainException
+ {
+ DefaultJavaToolChain jtc = new DefaultJavaToolChain( );
+ 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." );
}
- File normal = new File(FileUtils.normalize(javahome.getValue()));
- if (normal.exists()) {
- jtc.setJavaHome(FileUtils.normalize(javahome.getValue()));
- } else {
- throw new MisconfiguredToolchainException("Non-existing JDK home configuration at " + normal.getAbsolutePath());
+ File normal = new File( FileUtils.normalize( javahome.getValue( ) ) );
+ if ( normal.exists( ) )
+ {
+ jtc.setJavaHome( FileUtils.normalize( javahome.getValue( ) ) );
}
-
+ else
+ {
+ throw new MisconfiguredToolchainException( "Non-existing JDK home configuration at " + normal.getAbsolutePath( ) );
+ }
+
//now populate the provides section.
//TODO possibly move at least parts to a utility method or abstract implementation.
- dom = (Xpp3Dom)model.getProvides();
- Xpp3Dom[] provides = dom.getChildren();
- for (int i = 0; i < provides.length; i++) {
- String key = provides[i].getName();
- String value = provides[i].getValue();
- if (value == null) {
- throw new MisconfiguredToolchainException("Provides token '" + key + "' doesn't have any value configured.");
+ dom = (Xpp3Dom) model.getProvides();
+ Xpp3Dom[] provides = dom.getChildren( );
+ for ( int i = 0; i < provides.length; i++ )
+ {
+ String key = provides[i].getName( );
+ String value = provides[i].getValue( );
+ if ( value == null )
+ {
+ throw new MisconfiguredToolchainException( "Provides token '" + key + "' doesn't have any value configured." );
+ }
+ if ( "version".equals( key ) )
+ {
+ jtc.addProvideToken( key,
+ RequirementMatcherFactory.createVersionMatcher( value ) );
}
- if ("version".equals(key)) {
- jtc.addProvideToken(key, RequirementMatcherFactory.createVersionMatcher(value));
- } else {
- jtc.addProvideToken(key, RequirementMatcherFactory.createExactMatcher(value));
+ else
+ {
+ jtc.addProvideToken( key,
+ RequirementMatcherFactory.createExactMatcher( value ) );
}
}
return jtc;
}
-
- public ToolchainPrivate createDefaultToolchain() {
+ public ToolchainPrivate createDefaultToolchain( )
+ {
return null;
}
- public Toolchain createToolchain(BuildContext context) throws MisconfiguredToolchainException {
- DefaultJavaToolChain jtc = new DefaultJavaToolChain();
- boolean retrieve = context.retrieve(jtc);
- if (retrieve) {
+ public Toolchain createToolchain( BuildContext context )
+ throws MisconfiguredToolchainException
+ {
+ DefaultJavaToolChain jtc = new DefaultJavaToolChain( );
+ boolean retrieve = context.retrieve( jtc );
+ if ( retrieve )
+ {
return jtc;
}
return null;
}
-
-}
+}
\ No newline at end of file