Author: hboutemy
Date: Sat Aug 15 22:08:43 2009
New Revision: 804533
URL: http://svn.apache.org/viewvc?rev=804533&view=rev
Log:
little coding style fixes (no code change)
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java?rev=804533&r1=804532&r2=804533&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
Sat Aug 15 22:08:43 2009
@@ -39,15 +39,15 @@
private Map<String, RequirementMatcher> provides = new HashMap<String,
RequirementMatcher>();
public static final String KEY_TYPE = "type"; //NOI18N
-
+
private ToolchainModel model;
-
+
private Logger logger;
- protected DefaultToolchain( ToolchainModel model, Logger logger )
+ protected DefaultToolchain( ToolchainModel model, Logger logger )
{
this.model = model;
-
+
this.logger = logger;
}
@@ -57,13 +57,13 @@
this.type = type;
}
- public final String getType( )
+ public final String getType()
{
return type != null ? type : model.getType();
}
-
- public final ToolchainModel getModel( )
+
+ public final ToolchainModel getModel()
{
return model;
}
@@ -75,14 +75,15 @@
}
- public boolean matchesRequirements(Map requirements) {
+ public boolean matchesRequirements(Map requirements)
+ {
Iterator it = requirements.keySet().iterator();
while ( it.hasNext() )
{
String key = (String) it.next();
-
+
RequirementMatcher matcher = provides.get( key );
-
+
if ( matcher == null )
{
getLog().debug( "Toolchain " + this + " is missing required
property: " + key );
@@ -96,8 +97,9 @@
}
return true;
}
-
- protected Logger getLog() {
+
+ protected Logger getLog()
+ {
return logger;
}
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java?rev=804533&r1=804532&r2=804533&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
Sat Aug 15 22:08:43 2009
@@ -29,7 +29,7 @@
*/
public final class RequirementMatcherFactory
{
- private RequirementMatcherFactory( )
+ private RequirementMatcherFactory()
{
}
@@ -68,21 +68,24 @@
private VersionMatcher( String version )
{
- this.version = new DefaultArtifactVersion(version);
+ this.version = new DefaultArtifactVersion( version );
}
public boolean matches( String requirement )
{
- try
+ try
{
- VersionRange range =
VersionRange.createFromVersionSpec(requirement);
- if (range.hasRestrictions()) {
- return range.containsVersion(version);
- } else {
- return range.getRecommendedVersion().compareTo(version) ==
0;
+ VersionRange range = VersionRange.createFromVersionSpec(
requirement );
+ if ( range.hasRestrictions() )
+ {
+ return range.containsVersion( version );
}
- }
- catch (InvalidVersionSpecificationException ex)
+ else
+ {
+ return range.getRecommendedVersion().compareTo( version )
== 0;
+ }
+ }
+ catch ( InvalidVersionSpecificationException ex )
{
//TODO error reporting
ex.printStackTrace();
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java?rev=804533&r1=804532&r2=804533&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/Toolchain.java
Sat Aug 15 22:08:43 2009
@@ -27,7 +27,7 @@
public interface Toolchain
{
- String getType( );
+ String getType();
/**
* Gets the platform tool executable.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java?rev=804533&r1=804532&r2=804533&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
Sat Aug 15 22:08:43 2009
@@ -38,5 +38,5 @@
* if not applicable.
* TODO keep around??
**/
- ToolchainPrivate createDefaultToolchain( );
+ ToolchainPrivate createDefaultToolchain();
}
\ No newline at end of file
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java?rev=804533&r1=804532&r2=804533&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
Sat Aug 15 22:08:43 2009
@@ -37,8 +37,8 @@
* @param requirements Map<String, String> key value pair
* @return
*/
- boolean matchesRequirements( Map requirements);
-
- ToolchainModel getModel( );
-
+ boolean matchesRequirements( Map requirements );
+
+ ToolchainModel getModel();
+
}
\ No newline at end of file
