Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code formatting

This commit is contained in:
Hervé Boutemy 2014-06-14 00:08:07 +02:00
parent e112cd89c7
commit 6683e8681f
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
View File

@ -205,14 +205,15 @@ public class DefaultArtifactVersion
private static Integer getNextIntegerToken( StringTokenizer tok ) private static Integer getNextIntegerToken( StringTokenizer tok )
{ {
try { try
{
String s = tok.nextToken(); String s = tok.nextToken();
if ( ( s.length() > 1 ) && s.startsWith( "0" ) ) if ( ( s.length() > 1 ) && s.startsWith( "0" ) )
{ {
throw new NumberFormatException( "Number part has a leading 0: '" + s + "'" ); throw new NumberFormatException( "Number part has a leading 0: '" + s + "'" );
} }
return Integer.valueOf( s ); return Integer.valueOf( s );
} }
catch( NoSuchElementException e ) catch( NoSuchElementException e )
{ {
throw new NumberFormatException( "Number is invalid" ); throw new NumberFormatException( "Number is invalid" );

2
maven-artifact/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java
View File

@ -201,7 +201,7 @@ public class DefaultArtifactVersionTest
} }
catch ( Exception e ) catch ( Exception e )
{ {
assertTrue("We expect a NumberFormatException to be thrown.", e instanceof NumberFormatException); assertTrue( "We expect a NumberFormatException to be thrown.", e instanceof NumberFormatException );
} }
} }

19
maven-compat/src/test/java/org/apache/maven/repository/DefaultMirrorSelectorTest.java
View File

@ -23,13 +23,16 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository; import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.PlexusTestCase;
public class DefaultMirrorSelectorTest extends PlexusTestCase { public class DefaultMirrorSelectorTest
extends PlexusTestCase
{
public void testMirrorWithMirroOfPatternContainingANegationIsNotSelected() { public void testMirrorWithMirroOfPatternContainingANegationIsNotSelected()
ArtifactRepository repository = new DefaultArtifactRepository("snapshots.repo", "http://whatever", null); {
String pattern = "external:*, !snapshots.repo"; ArtifactRepository repository = new DefaultArtifactRepository( "snapshots.repo", "http://whatever", null );
boolean matches = DefaultMirrorSelector.matchPattern(repository, pattern); String pattern = "external:*, !snapshots.repo";
System.out.println(matches); boolean matches = DefaultMirrorSelector.matchPattern( repository, pattern );
assertFalse(matches); System.out.println( matches );
} assertFalse( matches );
}
} }

6
maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
View File

@ -105,8 +105,10 @@ public class DefaultProfileSelector
private boolean isActive( Profile profile, ProfileActivationContext context, ModelProblemCollector problems ) private boolean isActive( Profile profile, ProfileActivationContext context, ModelProblemCollector problems )
{ {
boolean isActive = false; boolean isActive = false;
for ( ProfileActivator activator : activators ) { for ( ProfileActivator activator : activators )
if ( activator.presentInConfig( profile, context, problems ) ) { {
if ( activator.presentInConfig( profile, context, problems ) )
{
isActive = true; isActive = true;
} }
} }