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/09/10 10:51:24 UTC
svn commit: r813314 - in
/maven/maven-2/branches/maven-2.2.x/maven-toolchain: ./
src/main/java/org/apache/maven/toolchain/
Author: hboutemy
Date: Thu Sep 10 08:51:24 2009
New Revision: 813314
URL: http://svn.apache.org/viewvc?rev=813314&view=rev
Log:
little coding style fixes (no code change) (merged from maven-3 r804533)
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/DefaultToolchain.java
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/Toolchain.java
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
Propchange: maven/maven-2/branches/maven-2.2.x/maven-toolchain/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Sep 10 08:51:24 2009
@@ -0,0 +1,8 @@
+/maven/components/branches/maven-2.0.10-RC/maven-toolchain:679193-679867,680477-688882,708790-728809,728834
+/maven/components/branches/maven-2.0.x/maven-toolchain:679552-679867,693956-728820,728836,728940,729060,729738,729785,730461,730631,734502,734803,736543,746381
+/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-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/DefaultToolchain.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java?rev=813314&r1=813313&r2=813314&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java Thu Sep 10 08:51:24 2009
@@ -56,13 +56,12 @@
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;
}
@@ -74,13 +73,14 @@
}
- 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);
+ RequirementMatcher matcher = provides.get( key );
if ( matcher == null )
{
@@ -96,7 +96,8 @@
return true;
}
- protected Logger getLog() {
+ protected Logger getLog()
+ {
return logger;
}
}
\ No newline at end of file
Modified: maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java?rev=813314&r1=813313&r2=813314&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java Thu Sep 10 08:51:24 2009
@@ -29,8 +29,7 @@
*/
public final class RequirementMatcherFactory
{
-
- private RequirementMatcherFactory( )
+ private RequirementMatcherFactory()
{
}
@@ -69,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 );
+ }
+ else
+ {
+ return range.getRecommendedVersion().compareTo( version ) == 0;
}
- }
- catch (InvalidVersionSpecificationException ex)
+ }
+ catch ( InvalidVersionSpecificationException ex )
{
//TODO error reporting
ex.printStackTrace();
Modified: maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/Toolchain.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/Toolchain.java?rev=813314&r1=813313&r2=813314&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/Toolchain.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/Toolchain.java Thu Sep 10 08:51:24 2009
@@ -27,7 +27,7 @@
public interface Toolchain
{
- String getType( );
+ String getType();
/**
* Gets the platform tool executable.
Modified: maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java?rev=813314&r1=813313&r2=813314&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainFactory.java Thu Sep 10 08:51:24 2009
@@ -41,5 +41,5 @@
* if not applicable.
* TODO keep around??
**/
- ToolchainPrivate createDefaultToolchain( );
+ ToolchainPrivate createDefaultToolchain();
}
\ No newline at end of file
Modified: maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java?rev=813314&r1=813313&r2=813314&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-toolchain/src/main/java/org/apache/maven/toolchain/ToolchainPrivate.java Thu Sep 10 08:51:24 2009
@@ -36,8 +36,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