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/01/24 21:56:00 UTC
svn commit: r1062970 - in
/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin:
changes/ issues/ jira/ trac/
Author: dennisl
Date: Mon Jan 24 20:56:00 2011
New Revision: 1062970
URL: http://svn.apache.org/viewvc?rev=1062970&view=rev
Log:
o Fix errors reported by Checkstyle.
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/AbstractIssuesReportGenerator.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportGenerator.java
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/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/main/java/org/apache/maven/plugin/jira/JiraXML.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/changes/AbstractChangesReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java?rev=1062970&r1=1062969&r2=1062970&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/AbstractChangesReport.java Mon Jan 24 20:56:00 2011
@@ -19,7 +19,6 @@ package org.apache.maven.plugin.changes;
* under the License.
*/
-import org.apache.commons.lang.StringUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java?rev=1062970&r1=1062969&r2=1062970&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ChangesReportGenerator.java Mon Jan 24 20:56:00 2011
@@ -256,7 +256,7 @@ public class ChangesReportGenerator exte
sink.tableCell();
- if( escapeHTML )
+ if ( escapeHTML )
{
sink.text( action.getAction() );
}
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/AbstractIssuesReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/AbstractIssuesReportGenerator.java?rev=1062970&r1=1062969&r2=1062970&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/AbstractIssuesReportGenerator.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/AbstractIssuesReportGenerator.java Mon Jan 24 20:56:00 2011
@@ -1,5 +1,24 @@
package org.apache.maven.plugin.issues;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.util.HtmlTools;
import org.codehaus.plexus.util.StringUtils;
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportGenerator.java?rev=1062970&r1=1062969&r2=1062970&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportGenerator.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/issues/IssuesReportGenerator.java Mon Jan 24 20:56:00 2011
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.issues;
*/
import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.reporting.MavenReportException;
import java.text.DateFormat;
import java.util.List;
@@ -173,7 +172,7 @@ public class IssuesReportGenerator exten
for ( int idx = 0; idx < issueList.size(); idx++ )
{
// 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 );
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=1062970&r1=1062969&r2=1062970&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 Mon Jan 24 20:56:00 2011
@@ -130,7 +130,7 @@ public class IssuesReportHelper
public static String printValues( List values )
{
StringBuffer sb = new StringBuffer();
- if( values != null )
+ if ( values != null )
{
Iterator iterator = values.iterator();
while ( iterator.hasNext() )
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=1062970&r1=1062969&r2=1062970&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 Mon Jan 24 20:56:00 2011
@@ -133,7 +133,7 @@ public abstract class AbstractJiraDownlo
{
if ( fixVersions[i].length() > 0 )
{
- localFilter.append( "&fixfor=" ).append( fixVersions[i].trim());
+ localFilter.append( "&fixfor=" ).append( fixVersions[i].trim() );
}
}
}
@@ -149,7 +149,7 @@ public abstract class AbstractJiraDownlo
if ( statusParam != null )
{
- localFilter.append( "&statusIds=" ).append( statusParam);
+ localFilter.append( "&statusIds=" ).append( statusParam );
}
}
}
@@ -165,7 +165,7 @@ public abstract class AbstractJiraDownlo
if ( priorityParam != null )
{
- localFilter.append( "&priorityIds=" ).append( priorityParam);
+ localFilter.append( "&priorityIds=" ).append( priorityParam );
}
}
}
@@ -181,7 +181,7 @@ public abstract class AbstractJiraDownlo
if ( resoParam != null )
{
- localFilter.append( "&resolutionIds=" ).append( resoParam);
+ localFilter.append( "&resolutionIds=" ).append( resoParam );
}
}
}
@@ -195,7 +195,7 @@ public abstract class AbstractJiraDownlo
{
if ( components[i].length() > 0 )
{
- localFilter.append( "&component=" ).append( components[i]);
+ localFilter.append( "&component=" ).append( components[i] );
}
}
}
@@ -211,7 +211,7 @@ public abstract class AbstractJiraDownlo
if ( typeParam != null )
{
- localFilter.append( "&type=" ).append( typeParam);
+ localFilter.append( "&type=" ).append( typeParam );
}
}
}
@@ -561,7 +561,7 @@ public abstract class AbstractJiraDownlo
{
ProxyInfo proxyInfo = new ProxyInfo();
- proxyInfo.setNonProxyHosts(proxy.getNonProxyHosts());
+ proxyInfo.setNonProxyHosts( proxy.getNonProxyHosts() );
// Validation of proxy method copied from org.apache.maven.wagon.proxy.ProxyUtils.
// @todo Can use original when maven-changes-plugin references a more recent version of maven-project
@@ -701,7 +701,8 @@ public abstract class AbstractJiraDownlo
}
}
- public List getIssueList() {
+ public List getIssueList()
+ {
if ( output.isFile() )
{
JiraXML jira = new JiraXML( log, jiraDatePattern );
@@ -709,7 +710,8 @@ public abstract class AbstractJiraDownlo
getLog().info( "The JIRA version is '" + jira.getJiraVersion() + "'" );
return jira.getIssueList();
}
- else {
+ else
+ {
getLog().warn( "JIRA file " + output.getPath() + " doesn't exist." );
return Collections.EMPTY_LIST;
}
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=1062970&r1=1062969&r2=1062970&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 Mon Jan 24 20:56:00 2011
@@ -58,7 +58,7 @@ public class JiraHelper
}
// chop off the parameter part
- int pos = url.indexOf( '?');
+ int pos = url.indexOf( '?' );
// and get the id while we're at it
String id = "";
@@ -66,14 +66,14 @@ public class JiraHelper
if ( pos >= 0 )
{
// project id
- id = url.substring( url.lastIndexOf( '=') + 1 );
+ id = url.substring( url.lastIndexOf( '=' ) + 1 );
}
- String jiraUrl = url.substring( 0, url.lastIndexOf( '/') );
+ String jiraUrl = url.substring( 0, url.lastIndexOf( '/' ) );
if ( jiraUrl.endsWith( "secure" ) )
{
- jiraUrl = jiraUrl.substring( 0, jiraUrl.lastIndexOf( '/') );
+ jiraUrl = jiraUrl.substring( 0, jiraUrl.lastIndexOf( '/' ) );
}
else
{
Modified: maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java?rev=1062970&r1=1062969&r2=1062970&view=diff
==============================================================================
--- maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java (original)
+++ maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/jira/JiraXML.java Mon Jan 24 20:56:00 2011
@@ -213,7 +213,7 @@ public class JiraXML
}
catch ( ParseException e )
{
- log.warn( "Element \"Created\". " + e.getMessage() + ". Using the pattern \"" + datePattern + "\"");
+ log.warn( "Element \"Created\". " + e.getMessage() + ". Using the pattern \"" + datePattern + "\"" );
}
}
else if ( qName.equals( "updated" ) && currentParent.equals( "item" ) && sdf != null )
@@ -224,7 +224,7 @@ public class JiraXML
}
catch ( ParseException e )
{
- log.warn( "Element \"Updated\". " + e.getMessage() + ". Using the pattern \"" + datePattern + "\"");
+ log.warn( "Element \"Updated\". " + e.getMessage() + ". Using the pattern \"" + datePattern + "\"" );
}
}
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=1062970&r1=1062969&r2=1062970&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 Mon Jan 24 20:56:00 2011
@@ -141,7 +141,8 @@ public class TracMojo
throws MavenReportException
{
// Validate parameters
- List columnIds = IssuesReportHelper.getColumnIds( columnNames, TRAC_COLUMNS, DEPRECATED_TRAC_COLUMNS, getLog() );
+ List 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