You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2011/05/01 16:01:11 UTC
svn commit: r1098305 - in
/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin:
issues/IssuesReportHelper.java jira/JiraMojo.java trac/TracMojo.java
Author: dennisl
Date: Sun May 1 14:01:11 2011
New Revision: 1098305
URL: http://svn.apache.org/viewvc?rev=1098305&view=rev
Log:
[MCHANGES-210] Update to Java 5
- Start using generics in JiraMojo, IssuseReportHelper and TracMojo
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java?rev=1098305&r1=1098304&r2=1098305&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java Sun May 1 14:01:11 2011
@@ -71,7 +71,7 @@ public class IssuesReportHelper
* @param allColumns A mapping from column name to column id
* @return A List of column id:s
*/
- public static List getColumnIds( String columnNames, Map allColumns )
+ public static List<Integer> getColumnIds( String columnNames, Map<String,Integer> allColumns )
{
return getColumnIds( columnNames, allColumns, null, null );
}
@@ -88,10 +88,11 @@ public class IssuesReportHelper
* @param log A log
* @return A List of column id:s
*/
- public static List getColumnIds( String columnNames, Map allColumns, Map deprecatedColumns, Log log )
+ public static List<Integer> getColumnIds( String columnNames, Map<String,Integer> allColumns,
+ Map<String,Integer> deprecatedColumns, Log log )
{
DualHashBidiMap bidiColumns = null;
- List columnIds = new ArrayList();
+ List<Integer> columnIds = new ArrayList<Integer>();
String[] columnNamesArray = columnNames.split( "," );
if ( deprecatedColumns != null )
@@ -105,11 +106,11 @@ public class IssuesReportHelper
String columnName = columnNamesArray[i].trim();
if ( allColumns.containsKey( columnName ) )
{
- columnIds.add( (Integer) allColumns.get( columnName ) );
+ columnIds.add( allColumns.get( columnName ) );
}
else if ( deprecatedColumns != null && deprecatedColumns.containsKey( columnName ) )
{
- Integer columnId = (Integer) deprecatedColumns.get( columnName );
+ Integer columnId = deprecatedColumns.get( columnName );
columnIds.add( columnId );
if ( log != null )
{
@@ -152,12 +153,12 @@ public class IssuesReportHelper
* @param list The List to convert
* @return An in array
*/
- public static int[] toIntArray( List list )
+ public static int[] toIntArray( List<Integer> list )
{
int[] intArray = new int[list.size()];
for ( int j = 0; j < intArray.length; j++ )
{
- intArray[j] = ( (Integer) list.get( j ) ).intValue();
+ intArray[j] = ( list.get( j ) ).intValue();
}
return intArray;
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java?rev=1098305&r1=1098304&r2=1098305&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java Sun May 1 14:01:11 2011
@@ -50,7 +50,7 @@ public class JiraMojo
/**
* Valid JIRA columns.
*/
- private static final Map JIRA_COLUMNS = new HashMap( 16 );
+ private static final Map<String,Integer> JIRA_COLUMNS = new HashMap<String,Integer>( 16 );
static
{
@@ -302,7 +302,7 @@ public class JiraMojo
throws MavenReportException
{
// Validate parameters
- List columnIds = IssuesReportHelper.getColumnIds( columnNames, JIRA_COLUMNS );
+ List<Integer> columnIds = IssuesReportHelper.getColumnIds( columnNames, JIRA_COLUMNS );
if ( columnIds.isEmpty() )
{
// This can happen if the user has configured column names and they are all invalid
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java?rev=1098305&r1=1098304&r2=1098305&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/trac/TracMojo.java Sun May 1 14:01:11 2011
@@ -49,12 +49,12 @@ public class TracMojo
/**
* Deprecated Trac columns.
*/
- private static Map DEPRECATED_TRAC_COLUMNS = new HashMap();
+ private static Map<String,Integer> DEPRECATED_TRAC_COLUMNS = new HashMap<String,Integer>();
/**
* Valid Trac columns.
*/
- private static Map TRAC_COLUMNS = new HashMap();
+ private static Map<String,Integer> TRAC_COLUMNS = new HashMap<String,Integer>();
static
{
@@ -141,8 +141,8 @@ public class TracMojo
throws MavenReportException
{
// Validate parameters
- List columnIds = IssuesReportHelper.getColumnIds( columnNames, TRAC_COLUMNS, DEPRECATED_TRAC_COLUMNS,
- getLog() );
+ List<Integer> columnIds = IssuesReportHelper.getColumnIds( columnNames, TRAC_COLUMNS, DEPRECATED_TRAC_COLUMNS,
+ getLog() );
if ( columnIds.size() == 0 )
{
// This can happen if the user has configured column names and they are all invalid