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 15:50:05 UTC
svn commit: r1098302 - in /maven/plugins/trunk/maven-changes-plugin/src:
main/java/org/apache/maven/plugin/jira/
test/java/org/apache/maven/plugin/jira/
Author: dennisl
Date: Sun May 1 13:50:05 2011
New Revision: 1098302
URL: http://svn.apache.org/viewvc?rev=1098302&view=rev
Log:
[MCHANGES-210] Update to Java 5
- Start using generics in AbstractJiraDownloader and JiraHelper
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraHelperTestCase.java
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java?rev=1098302&r1=1098301&r2=1098302&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/AbstractJiraDownloader.java Sun May 1 13:50:05 2011
@@ -102,13 +102,13 @@ public abstract class AbstractJiraDownlo
/** The maven settings. */
private Settings settings;
/** Mapping containing all allowed JIRA status values. */
- protected final Map statusMap = new HashMap( 8 );
+ protected final Map<String,String> statusMap = new HashMap<String,String>( 8 );
/** Mapping containing all allowed JIRA resolution values. */
- protected final Map resolutionMap = new HashMap( 8 );
+ protected final Map<String,String> resolutionMap = new HashMap<String,String>( 8 );
/** Mapping containing all allowed JIRA priority values. */
- protected final Map priorityMap = new HashMap( 8 );
+ protected final Map<String,String> priorityMap = new HashMap<String,String>( 8 );
/** Mapping containing all allowed JIRA type values. */
- protected final Map typeMap = new HashMap( 8 );
+ protected final Map<String,String> typeMap = new HashMap<String,String>( 8 );
/** The pattern used to parse dates from the JIRA xml file. */
private String jiraDatePattern;
@@ -148,7 +148,7 @@ public abstract class AbstractJiraDownlo
for ( int i = 0; i < stats.length; i++ )
{
- String statusParam = (String) statusMap.get( stats[i] );
+ String statusParam = statusMap.get( stats[i] );
if ( statusParam != null )
{
@@ -164,7 +164,7 @@ public abstract class AbstractJiraDownlo
for ( int i = 0; i < prios.length; i++ )
{
- String priorityParam = (String) priorityMap.get( prios[i] );
+ String priorityParam = priorityMap.get( prios[i] );
if ( priorityParam != null )
{
@@ -180,7 +180,7 @@ public abstract class AbstractJiraDownlo
for ( int i = 0; i < resos.length; i++ )
{
- String resoParam = (String) resolutionMap.get( resos[i] );
+ String resoParam = resolutionMap.get( resos[i] );
if ( resoParam != null )
{
@@ -210,7 +210,7 @@ public abstract class AbstractJiraDownlo
for ( int i = 0; i < types.length; i++ )
{
- String typeParam = (String) typeMap.get( types[i].trim() );
+ String typeParam = typeMap.get( types[i].trim() );
if ( typeParam != null )
{
@@ -345,12 +345,12 @@ public abstract class AbstractJiraDownlo
client.setState( state );
- Map urlMap = JiraHelper.getJiraUrlAndProjectId( project.getIssueManagement().getUrl() );
+ Map<String,String> urlMap = JiraHelper.getJiraUrlAndProjectId( project.getIssueManagement().getUrl() );
- String jiraUrl = (String) urlMap.get( "url" );
+ String jiraUrl = urlMap.get( "url" );
getLog().debug( "JIRA lives at: " + jiraUrl );
- String jiraId = (String) urlMap.get( "id" );
+ String jiraId = urlMap.get( "id" );
determineProxy( jiraUrl, client );
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java?rev=1098302&r1=1098301&r2=1098302&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java Sun May 1 13:50:05 2011
@@ -47,7 +47,7 @@ public class JiraHelper
* @param issueManagementUrl The URL to the issue management system
* @return A <code>Map</code> containing the URL and project id
*/
- static Map getJiraUrlAndProjectId( String issueManagementUrl )
+ static Map<String,String> getJiraUrlAndProjectId( String issueManagementUrl )
{
String url = issueManagementUrl;
@@ -87,7 +87,7 @@ public class JiraHelper
}
}
- HashMap urlMap = new HashMap( 4 );
+ HashMap<String,String> urlMap = new HashMap<String,String>( 4 );
urlMap.put( "url", jiraUrl );
Modified: maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraHelperTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraHelperTestCase.java?rev=1098302&r1=1098301&r2=1098302&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraHelperTestCase.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/jira/JiraHelperTestCase.java Sun May 1 13:50:05 2011
@@ -35,7 +35,7 @@ public class JiraHelperTestCase
{
public void testGetJiraUrlAndProjectId()
{
- Map map;
+ Map<String,String> map;
map = JiraHelper.getJiraUrlAndProjectId( "http://jira.codehaus.org/browse/DOXIA" );
assertEquals( "http://jira.codehaus.org", map.get( "url" ) );