Author: bentmann
Date: Mon Mar 15 19:35:10 2010
New Revision: 923402
URL: http://svn.apache.org/viewvc?rev=923402&view=rev
Log:
o Polished code
Modified:
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
Modified:
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java?rev=923402&r1=923401&r2=923402&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java
(original)
+++
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/AbstractModelInterpolatorTest.java
Mon Mar 15 19:35:10 2010
@@ -424,15 +424,15 @@ public void testBasedir()
assertColllectorState( 0, 0, 2, collector );
- List outResources = out.getBuild().getResources();
- Iterator resIt = outResources.iterator();
+ List<Resource> outResources = out.getBuild().getResources();
+ Iterator<Resource> resIt = outResources.iterator();
- assertEquals( build.getSourceDirectory(), ( (Resource) resIt.next()
).getDirectory() );
- assertEquals( build.getSourceDirectory(), ( (Resource) resIt.next()
).getDirectory() );
- assertEquals( build.getSourceDirectory(), ( (Resource) resIt.next()
).getDirectory() );
+ assertEquals( build.getSourceDirectory(), resIt.next().getDirectory()
);
+ assertEquals( build.getSourceDirectory(), resIt.next().getDirectory()
);
+ assertEquals( build.getSourceDirectory(), resIt.next().getDirectory()
);
}
-public void testShouldInterpolateUnprefixedBasedirExpression()
+ public void testShouldInterpolateUnprefixedBasedirExpression()
throws Exception
{
File basedir = new File( "/test/path" );
@@ -449,11 +449,11 @@ public void testShouldInterpolateUnprefi
assertProblemFree( collector );
- List rDeps = result.getDependencies();
+ List<Dependency> rDeps = result.getDependencies();
assertNotNull( rDeps );
assertEquals( 1, rDeps.size() );
- assertEquals( new File( basedir, "artifact.jar" ).getAbsolutePath(),
new File( ( (Dependency) rDeps.get( 0 ) )
- .getSystemPath() ).getAbsolutePath() );
+ assertEquals( new File( basedir, "artifact.jar" ).getAbsolutePath(),
+ new File( rDeps.get( 0 ).getSystemPath()
).getAbsolutePath() );
}
protected abstract ModelInterpolator createInterpolator( PathTranslator
translator )
Modified:
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java?rev=923402&r1=923401&r2=923402&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
(original)
+++
maven/maven-3/trunk/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
Mon Mar 15 19:35:10 2010
@@ -298,7 +298,7 @@ public class StringSearchModelInterpolat
p.setProperty( "key", "value" );
p.setProperty( "key2", "value2" );
- Map values = Collections.unmodifiableMap( Collections.singletonMap(
"key", "${key}" ) );
+ Map<String, String> values = Collections.unmodifiableMap(
Collections.singletonMap( "key", "${key}" ) );
ObjectWithMapField obj = new ObjectWithMapField( values );
@@ -394,10 +394,10 @@ public class StringSearchModelInterpolat
values.add( new String[] { "${key}", "${key2}" } );
values.add( new String[] { "${key3}", "${key4}" } );
- List values2 = new ArrayList();
+ List<String> values2 = new ArrayList<String>();
values.add( new String[] { "${key}", "${key2}" } );
values.add( new String[] { "${key3}", "${key4}" } );
- List values3 = new ArrayList();
+ List<String> values3 = new ArrayList<String>();
values.add( new String[] { "${key}", "${key2}" } );
values.add( new String[] { "${key3}", "${key4}" } );
@@ -417,9 +417,9 @@ public class StringSearchModelInterpolat
private static final class ObjectWithListField
{
- private final List values;
+ private final List<?> values;
- public ObjectWithListField( List values )
+ public ObjectWithListField( List<?> values )
{
this.values = values;
}
@@ -427,29 +427,29 @@ public class StringSearchModelInterpolat
private static final class ObjectWithMapField
{
- private final Map values;
+ private final Map<?, ?> values;
- public ObjectWithMapField( Map values )
+ public ObjectWithMapField( Map<?, ?> values )
{
this.values = values;
}
}
- @SuppressWarnings({"UnusedDeclaration"})
+ @SuppressWarnings({"UnusedDeclaration", "unused"})
private static final class ObjectWithMixedProtection
{
- private List values1;
- protected List values2;
- List values3;
+ private List<?> values1;
+ protected List<?> values2;
+ List<?> values3;
private String fooBar;
- private ObjectWithMixedProtection(List values1, List values2, List
values3) {
+ private ObjectWithMixedProtection(List<?> values1, List<?> values2,
List<?> values3) {
this.values1 = values1;
this.values2 = values2;
this.values3 = values3;
}
- private ObjectWithMixedProtection( List values1, List values2, List
values3, String fooBar )
+ private ObjectWithMixedProtection( List<?> values1, List<?> values2,
List<?> values3, String fooBar )
{
this.values1 = values1;
this.values2 = values2;
