Oh, look at that button. Does that convert everything to correct java5 ??
<3 IntelliJ Idea. Don't leave home without it !
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1517354 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java b/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
index 531cf23..2935abe 100644
--- a/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
+++ b/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMailMojo.java
@@ -266,33 +266,27 @@
mailMsg.setContentType( this.mailContentType );
mailMsg.setFrom( fromAddress, fromName );
- final Iterator it = getToAddresses().iterator();
- while ( it.hasNext() )
- {
- email = it.next().toString();
- getLog().info( "Sending mail to " + email + "..." );
- mailMsg.addTo( email, "" );
+ for (Object o1 : getToAddresses()) {
+ email = o1.toString();
+ getLog().info("Sending mail to " + email + "...");
+ mailMsg.addTo(email, "");
}
if ( getCcAddresses() != null )
{
- final Iterator it2 = getCcAddresses().iterator();
- while ( it2.hasNext() )
- {
- email = it2.next().toString();
- getLog().info( "Sending cc mail to " + email + "..." );
- mailMsg.addCc( email, "" );
+ for (Object o : getCcAddresses()) {
+ email = o.toString();
+ getLog().info("Sending cc mail to " + email + "...");
+ mailMsg.addCc(email, "");
}
}
if ( getBccAddresses() != null )
{
- final Iterator it3 = getBccAddresses().iterator();
- while ( it3.hasNext() )
- {
- email = it3.next().toString();
- getLog().info( "Sending bcc mail to " + email + "..." );
- mailMsg.addBcc( email, "" );
+ for (Object o : getBccAddresses()) {
+ email = o.toString();
+ getLog().info("Sending bcc mail to " + email + "...");
+ mailMsg.addBcc(email, "");
}
}
@@ -375,14 +369,11 @@
}
else
{
- final Iterator it = from.iterator();
- while ( it.hasNext() )
- {
- Developer developer = (Developer) it.next();
+ for (Object aFrom : from) {
+ Developer developer = (Developer) aFrom;
- if ( fromDeveloperId.equals( developer.getId() ) )
- {
- return new MailSender( developer.getName(), developer.getEmail() );
+ if (fromDeveloperId.equals(developer.getId())) {
+ return new MailSender(developer.getName(), developer.getEmail());
}
}
throw new MojoExecutionException(
diff --git a/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java b/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java
index a30ef69..9c72b68 100644
--- a/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java
+++ b/src/main/java/org/apache/maven/plugin/announcement/mailsender/ProjectJavamailMailSender.java
@@ -106,13 +106,12 @@
}
if ( userProperties != null )
{
- for ( Iterator i = userProperties.keySet().iterator(); i.hasNext(); )
- {
- String key = (String) i.next();
+ for (Object o : userProperties.keySet()) {
+ String key = (String) o;
- String value = userProperties.getProperty( key );
+ String value = userProperties.getProperty(key);
- props.put( key, value );
+ props.put(key, value);
}
}
}
@@ -153,10 +152,9 @@
{
InternetAddress[] addressTo = new InternetAddress[mail.getToAddresses().size()];
int count = 0;
- for ( Iterator i = mail.getToAddresses().iterator(); i.hasNext(); )
- {
- String address = ( (MailMessage.Address) i.next() ).getRfc2822Address();
- addressTo[count++] = new InternetAddress( address );
+ for (Object o : mail.getToAddresses()) {
+ String address = ((MailMessage.Address) o).getRfc2822Address();
+ addressTo[count++] = new InternetAddress(address);
}
msg.setRecipients( Message.RecipientType.TO, addressTo );
}
@@ -165,10 +163,9 @@
{
InternetAddress[] addressCc = new InternetAddress[mail.getCcAddresses().size()];
int count = 0;
- for ( Iterator i = mail.getCcAddresses().iterator(); i.hasNext(); )
- {
- String address = ( (MailMessage.Address) i.next() ).getRfc2822Address();
- addressCc[count++] = new InternetAddress( address );
+ for (Object o : mail.getCcAddresses()) {
+ String address = ((MailMessage.Address) o).getRfc2822Address();
+ addressCc[count++] = new InternetAddress(address);
}
msg.setRecipients( Message.RecipientType.CC, addressCc );
}
@@ -177,10 +174,9 @@
{
InternetAddress[] addressBcc = new InternetAddress[mail.getBccAddresses().size()];
int count = 0;
- for ( Iterator i = mail.getBccAddresses().iterator(); i.hasNext(); )
- {
- String address = ( (MailMessage.Address) i.next() ).getRfc2822Address();
- addressBcc[count++] = new InternetAddress( address );
+ for (Object o : mail.getBccAddresses()) {
+ String address = ((MailMessage.Address) o).getRfc2822Address();
+ addressBcc[count++] = new InternetAddress(address);
}
msg.setRecipients( Message.RecipientType.BCC, addressBcc );
}
diff --git a/src/main/java/org/apache/maven/plugin/changes/AbstractChangesMojo.java b/src/main/java/org/apache/maven/plugin/changes/AbstractChangesMojo.java
index ee07bd1..bc738d7 100644
--- a/src/main/java/org/apache/maven/plugin/changes/AbstractChangesMojo.java
+++ b/src/main/java/org/apache/maven/plugin/changes/AbstractChangesMojo.java
@@ -69,7 +69,7 @@
{
getLog().debug( "Root Folder:" + mavenSession.getExecutionRootDirectory() );
getLog().debug( "Current Folder:" + basedir );
- boolean result = mavenSession.getExecutionRootDirectory().equalsIgnoreCase( basedir.toString() );
+ boolean result = mavenSession.getExecutionRootDirectory().equalsIgnoreCase(basedir);
if ( result )
{
getLog().debug( "This is the execution root." );
diff --git a/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java b/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
index a2903cd..131415b 100644
--- a/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
+++ b/src/main/java/org/apache/maven/plugin/changes/ChangesMojo.java
@@ -266,14 +266,12 @@
final String relativePath = absolutePath.substring( basePath.length() );
List releaseList = changesXml.getReleaseList();
- for ( Iterator iterator = project.getCollectedProjects().iterator(); iterator.hasNext(); )
- {
- final MavenProject childProject = (MavenProject) iterator.next();
- final File changesFile = new File( childProject.getBasedir(), relativePath );
- final ChangesXML childXml = getChangesFromFile( changesFile, childProject, additionalProperties );
- if ( childXml != null )
- {
- releaseList = releaseUtils.mergeReleases( releaseList, childProject.getName(), childXml.getReleaseList() );
+ for (Object o : project.getCollectedProjects()) {
+ final MavenProject childProject = (MavenProject) o;
+ final File changesFile = new File(childProject.getBasedir(), relativePath);
+ final ChangesXML childXml = getChangesFromFile(changesFile, childProject, additionalProperties);
+ if (childXml != null) {
+ releaseList = releaseUtils.mergeReleases(releaseList, childProject.getName(), childXml.getReleaseList());
}
}
changesXml.setReleaseList( releaseList );
@@ -462,10 +460,9 @@
try
{
getLog().debug( "Copying static resources." );
- for ( int i = 0; i < resourceNames.length; i++ )
- {
- URL url = this.getClass().getClassLoader().getResource( pluginResourcesBase + "/" + resourceNames[i] );
- FileUtils.copyURLToFile( url, new File( getReportOutputDirectory(), resourceNames[i] ) );
+ for (String resourceName : resourceNames) {
+ URL url = this.getClass().getClassLoader().getResource(pluginResourcesBase + "/" + resourceName);
+ FileUtils.copyURLToFile(url, new File(getReportOutputDirectory(), resourceName));
}
}
catch ( IOException e )
@@ -494,11 +491,9 @@
}
else
{
- Iterator iterator = issueLinkTemplatePerSystem.entrySet().iterator();
- while ( iterator.hasNext() )
- {
- Map.Entry entry = (Map.Entry) iterator.next();
- getLog().debug( "issueLinkTemplatePerSystem[" + entry.getKey() + "] = " + entry.getValue() );
+ for (Object o : issueLinkTemplatePerSystem.entrySet()) {
+ Map.Entry entry = (Map.Entry) o;
+ getLog().debug("issueLinkTemplatePerSystem[" + entry.getKey() + "] = " + entry.getValue());
}
}
}
diff --git a/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java b/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
index d13a18a..2886859 100644
--- a/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
+++ b/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
@@ -205,7 +205,7 @@
}
// If the %URL% token is used then the issue management system URL must be set.
- if ( issueLink.indexOf( URL_TOKEN ) >= 0 && StringUtils.isBlank( getUrl() ) )
+ if (issueLink.contains(URL_TOKEN) && StringUtils.isBlank( getUrl() ) )
{
return false;
}
@@ -328,10 +328,9 @@
namesEmailMap.put(action.getDueTo(), action.getDueToEmail());
}
- for ( Iterator iterator = dueTos.iterator(); iterator.hasNext(); )
- {
- DueTo dueTo = (DueTo) iterator.next();
- namesEmailMap.put( dueTo.getName(), dueTo.getEmail() );
+ for (Object dueTo1 : dueTos) {
+ DueTo dueTo = (DueTo) dueTo1;
+ namesEmailMap.put(dueTo.getName(), dueTo.getEmail());
}
if ( namesEmailMap.isEmpty() )
@@ -464,17 +463,16 @@
sink.tableRow_();
- for ( int idx = 0; idx < releaseList.size(); idx++ )
- {
- Release release = (Release) releaseList.get( idx );
+ for (Object aReleaseList : releaseList) {
+ Release release = (Release) aReleaseList;
sink.tableRow();
- sinkCellLink( sink, release.getVersion(), "#" + HtmlTools.encodeId( release.getVersion() ) );
+ sinkCellLink(sink, release.getVersion(), "#" + HtmlTools.encodeId(release.getVersion()));
- sinkCell( sink, release.getDateRelease() );
+ sinkCell(sink, release.getDateRelease());
- sinkCell( sink, release.getDescription() );
+ sinkCell(sink, release.getDescription());
sink.tableRow_();
}
@@ -505,10 +503,9 @@
*/
private void constructReleases( Sink sink, ResourceBundle bundle, List releaseList )
{
- for ( int idx = 0; idx < releaseList.size(); idx++ )
- {
- Release release = (Release) releaseList.get(idx);
- constructRelease( sink, bundle, release );
+ for (Object aReleaseList : releaseList) {
+ Release release = (Release) aReleaseList;
+ constructRelease(sink, bundle, release);
}
}
@@ -642,7 +639,7 @@
String parseLink;
String issueLink = (String) this.issueLinksPerSystem.get( system );
parseLink = issueLink.replaceFirst( ISSUE_TOKEN, issue );
- if ( parseLink.indexOf( URL_TOKEN ) >= 0 )
+ if (parseLink.contains(URL_TOKEN))
{
String url = this.url.substring( 0, this.url.lastIndexOf( "/" ) );
parseLink = parseLink.replaceFirst( URL_TOKEN, url );
diff --git a/src/main/java/org/apache/maven/plugin/changes/IssueAdapter.java b/src/main/java/org/apache/maven/plugin/changes/IssueAdapter.java
index 2d3d668..c8042ec 100644
--- a/src/main/java/org/apache/maven/plugin/changes/IssueAdapter.java
+++ b/src/main/java/org/apache/maven/plugin/changes/IssueAdapter.java
@@ -117,7 +117,7 @@
action.setIssue( issue.getKey() );
// Try to map the IMS-specific issue type to one that is used in a changes.xml file
- IssueType type = null;
+ IssueType type;
if ( getIssueTypeMap().containsKey( issue.getType() ) )
{
type = getIssueTypeMap().get( issue.getType() );
diff --git a/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java b/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java
index 8b46ccc..5d879ea 100644
--- a/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java
+++ b/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java
@@ -192,10 +192,9 @@
// Loop through the List of releases from changes.xml and casting each
// release to a Release
- for ( Iterator iterator = changesReleases.iterator(); iterator.hasNext(); )
- {
- Release release = (Release) iterator.next();
- releases.add( release );
+ for (Object changesRelease : changesReleases) {
+ Release release = (Release) changesRelease;
+ releases.add(release);
}
return releases;
}
@@ -225,28 +224,25 @@
if ( releases != null )
{
- for ( Iterator iterator = releases.iterator(); iterator.hasNext(); )
- {
- final Release release = (Release) iterator.next();
- final Release componentRelease = getRelease( componentReleases, release.getVersion() );
- if ( componentRelease != null ) {
- release.addComponent( componentName, componentRelease );
+ for (Object release1 : releases) {
+ final Release release = (Release) release1;
+ final Release componentRelease = getRelease(componentReleases, release.getVersion());
+ if (componentRelease != null) {
+ release.addComponent(componentName, componentRelease);
}
- mergedReleases.add( release );
+ mergedReleases.add(release);
}
}
- for ( Iterator iterator = componentReleases.iterator(); iterator.hasNext(); )
- {
- final Release release = (Release) iterator.next();
- final Release mergedRelease = getRelease( mergedReleases, release.getVersion() );
- if ( mergedRelease == null )
- {
+ for (Object componentRelease1 : componentReleases) {
+ final Release release = (Release) componentRelease1;
+ final Release mergedRelease = getRelease(mergedReleases, release.getVersion());
+ if (mergedRelease == null) {
final Release componentRelease = new Release();
- componentRelease.setVersion( release.getVersion() );
- componentRelease.setDateRelease( release.getDateRelease() );
- componentRelease.addComponent( componentName, release );
- mergedReleases.add( componentRelease );
+ componentRelease.setVersion(release.getVersion());
+ componentRelease.setDateRelease(release.getDateRelease());
+ componentRelease.addComponent(componentName, release);
+ mergedReleases.add(componentRelease);
}
}
diff --git a/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java b/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java
index 2870224..4a0b604 100644
--- a/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java
+++ b/src/main/java/org/apache/maven/plugin/github/GitHubMojo.java
@@ -55,15 +55,15 @@
static
{
- GITHUB_COLUMNS.put( "Assignee", Integer.valueOf( IssuesReportHelper.COLUMN_ASSIGNEE ) );
- GITHUB_COLUMNS.put( "Created", Integer.valueOf( IssuesReportHelper.COLUMN_CREATED ) );
- GITHUB_COLUMNS.put( "Fix Version", Integer.valueOf( IssuesReportHelper.COLUMN_FIX_VERSION ) );
- GITHUB_COLUMNS.put( "Id", Integer.valueOf( IssuesReportHelper.COLUMN_ID ) );
- GITHUB_COLUMNS.put( "Reporter", Integer.valueOf( IssuesReportHelper.COLUMN_REPORTER ) );
- GITHUB_COLUMNS.put( "Status", Integer.valueOf( IssuesReportHelper.COLUMN_STATUS ) );
- GITHUB_COLUMNS.put( "Summary", Integer.valueOf( IssuesReportHelper.COLUMN_SUMMARY ) );
- GITHUB_COLUMNS.put( "Type", Integer.valueOf( IssuesReportHelper.COLUMN_TYPE ) );
- GITHUB_COLUMNS.put( "Updated", Integer.valueOf( IssuesReportHelper.COLUMN_UPDATED ) );
+ GITHUB_COLUMNS.put( "Assignee", IssuesReportHelper.COLUMN_ASSIGNEE);
+ GITHUB_COLUMNS.put( "Created", IssuesReportHelper.COLUMN_CREATED);
+ GITHUB_COLUMNS.put( "Fix Version", IssuesReportHelper.COLUMN_FIX_VERSION);
+ GITHUB_COLUMNS.put( "Id", IssuesReportHelper.COLUMN_ID);
+ GITHUB_COLUMNS.put( "Reporter", IssuesReportHelper.COLUMN_REPORTER);
+ GITHUB_COLUMNS.put( "Status", IssuesReportHelper.COLUMN_STATUS);
+ GITHUB_COLUMNS.put( "Summary", IssuesReportHelper.COLUMN_SUMMARY);
+ GITHUB_COLUMNS.put( "Type", IssuesReportHelper.COLUMN_TYPE);
+ GITHUB_COLUMNS.put( "Updated", IssuesReportHelper.COLUMN_UPDATED);
}
/**
diff --git a/src/main/java/org/apache/maven/plugin/issues/AbstractIssuesReportGenerator.java b/src/main/java/org/apache/maven/plugin/issues/AbstractIssuesReportGenerator.java
index 426a19e..2afec87 100644
--- a/src/main/java/org/apache/maven/plugin/issues/AbstractIssuesReportGenerator.java
+++ b/src/main/java/org/apache/maven/plugin/issues/AbstractIssuesReportGenerator.java
@@ -68,7 +68,7 @@
{
sink.head();
- String title = null;
+ String title;
if ( this.title != null )
{
title = this.title;
diff --git a/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java b/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java
index e3288e2..7692140 100644
--- a/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java
+++ b/src/main/java/org/apache/maven/plugin/issues/IssueUtils.java
@@ -49,20 +49,16 @@
{
List<Issue> filteredIssues = new ArrayList<Issue>();
boolean isFound = false;
- Issue issue = null;
+ Issue issue;
- for ( int i = 0; i < issues.size(); i++ )
- {
- issue = (Issue) issues.get( i );
+ for (Issue issue1 : issues) {
+ issue = (Issue) issue1;
- if ( issue.getFixVersions() != null )
- {
- for ( String fixVersion : issue.getFixVersions() )
- {
- if ( prefix == null || fixVersion.startsWith( prefix ) )
- {
+ if (issue.getFixVersions() != null) {
+ for (String fixVersion : issue.getFixVersions()) {
+ if (prefix == null || fixVersion.startsWith(prefix)) {
isFound = true;
- filteredIssues.add( issue );
+ filteredIssues.add(issue);
break;
}
}
@@ -94,7 +90,7 @@
{
List<Issue> issuesForVersion = new ArrayList<Issue>();
boolean isFound = false;
- Issue issue = null;
+ Issue issue;
String releaseVersion = version;
// Remove "-SNAPSHOT" from the end of the version, if it's there
@@ -103,14 +99,12 @@
releaseVersion = version.substring( 0, version.length() - SNAPSHOT_SUFFIX.length() );
}
- for ( int i = 0; i < issues.size(); i++ )
- {
- issue = (Issue) issues.get( i );
+ for (Issue issue1 : issues) {
+ issue = (Issue) issue1;
- if ( issue.getFixVersions() != null && issue.getFixVersions().contains( releaseVersion ) )
- {
+ if (issue.getFixVersions() != null && issue.getFixVersions().contains(releaseVersion)) {
isFound = true;
- issuesForVersion.add( issue );
+ issuesForVersion.add(issue);
}
}
diff --git a/src/main/java/org/apache/maven/plugin/issues/IssuesReportGenerator.java b/src/main/java/org/apache/maven/plugin/issues/IssuesReportGenerator.java
index 2353ffd..4ed7ccd 100644
--- a/src/main/java/org/apache/maven/plugin/issues/IssuesReportGenerator.java
+++ b/src/main/java/org/apache/maven/plugin/issues/IssuesReportGenerator.java
@@ -93,64 +93,62 @@
sink.tableRow();
- for ( int columnIndex = 0; columnIndex < columns.length; columnIndex++ )
- {
- switch ( columns[columnIndex] )
- {
+ for (int column : columns) {
+ switch (column) {
case IssuesReportHelper.COLUMN_ASSIGNEE:
- sinkHeader( sink, bundle.getString( "report.issues.label.assignee" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.assignee"));
break;
case IssuesReportHelper.COLUMN_COMPONENT:
- sinkHeader( sink, bundle.getString( "report.issues.label.component" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.component"));
break;
case IssuesReportHelper.COLUMN_CREATED:
- sinkHeader( sink, bundle.getString( "report.issues.label.created" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.created"));
break;
case IssuesReportHelper.COLUMN_FIX_VERSION:
- sinkHeader( sink, bundle.getString( "report.issues.label.fixVersion" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.fixVersion"));
break;
case IssuesReportHelper.COLUMN_ID:
- sinkHeader( sink, bundle.getString( "report.issues.label.id" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.id"));
break;
case IssuesReportHelper.COLUMN_KEY:
- sinkHeader( sink, bundle.getString( "report.issues.label.key" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.key"));
break;
case IssuesReportHelper.COLUMN_PRIORITY:
- sinkHeader( sink, bundle.getString( "report.issues.label.priority" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.priority"));
break;
case IssuesReportHelper.COLUMN_REPORTER:
- sinkHeader( sink, bundle.getString( "report.issues.label.reporter" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.reporter"));
break;
case IssuesReportHelper.COLUMN_RESOLUTION:
- sinkHeader( sink, bundle.getString( "report.issues.label.resolution" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.resolution"));
break;
case IssuesReportHelper.COLUMN_STATUS:
- sinkHeader( sink, bundle.getString( "report.issues.label.status" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.status"));
break;
case IssuesReportHelper.COLUMN_SUMMARY:
- sinkHeader( sink, bundle.getString( "report.issues.label.summary" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.summary"));
break;
case IssuesReportHelper.COLUMN_TYPE:
- sinkHeader( sink, bundle.getString( "report.issues.label.type" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.type"));
break;
case IssuesReportHelper.COLUMN_UPDATED:
- sinkHeader( sink, bundle.getString( "report.issues.label.updated" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.updated"));
break;
case IssuesReportHelper.COLUMN_VERSION:
- sinkHeader( sink, bundle.getString( "report.issues.label.version" ) );
+ sinkHeader(sink, bundle.getString("report.issues.label.version"));
break;
default:
@@ -169,91 +167,86 @@
return;
}
- for ( int idx = 0; idx < issueList.size(); idx++ )
- {
+ for (Object anIssueList : issueList) {
// Use a DateFormat based on the Locale
- DateFormat df = DateFormat.getDateInstance( DateFormat.SHORT, locale );
+ DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, locale);
- Issue issue = (Issue) issueList.get( idx );
+ Issue issue = (Issue) anIssueList;
sink.tableRow();
- for ( int columnIndex = 0; columnIndex < columns.length; columnIndex++ )
- {
- switch ( columns[columnIndex] )
- {
+ for (int column : columns) {
+ switch (column) {
case IssuesReportHelper.COLUMN_ASSIGNEE:
- sinkCell( sink, issue.getAssignee() );
+ sinkCell(sink, issue.getAssignee());
break;
case IssuesReportHelper.COLUMN_COMPONENT:
- sinkCell( sink, IssuesReportHelper.printValues( issue.getComponents() ) );
+ sinkCell(sink, IssuesReportHelper.printValues(issue.getComponents()));
break;
case IssuesReportHelper.COLUMN_CREATED:
String created = NOT_AVAILABLE;
- if ( issue.getCreated() != null )
- {
- created = df.format( issue.getCreated() );
+ if (issue.getCreated() != null) {
+ created = df.format(issue.getCreated());
}
- sinkCell( sink, created );
+ sinkCell(sink, created);
break;
case IssuesReportHelper.COLUMN_FIX_VERSION:
- sinkCell( sink, IssuesReportHelper.printValues( issue.getFixVersions() ) );
+ sinkCell(sink, IssuesReportHelper.printValues(issue.getFixVersions()));
break;
case IssuesReportHelper.COLUMN_ID:
sink.tableCell();
- sink.link( issue.getLink() );
- sink.text( issue.getId() );
+ sink.link(issue.getLink());
+ sink.text(issue.getId());
sink.link_();
sink.tableCell_();
break;
case IssuesReportHelper.COLUMN_KEY:
sink.tableCell();
- sink.link( issue.getLink() );
- sink.text( issue.getKey() );
+ sink.link(issue.getLink());
+ sink.text(issue.getKey());
sink.link_();
sink.tableCell_();
break;
case IssuesReportHelper.COLUMN_PRIORITY:
- sinkCell( sink, issue.getPriority() );
+ sinkCell(sink, issue.getPriority());
break;
case IssuesReportHelper.COLUMN_REPORTER:
- sinkCell( sink, issue.getReporter() );
+ sinkCell(sink, issue.getReporter());
break;
case IssuesReportHelper.COLUMN_RESOLUTION:
- sinkCell( sink, issue.getResolution() );
+ sinkCell(sink, issue.getResolution());
break;
case IssuesReportHelper.COLUMN_STATUS:
- sinkCell( sink, issue.getStatus() );
+ sinkCell(sink, issue.getStatus());
break;
case IssuesReportHelper.COLUMN_SUMMARY:
- sinkCell( sink, issue.getSummary() );
+ sinkCell(sink, issue.getSummary());
break;
case IssuesReportHelper.COLUMN_TYPE:
- sinkCell( sink, issue.getType() );
+ sinkCell(sink, issue.getType());
break;
case IssuesReportHelper.COLUMN_UPDATED:
String updated = NOT_AVAILABLE;
- if ( issue.getUpdated() != null )
- {
- updated = df.format( issue.getUpdated() );
+ if (issue.getUpdated() != null) {
+ updated = df.format(issue.getUpdated());
}
- sinkCell( sink, updated );
+ sinkCell(sink, updated);
break;
case IssuesReportHelper.COLUMN_VERSION:
- sinkCell( sink, issue.getVersion() );
+ sinkCell(sink, issue.getVersion());
break;
default:
diff --git a/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java b/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java
index 0c2d157..df68617 100644
--- a/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java
+++ b/src/main/java/org/apache/maven/plugin/issues/IssuesReportHelper.java
@@ -101,21 +101,16 @@
}
// Loop through the names of the columns, to validate each of them and add their id to the list
- for ( int i = 0; i < columnNamesArray.length; i++ )
- {
- String columnName = columnNamesArray[i].trim();
- if ( allColumns.containsKey( columnName ) )
- {
- columnIds.add( allColumns.get( columnName ) );
- }
- else if ( deprecatedColumns != null && deprecatedColumns.containsKey( columnName ) )
- {
- Integer columnId = deprecatedColumns.get( columnName );
- columnIds.add( columnId );
- if ( log != null )
- {
- log.warn( "The columnName '" + columnName + "' has been deprecated." + " Please use "
- + "the columnName '" + bidiColumns.getKey( columnId ) + "' instead." );
+ for (String aColumnNamesArray : columnNamesArray) {
+ String columnName = aColumnNamesArray.trim();
+ if (allColumns.containsKey(columnName)) {
+ columnIds.add(allColumns.get(columnName));
+ } else if (deprecatedColumns != null && deprecatedColumns.containsKey(columnName)) {
+ Integer columnId = deprecatedColumns.get(columnName);
+ columnIds.add(columnId);
+ if (log != null) {
+ log.warn("The columnName '" + columnName + "' has been deprecated." + " Please use "
+ + "the columnName '" + bidiColumns.getKey(columnId) + "' instead.");
}
}
}
@@ -158,7 +153,7 @@
int[] intArray = new int[list.size()];
for ( int j = 0; j < intArray.length; j++ )
{
- intArray[j] = ( list.get( j ) ).intValue();
+ intArray[j] = list.get(j);
}
return intArray;
}
diff --git a/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java b/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java
index e2ea89a..58611b1 100644
--- a/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java
+++ b/src/main/java/org/apache/maven/plugin/jira/ClassicJiraDownloader.java
@@ -104,7 +104,7 @@
if ( ( isJiraAuthenticationConfigured() && jiraAuthenticationSuccessful )
|| !isJiraAuthenticationConfigured() )
{
- String fullUrl = null;
+ String fullUrl;
if ( useJql )
{
@@ -255,7 +255,7 @@
private boolean doJiraAuthentication( HttpClient client, final String jiraUrl )
{
// log into JIRA if we have to
- String loginUrl = null;
+ String loginUrl;
StringBuilder loginLink = new StringBuilder( jiraUrl );
@@ -318,7 +318,7 @@
{
final String loginFailureResponse = "your username and password are incorrect";
- return loginGet.getResponseBodyAsString().indexOf( loginFailureResponse ) == -1;
+ return !loginGet.getResponseBodyAsString().contains(loginFailureResponse);
}
/**
diff --git a/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java b/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java
index e67ac39..8bc7f41 100644
--- a/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java
+++ b/src/main/java/org/apache/maven/plugin/jira/JiraHelper.java
@@ -204,8 +204,8 @@
{
final int indexBrowse = issueManagementUrl.indexOf( "/browse/" );
- String jiraUrl = "";
- String project = "";
+ String jiraUrl;
+ String project;
if ( indexBrowse != -1 )
{
diff --git a/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java b/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
index 69cdab6..1e44902 100644
--- a/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
+++ b/src/main/java/org/apache/maven/plugin/jira/JiraMojo.java
@@ -56,20 +56,20 @@
static
{
- JIRA_COLUMNS.put( "Assignee", Integer.valueOf( IssuesReportHelper.COLUMN_ASSIGNEE ) );
- JIRA_COLUMNS.put( "Component", Integer.valueOf( IssuesReportHelper.COLUMN_COMPONENT ) );
- JIRA_COLUMNS.put( "Created", Integer.valueOf( IssuesReportHelper.COLUMN_CREATED ) );
- JIRA_COLUMNS.put( "Fix Version", Integer.valueOf( IssuesReportHelper.COLUMN_FIX_VERSION ) );
- JIRA_COLUMNS.put( "Id", Integer.valueOf( IssuesReportHelper.COLUMN_ID ) );
- JIRA_COLUMNS.put( "Key", Integer.valueOf( IssuesReportHelper.COLUMN_KEY ) );
- JIRA_COLUMNS.put( "Priority", Integer.valueOf( IssuesReportHelper.COLUMN_PRIORITY ) );
- JIRA_COLUMNS.put( "Reporter", Integer.valueOf( IssuesReportHelper.COLUMN_REPORTER ) );
- JIRA_COLUMNS.put( "Resolution", Integer.valueOf( IssuesReportHelper.COLUMN_RESOLUTION ) );
- JIRA_COLUMNS.put( "Status", Integer.valueOf( IssuesReportHelper.COLUMN_STATUS ) );
- JIRA_COLUMNS.put( "Summary", Integer.valueOf( IssuesReportHelper.COLUMN_SUMMARY ) );
- JIRA_COLUMNS.put( "Type", Integer.valueOf( IssuesReportHelper.COLUMN_TYPE ) );
- JIRA_COLUMNS.put( "Updated", Integer.valueOf( IssuesReportHelper.COLUMN_UPDATED ) );
- JIRA_COLUMNS.put( "Version", Integer.valueOf( IssuesReportHelper.COLUMN_VERSION ) );
+ JIRA_COLUMNS.put( "Assignee", IssuesReportHelper.COLUMN_ASSIGNEE);
+ JIRA_COLUMNS.put( "Component", IssuesReportHelper.COLUMN_COMPONENT);
+ JIRA_COLUMNS.put( "Created", IssuesReportHelper.COLUMN_CREATED);
+ JIRA_COLUMNS.put( "Fix Version", IssuesReportHelper.COLUMN_FIX_VERSION);
+ JIRA_COLUMNS.put( "Id", IssuesReportHelper.COLUMN_ID);
+ JIRA_COLUMNS.put( "Key", IssuesReportHelper.COLUMN_KEY);
+ JIRA_COLUMNS.put( "Priority", IssuesReportHelper.COLUMN_PRIORITY);
+ JIRA_COLUMNS.put( "Reporter", IssuesReportHelper.COLUMN_REPORTER);
+ JIRA_COLUMNS.put( "Resolution", IssuesReportHelper.COLUMN_RESOLUTION);
+ JIRA_COLUMNS.put( "Status", IssuesReportHelper.COLUMN_STATUS);
+ JIRA_COLUMNS.put( "Summary", IssuesReportHelper.COLUMN_SUMMARY);
+ JIRA_COLUMNS.put( "Type", IssuesReportHelper.COLUMN_TYPE);
+ JIRA_COLUMNS.put( "Updated", IssuesReportHelper.COLUMN_UPDATED);
+ JIRA_COLUMNS.put( "Version", IssuesReportHelper.COLUMN_VERSION);
}
/**
diff --git a/src/main/java/org/apache/maven/plugin/jira/ParameterQueryBuilder.java b/src/main/java/org/apache/maven/plugin/jira/ParameterQueryBuilder.java
index 12528be..736e96e 100644
--- a/src/main/java/org/apache/maven/plugin/jira/ParameterQueryBuilder.java
+++ b/src/main/java/org/apache/maven/plugin/jira/ParameterQueryBuilder.java
@@ -152,11 +152,9 @@
{
String[] fixVersions = fixVersionIds.split( "," );
- for ( int i = 0; i < fixVersions.length; i++ )
- {
- if ( fixVersions[i].length() > 0 )
- {
- query.append( "&fixfor=" ).append( fixVersions[i].trim() );
+ for (String fixVersion : fixVersions) {
+ if (fixVersion.length() > 0) {
+ query.append("&fixfor=").append(fixVersion.trim());
}
}
}
diff --git a/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java b/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java
index d6e0bd4..0f514df 100644
--- a/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java
+++ b/src/main/java/org/apache/maven/plugin/resource/loader/ProjectResourceLoader.java
@@ -71,9 +71,8 @@
int sz = paths.size();
- for ( int i = 0; i < sz; i++ )
- {
- rsvc.getLog().info( "ProjectResourceLoader : adding path '" + paths.get( i ) + "'" );
+ for (String path1 : paths) {
+ rsvc.getLog().info("ProjectResourceLoader : adding path '" + path1 + "'");
}
rsvc.getLog().info( "ProjectResourceLoader : initialization complete." );
}
diff --git a/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java b/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java
index 6eee614..2fb10da 100644
--- a/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java
+++ b/src/main/java/org/apache/maven/plugin/trac/TracDownloader.java
@@ -124,18 +124,17 @@
}
Object[] params = new Object[] { new String( qstr ) };
- Object[] queryResult = null;
+ Object[] queryResult;
ArrayList<Issue> issueList = new ArrayList<Issue>();
try
{
queryResult = (Object[]) client.execute( "ticket.query", params );
- for ( int i = 0; i < queryResult.length; i++ )
- {
- params = new Object[] { queryResult[i] };
- Object[] ticketGetResult = null;
- ticketGetResult = (Object[]) client.execute( "ticket.get", params );
- issueList.add( createIssue( ticketGetResult ) );
+ for (Object aQueryResult : queryResult) {
+ params = new Object[]{aQueryResult};
+ Object[] ticketGetResult;
+ ticketGetResult = (Object[]) client.execute("ticket.get", params);
+ issueList.add(createIssue(ticketGetResult));
}
}
catch ( XmlRpcException e )
diff --git a/src/main/java/org/apache/maven/plugin/trac/TracMojo.java b/src/main/java/org/apache/maven/plugin/trac/TracMojo.java
index 3a86cee..df8803d 100644
--- a/src/main/java/org/apache/maven/plugin/trac/TracMojo.java
+++ b/src/main/java/org/apache/maven/plugin/trac/TracMojo.java
@@ -59,31 +59,31 @@
static
{
- DEPRECATED_TRAC_COLUMNS.put( "changed", new Integer( IssuesReportHelper.COLUMN_UPDATED ) );
- DEPRECATED_TRAC_COLUMNS.put( "component", new Integer( IssuesReportHelper.COLUMN_COMPONENT ) );
- DEPRECATED_TRAC_COLUMNS.put( "created", new Integer( IssuesReportHelper.COLUMN_CREATED ) );
- DEPRECATED_TRAC_COLUMNS.put( "id", new Integer( IssuesReportHelper.COLUMN_ID ) );
- DEPRECATED_TRAC_COLUMNS.put( "milestone", new Integer( IssuesReportHelper.COLUMN_FIX_VERSION ) );
- DEPRECATED_TRAC_COLUMNS.put( "owner", new Integer( IssuesReportHelper.COLUMN_ASSIGNEE ) );
- DEPRECATED_TRAC_COLUMNS.put( "priority", new Integer( IssuesReportHelper.COLUMN_PRIORITY ) );
- DEPRECATED_TRAC_COLUMNS.put( "reporter", new Integer( IssuesReportHelper.COLUMN_REPORTER ) );
- DEPRECATED_TRAC_COLUMNS.put( "resolution", new Integer( IssuesReportHelper.COLUMN_RESOLUTION ) );
- DEPRECATED_TRAC_COLUMNS.put( "status", new Integer( IssuesReportHelper.COLUMN_STATUS ) );
- DEPRECATED_TRAC_COLUMNS.put( "summary", new Integer( IssuesReportHelper.COLUMN_SUMMARY ) );
- DEPRECATED_TRAC_COLUMNS.put( "type", new Integer( IssuesReportHelper.COLUMN_TYPE ) );
+ DEPRECATED_TRAC_COLUMNS.put( "changed", IssuesReportHelper.COLUMN_UPDATED);
+ DEPRECATED_TRAC_COLUMNS.put( "component", IssuesReportHelper.COLUMN_COMPONENT);
+ DEPRECATED_TRAC_COLUMNS.put( "created", IssuesReportHelper.COLUMN_CREATED);
+ DEPRECATED_TRAC_COLUMNS.put( "id", IssuesReportHelper.COLUMN_ID);
+ DEPRECATED_TRAC_COLUMNS.put( "milestone", IssuesReportHelper.COLUMN_FIX_VERSION);
+ DEPRECATED_TRAC_COLUMNS.put( "owner", IssuesReportHelper.COLUMN_ASSIGNEE);
+ DEPRECATED_TRAC_COLUMNS.put( "priority", IssuesReportHelper.COLUMN_PRIORITY);
+ DEPRECATED_TRAC_COLUMNS.put( "reporter", IssuesReportHelper.COLUMN_REPORTER);
+ DEPRECATED_TRAC_COLUMNS.put( "resolution", IssuesReportHelper.COLUMN_RESOLUTION);
+ DEPRECATED_TRAC_COLUMNS.put( "status", IssuesReportHelper.COLUMN_STATUS);
+ DEPRECATED_TRAC_COLUMNS.put( "summary", IssuesReportHelper.COLUMN_SUMMARY);
+ DEPRECATED_TRAC_COLUMNS.put( "type", IssuesReportHelper.COLUMN_TYPE);
- TRAC_COLUMNS.put( "Assignee", new Integer( IssuesReportHelper.COLUMN_ASSIGNEE ) );
- TRAC_COLUMNS.put( "Component", new Integer( IssuesReportHelper.COLUMN_COMPONENT ) );
- TRAC_COLUMNS.put( "Created", new Integer( IssuesReportHelper.COLUMN_CREATED ) );
- TRAC_COLUMNS.put( "Fix Version", new Integer( IssuesReportHelper.COLUMN_FIX_VERSION ) );
- TRAC_COLUMNS.put( "Id", new Integer( IssuesReportHelper.COLUMN_ID ) );
- TRAC_COLUMNS.put( "Priority", new Integer( IssuesReportHelper.COLUMN_PRIORITY ) );
- TRAC_COLUMNS.put( "Reporter", new Integer( IssuesReportHelper.COLUMN_REPORTER ) );
- TRAC_COLUMNS.put( "Resolution", new Integer( IssuesReportHelper.COLUMN_RESOLUTION ) );
- TRAC_COLUMNS.put( "Status", new Integer( IssuesReportHelper.COLUMN_STATUS ) );
- TRAC_COLUMNS.put( "Summary", new Integer( IssuesReportHelper.COLUMN_SUMMARY ) );
- TRAC_COLUMNS.put( "Type", new Integer( IssuesReportHelper.COLUMN_TYPE ) );
- TRAC_COLUMNS.put( "Updated", new Integer( IssuesReportHelper.COLUMN_UPDATED ) );
+ TRAC_COLUMNS.put( "Assignee", IssuesReportHelper.COLUMN_ASSIGNEE);
+ TRAC_COLUMNS.put( "Component", IssuesReportHelper.COLUMN_COMPONENT);
+ TRAC_COLUMNS.put( "Created", IssuesReportHelper.COLUMN_CREATED);
+ TRAC_COLUMNS.put( "Fix Version", IssuesReportHelper.COLUMN_FIX_VERSION);
+ TRAC_COLUMNS.put( "Id", IssuesReportHelper.COLUMN_ID);
+ TRAC_COLUMNS.put( "Priority", IssuesReportHelper.COLUMN_PRIORITY);
+ TRAC_COLUMNS.put( "Reporter", IssuesReportHelper.COLUMN_REPORTER);
+ TRAC_COLUMNS.put( "Resolution", IssuesReportHelper.COLUMN_RESOLUTION);
+ TRAC_COLUMNS.put( "Status", IssuesReportHelper.COLUMN_STATUS);
+ TRAC_COLUMNS.put( "Summary", IssuesReportHelper.COLUMN_SUMMARY);
+ TRAC_COLUMNS.put( "Type", IssuesReportHelper.COLUMN_TYPE);
+ TRAC_COLUMNS.put( "Updated", IssuesReportHelper.COLUMN_UPDATED);
}
/**
diff --git a/src/test/java/org/apache/maven/plugin/changes/ChangesXMLTest.java b/src/test/java/org/apache/maven/plugin/changes/ChangesXMLTest.java
index 3e789fb..6a404e3 100644
--- a/src/test/java/org/apache/maven/plugin/changes/ChangesXMLTest.java
+++ b/src/test/java/org/apache/maven/plugin/changes/ChangesXMLTest.java
@@ -147,16 +147,14 @@
List releases = changesXML.getReleaseList();
assertEquals( 2, releases.size() );
- for ( Iterator iterator = releases.iterator(); iterator.hasNext(); )
- {
- Release release = (Release) iterator.next();
- if ( "1.0".equals( release.getVersion() ) )
- {
- Action action = (Action) release.getActions().get( 0 );
- assertEquals( 2, action.getFixedIssues().size() );
- assertEquals( "JIRA-XXX", ( (FixedIssue) action.getFixedIssues().get( 0 ) ).getIssue() );
- assertEquals( "JIRA-YYY", ( (FixedIssue) action.getFixedIssues().get( 1 ) ).getIssue() );
- assertEquals( 2, action.getDueTos().size() );
+ for (Object release1 : releases) {
+ Release release = (Release) release1;
+ if ("1.0".equals(release.getVersion())) {
+ Action action = (Action) release.getActions().get(0);
+ assertEquals(2, action.getFixedIssues().size());
+ assertEquals("JIRA-XXX", ((FixedIssue) action.getFixedIssues().get(0)).getIssue());
+ assertEquals("JIRA-YYY", ((FixedIssue) action.getFixedIssues().get(1)).getIssue());
+ assertEquals(2, action.getDueTos().size());
}
}
}
diff --git a/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java b/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java
index 344048d..bc0cf13 100644
--- a/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java
+++ b/src/test/java/org/apache/maven/plugin/issues/IssueUtilsTestCase.java
@@ -51,7 +51,7 @@
issueList.add( issue_1 );
issueList.add( issue_2 );
- List filteredIssues = null;
+ List filteredIssues;
try
{
filteredIssues = IssueUtils.filterIssuesWithVersionPrefix( issueList, null );
