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 2012/07/30 22:01:21 UTC
svn commit: r1367255 -
/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/
Author: hboutemy
Date: Mon Jul 30 20:01:21 2012
New Revision: 1367255
URL: http://svn.apache.org/viewvc?rev=1367255&view=rev
Log:
fixed errors reported by Checkstyle
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=1367255&r1=1367254&r2=1367255&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java Mon Jul 30 20:01:21 2012
@@ -329,7 +329,7 @@ public abstract class AbstractProjectInf
private ResourceBundle bundle;
- private final Object[] NO_ARGS = new Object[0];
+ private final static Object[] NO_ARGS = new Object[0];
public CustomI18N( MavenProject project, Settings settings, File customBundleFile, Locale locale,
I18N i18nOriginal )
@@ -519,7 +519,7 @@ public abstract class AbstractProjectInf
return messageFormat.format( args );
}
- private final String getStringOrNull( ResourceBundle rb, String key )
+ private String getStringOrNull( ResourceBundle rb, String key )
{
if ( rb != null )
{
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java?rev=1367255&r1=1367254&r2=1367255&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java Mon Jul 30 20:01:21 2012
@@ -217,7 +217,8 @@ public class DependencyConvergenceReport
sink.table_();
}
- private void generateVersionDetails( Sink sink, Map<String, List<ReverseDependencyLink>> artifactMap, String version )
+ private void generateVersionDetails( Sink sink, Map<String, List<ReverseDependencyLink>> artifactMap,
+ String version )
{
sink.numberedList( 1 ); // Use lower alpha numbering
List<ReverseDependencyLink> depList = artifactMap.get( version );
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java?rev=1367255&r1=1367254&r2=1367255&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java Mon Jul 30 20:01:21 2012
@@ -1,5 +1,24 @@
package org.apache.maven.report.projectinfo;
+/*
+ * 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.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java?rev=1367255&r1=1367254&r2=1367255&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java Mon Jul 30 20:01:21 2012
@@ -121,8 +121,8 @@ public class LicenseReport
return true;
}
- if ( licenseUrl != null &&
- ( licenseUrl.getProtocol().equals( "http" ) || licenseUrl.getProtocol().equals( "https" ) ) )
+ if ( licenseUrl != null
+ && ( licenseUrl.getProtocol().equals( "http" ) || licenseUrl.getProtocol().equals( "https" ) ) )
{
linkOnly = true;
return true;
@@ -344,8 +344,8 @@ public class LicenseReport
int bodyStart = licenseContentLC.indexOf( "<body" );
int bodyEnd = licenseContentLC.indexOf( "</body>" );
- if ( ( licenseContentLC.contains( "<!doctype html" ) || licenseContentLC.contains( "<html>" ) ) &&
- ( ( bodyStart >= 0 ) && ( bodyEnd > bodyStart ) ) )
+ if ( ( licenseContentLC.contains( "<!doctype html" ) || licenseContentLC.contains( "<html>" ) )
+ && ( ( bodyStart >= 0 ) && ( bodyEnd > bodyStart ) ) )
{
bodyStart = licenseContentLC.indexOf( ">", bodyStart ) + 1;
String body = licenseContent.substring( bodyStart, bodyEnd );
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java?rev=1367255&r1=1367254&r2=1367255&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java Mon Jul 30 20:01:21 2012
@@ -139,8 +139,8 @@ public class MailingListsReport
if ( StringUtils.isNotBlank( introduction ) )
{
- log.warn( "Since 2.3, the <introduction/> parameter is deprecated. Please use a <customBundle/>" +
- " parameter to configure a custom bundle." );
+ log.warn( "Since 2.3, the <introduction/> parameter is deprecated. Please use a <customBundle/>"
+ + " parameter to configure a custom bundle." );
paragraph( introduction );
}
else
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java?rev=1367255&r1=1367254&r2=1367255&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java Mon Jul 30 20:01:21 2012
@@ -151,7 +151,7 @@ public class ModulesReport
baseURL = parentModel.getUrl();
}
- final String moduleHref = getRelativeLink( baseURL, moduleModel.getUrl(), moduleModel.getArtifactId() );
+ final String moduleHref = getRelativeLink( baseURL, moduleModel.getUrl(), moduleModel.getArtifactId() );
tableRow( new String[] {linkedName( moduleName, moduleHref ), moduleModel.getDescription()} );
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java?rev=1367255&r1=1367254&r2=1367255&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java Mon Jul 30 20:01:21 2012
@@ -75,8 +75,10 @@ public class PluginManagementReport
@Override
public void executeReport( Locale locale )
{
- PluginManagementRenderer r = new PluginManagementRenderer( getLog(), getSink(), locale, getI18N( locale ), project
- .getPluginManagement().getPlugins(), project, mavenProjectBuilder, artifactFactory, localRepository );
+ PluginManagementRenderer r =
+ new PluginManagementRenderer( getLog(), getSink(), locale, getI18N( locale ),
+ project.getPluginManagement().getPlugins(), project, mavenProjectBuilder,
+ artifactFactory, localRepository );
r.render();
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java?rev=1367255&r1=1367254&r2=1367255&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java Mon Jul 30 20:01:21 2012
@@ -76,9 +76,10 @@ public class PluginsReport
public void executeReport( Locale locale )
{
@SuppressWarnings( "unchecked" )
- PluginsRenderer r = new PluginsRenderer( getLog(), getSink(), locale, getI18N( locale ), project.getPluginArtifacts(),
- project.getReportArtifacts(), project, mavenProjectBuilder,
- artifactFactory, localRepository );
+ PluginsRenderer r =
+ new PluginsRenderer( getLog(), getSink(), locale, getI18N( locale ), project.getPluginArtifacts(),
+ project.getReportArtifacts(), project, mavenProjectBuilder, artifactFactory,
+ localRepository );
r.render();
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java?rev=1367255&r1=1367254&r2=1367255&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java Mon Jul 30 20:01:21 2012
@@ -203,7 +203,8 @@ public class ProjectInfoReportUtils
*/
public static String getArtifactUrl( ArtifactFactory factory, Artifact artifact,
MavenProjectBuilder mavenProjectBuilder,
- List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
+ List<ArtifactRepository> remoteRepositories,
+ ArtifactRepository localRepository )
{
if ( Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
{
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java?rev=1367255&r1=1367254&r2=1367255&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java Mon Jul 30 20:01:21 2012
@@ -103,9 +103,9 @@ public class ScmReport
@Override
public void executeReport( Locale locale )
{
- ScmRenderer r = new ScmRenderer( getLog(), scmManager, getSink(), getProject().getModel(), getI18N( locale ), locale,
- checkoutDirectoryName, webAccessUrl, anonymousConnection,
- developerConnection );
+ ScmRenderer r =
+ new ScmRenderer( getLog(), scmManager, getSink(), getProject().getModel(), getI18N( locale ), locale,
+ checkoutDirectoryName, webAccessUrl, anonymousConnection, developerConnection );
r.render();
}
@@ -562,7 +562,7 @@ public class ScmReport
*
* @param hgRepo
*/
- private void developerAccessMercurial(HgScmProviderRepository hgRepo)
+ private void developerAccessMercurial( HgScmProviderRepository hgRepo )
{
sink.paragraph();
linkPatternedText( getI18nString( "devaccess.hg.intro" ) );
@@ -570,7 +570,7 @@ public class ScmReport
StringBuffer command = new StringBuffer();
command.append( "$ hg clone " );
- command.append(hgRepo.getURI());
+ command.append( hgRepo.getURI() );
verbatimText( command.toString() );
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java?rev=1367255&r1=1367254&r2=1367255&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java Mon Jul 30 20:01:21 2012
@@ -127,17 +127,18 @@ public class TeamListReport
startSection( getI18nString( "intro.title" ) );
// To handle JS
- StringBuffer javascript = new StringBuffer( "function offsetDate(id, offset) {" ).append( SystemUtils.LINE_SEPARATOR );
+ StringBuffer javascript =
+ new StringBuffer( "function offsetDate(id, offset) {" ).append( SystemUtils.LINE_SEPARATOR );
javascript.append( " var now = new Date();" ).append( SystemUtils.LINE_SEPARATOR );
javascript.append( " var nowTime = now.getTime();" ).append( SystemUtils.LINE_SEPARATOR );
javascript.append( " var localOffset = now.getTimezoneOffset();" ).append( SystemUtils.LINE_SEPARATOR );
javascript.append( " var developerTime = nowTime + ( offset * 60 * 60 * 1000 )"
- + "+ ( localOffset * 60 * 1000 );" ).append( SystemUtils.LINE_SEPARATOR );
+ + "+ ( localOffset * 60 * 1000 );" ).append( SystemUtils.LINE_SEPARATOR );
javascript.append( " var developerDate = new Date(developerTime);" ).append( SystemUtils.LINE_SEPARATOR );
javascript.append( SystemUtils.LINE_SEPARATOR );
javascript.append( " document.getElementById(id).innerHTML = developerDate;" ).append( SystemUtils.LINE_SEPARATOR );
javascript.append( "}" ).append( SystemUtils.LINE_SEPARATOR );
- javascript.append( SystemUtils.LINE_SEPARATOR);
+ javascript.append( SystemUtils.LINE_SEPARATOR );
javascript.append( "function init(){" ).append( SystemUtils.LINE_SEPARATOR );
// Introduction