You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/06/11 23:15:54 UTC
svn commit: r1134761 - in /maven/shared/trunk/maven-reporting-impl/src:
main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
Author: hboutemy
Date: Sat Jun 11 21:15:54 2011
New Revision: 1134761
URL: http://svn.apache.org/viewvc?rev=1134761&view=rev
Log:
added Java 5 generics
Modified:
maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
Modified: maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java?rev=1134761&r1=1134760&r2=1134761&view=diff
==============================================================================
--- maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java (original)
+++ maven/shared/trunk/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java Sat Jun 11 21:15:54 2011
@@ -31,6 +31,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Properties;
/**
@@ -507,7 +508,7 @@ public abstract class AbstractMavenRepor
}
else
{
- List segments = applyPattern( text );
+ List<String> segments = applyPattern( text );
if ( segments == null )
{
@@ -515,10 +516,10 @@ public abstract class AbstractMavenRepor
}
else
{
- for ( Iterator it = segments.iterator(); it.hasNext(); )
+ for ( Iterator<String> it = segments.iterator(); it.hasNext(); )
{
- String name = (String) it.next();
- String href = (String) it.next();
+ String name = it.next();
+ String href = it.next();
if ( href == null )
{
@@ -580,16 +581,14 @@ public abstract class AbstractMavenRepor
StringBuilder sb = new StringBuilder();
- for ( Iterator i = props.keySet().iterator(); i.hasNext(); )
+ for ( Map.Entry<?, ?> entry : props.entrySet() )
{
- String key = (String) i.next();
-
if ( sb.length() > 0 )
{
sb.append( ", " );
}
- sb.append( key ).append( "=" ).append( props.get( key ) );
+ sb.append( entry.getKey() ).append( "=" ).append( entry.getValue() );
}
return sb.toString();
@@ -618,10 +617,10 @@ public abstract class AbstractMavenRepor
String[] schemes = {"http", "https"};
UrlValidator urlValidator = new UrlValidator( schemes );
+ EmailValidator emailValidator = EmailValidator.getInstance();
- if ( ( EmailValidator.getInstance().isValid( href ) )
- || ( ( href.indexOf( "?" ) != -1 )
- && ( EmailValidator.getInstance().isValid( href.substring( 0, href.indexOf( "?" ) ) ) ) ) )
+ if ( emailValidator.isValid( href )
+ || ( href.contains( "?" ) && emailValidator.isValid( href.substring( 0, href.indexOf( "?" ) ) ) ) )
{
return "mailto:" + href;
}
@@ -671,7 +670,7 @@ public abstract class AbstractMavenRepor
* @param text a text with or without the pattern <code>{text, url}</code>
* @return a map of text/href
*/
- private static List applyPattern( String text )
+ private static List<String> applyPattern( String text )
{
if ( StringUtils.isEmpty( text ) )
{
@@ -680,7 +679,7 @@ public abstract class AbstractMavenRepor
// Map defined by key/value name/href
// If href == null, it means
- List segments = new ArrayList();
+ List<String> segments = new ArrayList<String>();
// TODO Special case http://jira.codehaus.org/browse/MEV-40
if ( text.indexOf( "${" ) != -1 )
@@ -775,9 +774,9 @@ public abstract class AbstractMavenRepor
}
}
- if ( !StringUtils.isEmpty( text.substring( lastOffset, text.length() ) ) )
+ if ( !StringUtils.isEmpty( text.substring( lastOffset ) ) )
{
- segments.add( text.substring( lastOffset, text.length() ) );
+ segments.add( text.substring( lastOffset ) );
segments.add( null );
}
Modified: maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java?rev=1134761&r1=1134760&r2=1134761&view=diff
==============================================================================
--- maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java (original)
+++ maven/shared/trunk/maven-reporting-impl/src/test/java/org/apache/maven/reporting/AbstractMavenReportRendererTest.java Sat Jun 11 21:15:54 2011
@@ -29,23 +29,25 @@ import junitx.util.PrivateAccessor;
/**
* Test case for some public method in AbstractMavenReportRenderer.
*/
-public class AbstractMavenReportRendererTest extends TestCase
+public class AbstractMavenReportRendererTest
+ extends TestCase
{
- private static List applyPattern( String pattern ) throws Throwable
+ private static List<String> applyPattern( String pattern )
+ throws Throwable
{
- return (List) PrivateAccessor.invoke( AbstractMavenReportRenderer.class, "applyPattern",
- new Class[] { String.class }, new Object[] { pattern } );
+ return (List<String>) PrivateAccessor.invoke( AbstractMavenReportRenderer.class, "applyPattern",
+ new Class[] { String.class }, new Object[] { pattern } );
}
private static void checkPattern( String pattern, String[] expectedResult ) throws Throwable
{
- List result = applyPattern( pattern );
+ List<String> result = applyPattern( pattern );
Assert.assertEquals( "result size", expectedResult.length, result.size() );
int i = 0;
- for ( Iterator it = result.iterator(); it.hasNext(); )
+ for ( Iterator<String> it = result.iterator(); it.hasNext(); )
{
- String name = (String) it.next();
- String href = (String) it.next();
+ String name = it.next();
+ String href = it.next();
Assert.assertEquals( expectedResult[i], name );
Assert.assertEquals( expectedResult[i + 1], href );
i += 2;