You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/06/02 22:35:16 UTC
svn commit: r781153 - in
/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation:
AbstractStringBasedModelInterpolator.java StringSearchModelInterpolator.java
Author: bentmann
Date: Tue Jun 2 20:35:15 2009
New Revision: 781153
URL: http://svn.apache.org/viewvc?rev=781153&view=rev
Log:
o Polished generics
Modified:
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java?rev=781153&r1=781152&r2=781153&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java Tue Jun 2 20:35:15 2009
@@ -146,18 +146,17 @@
return valueSources;
}
- protected List<InterpolationPostProcessor> createPostProcessors( final Model model, final File projectDir,
- final ModelBuildingRequest config )
+ protected List<? extends InterpolationPostProcessor> createPostProcessors( final Model model,
+ final File projectDir,
+ final ModelBuildingRequest config )
{
- return Collections.singletonList( (InterpolationPostProcessor) new PathTranslatingPostProcessor(
- PROJECT_PREFIXES,
- TRANSLATED_PATH_EXPRESSIONS,
- projectDir,
- pathTranslator ) );
+ return Collections.singletonList( new PathTranslatingPostProcessor( PROJECT_PREFIXES,
+ TRANSLATED_PATH_EXPRESSIONS, projectDir,
+ pathTranslator ) );
}
- protected String interpolateInternal( String src, List<ValueSource> valueSources,
- List<InterpolationPostProcessor> postProcessors )
+ protected String interpolateInternal( String src, List<? extends ValueSource> valueSources,
+ List<? extends InterpolationPostProcessor> postProcessors )
throws ModelInterpolationException
{
if ( src.indexOf( "${" ) < 0 )
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java?rev=781153&r1=781152&r2=781153&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java Tue Jun 2 20:35:15 2009
@@ -60,8 +60,8 @@
{
try
{
- List<ValueSource> valueSources = createValueSources( model, projectDir, config );
- List<InterpolationPostProcessor> postProcessors = createPostProcessors( model, projectDir, config );
+ List<? extends ValueSource> valueSources = createValueSources( model, projectDir, config );
+ List<? extends InterpolationPostProcessor> postProcessors = createPostProcessors( model, projectDir, config );
InterpolateObjectAction action =
new InterpolateObjectAction( obj, valueSources, postProcessors, this );
@@ -92,11 +92,11 @@
private final LinkedList<Object> interpolationTargets;
private final StringSearchModelInterpolator modelInterpolator;
- private final List<ValueSource> valueSources;
- private final List<InterpolationPostProcessor> postProcessors;
+ private final List<? extends ValueSource> valueSources;
+ private final List<? extends InterpolationPostProcessor> postProcessors;
- public InterpolateObjectAction( Object target, List<ValueSource> valueSources,
- List<InterpolationPostProcessor> postProcessors,
+ public InterpolateObjectAction( Object target, List<? extends ValueSource> valueSources,
+ List<? extends InterpolationPostProcessor> postProcessors,
StringSearchModelInterpolator modelInterpolator )
{
this.valueSources = valueSources;