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

o Removed unused methods/params 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@1376648 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kristian Rosenvold 2012-08-23 18:55:46 +00:00
parent 100bbd031b
commit b6c679a127
1 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
View File

@ -51,7 +51,7 @@ public class StringSearchModelInterpolator
private static final Map<Class<?>, InterpolateObjectAction.CacheItem> cachedEntries =
new ConcurrentHashMap<Class<?>, InterpolateObjectAction.CacheItem>( 80, 0.75f, 2 );
// Empirical data from 3.x, actual =40
// Empirical data from 3.x, actual =40
public Model interpolateModel( Model model, File projectDir, ModelBuildingRequest config,
@ -152,7 +152,7 @@ private void traverseObjectWithParents( Class<?> cls, Object target )
}
else if ( cacheEntry.isQualifiedForInterpolation )
{
cacheEntry.interpolate( target, problems, this );
cacheEntry.interpolate( target, this );
traverseObjectWithParents( cls.getSuperclass(), target );
}
@ -170,26 +170,6 @@ private CacheItem getCacheEntry( Class<?> cls )
return cacheItem;
}
private boolean isQualifiedForInterpolation( Class<?> cls )
{
return !cls.getName().startsWith( "java" );
}
private boolean isQualifiedForInterpolation( Field field, Class<?> fieldType )
{
if ( Map.class.equals( fieldType ) && "locations".equals( field.getName() ) )
{
return false;
}
if ( fieldType.isPrimitive() )
{
return false;
}
return !"parent".equals( field.getName() );
}
private static void evaluateArray( Object target, InterpolateObjectAction ctx )
{
int len = Array.getLength( target );
@ -235,6 +215,7 @@ private boolean isQualifiedForInterpolation( Field field, Class<?> fieldType )
return false;
}
//noinspection SimplifiableIfStatement
if ( fieldType.isPrimitive() )
{
return false;
@ -279,12 +260,11 @@ else if ( Map.class.isAssignableFrom( type ) )
}
public void interpolate( Object target, ModelProblemCollector problems,
InterpolateObjectAction interpolateObjectAction )
public void interpolate( Object target, InterpolateObjectAction interpolateObjectAction )
{
for ( CacheField field : fields )
{
field.interpolate( target, problems, interpolateObjectAction );
field.interpolate( target, interpolateObjectAction );
}
}
@ -303,8 +283,7 @@ static abstract class CacheField
this.field = field;
}
void interpolate( Object target, ModelProblemCollector problems,
InterpolateObjectAction interpolateObjectAction )
void interpolate( Object target, InterpolateObjectAction interpolateObjectAction )
{
synchronized ( field )
{
@ -470,9 +449,8 @@ void doInterpolate( Object target, InterpolateObjectAction ctx )
{
entry.setValue( interpolated );
}
catch ( UnsupportedOperationException e )
catch ( UnsupportedOperationException ignore )
{
continue;
}
}
}