Author: krosenvold
Date: Thu Nov 13 16:29:51 2014
New Revision: 1639381
URL: http://svn.apache.org/r1639381
Log:
Language level fixes
Modified:
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java
Modified:
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java?rev=1639381&r1=1639380&r2=1639381&view=diff
==============================================================================
---
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java
(original)
+++
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/AbstractStrictPatternArtifactFilter.java
Thu Nov 13 16:29:51 2014
@@ -154,7 +154,7 @@ public abstract class AbstractStrictPatt
{
String contains = pattern.substring( 1, pattern.length() - 1 );
- matches = ( token.indexOf( contains ) != -1 );
+ matches = ( token.contains( contains ) );
}
// support leading wildcard
else if ( pattern.startsWith( "*" ) )
Modified:
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java?rev=1639381&r1=1639380&r2=1639381&view=diff
==============================================================================
---
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java
(original)
+++
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/PatternIncludesArtifactFilter.java
Thu Nov 13 16:29:51 2014
@@ -110,7 +110,7 @@ public class PatternIncludesArtifactFilt
}
else
{
- return Boolean.valueOf( match( artifact, negativePatterns ) );
+ return match( artifact, negativePatterns );
}
}
@@ -122,7 +122,7 @@ public class PatternIncludesArtifactFilt
}
else
{
- return Boolean.valueOf( match( artifact, positivePatterns ) );
+ return match( artifact, positivePatterns );
}
}
@@ -199,7 +199,7 @@ public class PatternIncludesArtifactFilt
return true;
}
- if ( regionMatch && value.indexOf( pattern ) > -1 )
+ if ( regionMatch && value.contains( pattern ) )
{
patternsTriggered.add( pattern );
return true;
@@ -231,7 +231,7 @@ public class PatternIncludesArtifactFilt
{
final String contains = pattern.substring( 1, pattern.length() - 1
);
- matches = ( token.indexOf( contains ) != -1 );
+ matches = ( token.contains( contains ) );
}
// support leading wildcard
else if ( pattern.startsWith( "*" ) )
@@ -307,7 +307,7 @@ public class PatternIncludesArtifactFilt
if ( !missed.isEmpty() && logger.isWarnEnabled() )
{
- final StringBuffer buffer = new StringBuffer();
+ final StringBuilder buffer = new StringBuilder();
buffer.append( "The following patterns were never triggered in
this " );
buffer.append( getFilterDescription() );
@@ -333,7 +333,7 @@ public class PatternIncludesArtifactFilt
protected String getPatternsAsString()
{
- final StringBuffer buffer = new StringBuffer();
+ final StringBuilder buffer = new StringBuilder();
for ( String pattern : positivePatterns )
{
buffer.append( "\no \'" ).append( pattern ).append( "\'" );
@@ -351,8 +351,8 @@ public class PatternIncludesArtifactFilt
{
if ( !filteredArtifactIds.isEmpty() && logger.isDebugEnabled() )
{
- final StringBuffer buffer =
- new StringBuffer( "The following artifacts were removed by
this " + getFilterDescription() + ": " );
+ final StringBuilder buffer =
+ new StringBuilder( "The following artifacts were removed by
this " + getFilterDescription() + ": " );
for ( String artifactId : filteredArtifactIds )
{
Modified:
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java?rev=1639381&r1=1639380&r2=1639381&view=diff
==============================================================================
---
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java
(original)
+++
maven/shared/trunk/maven-common-artifact-filters/src/main/java/org/apache/maven/shared/artifact/filter/ScopeArtifactFilter.java
Thu Nov 13 16:29:51 2014
@@ -171,7 +171,7 @@ public class ScopeArtifactFilter
{
if ( !filteredArtifactIds.isEmpty() && logger.isDebugEnabled() )
{
- StringBuffer buffer = new StringBuffer( "The following artifacts
were removed by this filter: " );
+ StringBuilder buffer = new StringBuilder( "The following artifacts
were removed by this filter: " );
for ( String artifactId : filteredArtifactIds )
{
@@ -186,7 +186,7 @@ public class ScopeArtifactFilter
{
if ( logger.isDebugEnabled() )
{
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
boolean report = false;
if ( !nullScopeHit )
