Author: khmarbaise Date: Sat Nov 8 14:42:36 2014 New Revision: 1637570 URL: http://svn.apache.org/r1637570 Log: [MPIR-306] Upgrade to maven-plugins version 25 to 26 - Fixed several checkstyle reported errors.
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java 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/MailingListsReport.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 maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=1637570&r1=1637569&r2=1637570&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Sat Nov 8 14:42:36 2014 @@ -25,7 +25,7 @@ under the License. <parent> <artifactId>maven-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId> - <version>25</version> + <version>26</version> <relativePath>../maven-plugins/pom.xml</relativePath> </parent> Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java?rev=1637570&r1=1637569&r2=1637570&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java Sat Nov 8 14:42:36 2014 @@ -27,6 +27,10 @@ import org.apache.maven.reporting.Abstra import org.codehaus.plexus.i18n.I18N; import org.codehaus.plexus.util.StringUtils; +/** + * @author Hervé Boutemy + * + */ public abstract class AbstractProjectInfoRenderer extends AbstractMavenReportRenderer { 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=1637570&r1=1637569&r2=1637570&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 Sat Nov 8 14:42:36 2014 @@ -298,8 +298,8 @@ public abstract class AbstractProjectInf Plugin plugin = (Plugin) getProject().getBuild().getPluginsAsMap().get( pluginId ); - if ( ( plugin == null ) && ( getProject().getBuild().getPluginManagement() != null ) && ( - getProject().getBuild().getPluginManagement().getPluginsAsMap() != null ) ) + if ( ( plugin == null ) && ( getProject().getBuild().getPluginManagement() != null ) + && ( getProject().getBuild().getPluginManagement().getPluginsAsMap() != null ) ) { plugin = (Plugin) getProject().getBuild().getPluginManagement().getPluginsAsMap().get( pluginId ); } @@ -385,7 +385,7 @@ public abstract class AbstractProjectInf private ResourceBundle bundle; - private final static Object[] NO_ARGS = new Object[0]; + private static final Object[] NO_ARGS = new Object[0]; public CustomI18N( MavenProject project, Settings settings, File customBundleFile, Locale locale, I18N i18nOriginal ) @@ -405,6 +405,7 @@ public abstract class AbstractProjectInf } catch ( MalformedURLException e ) { + //could not happen. } this.bundle = ResourceBundle.getBundle( this.bundleName, locale, classLoader ); @@ -499,7 +500,7 @@ public abstract class AbstractProjectInf value = i18nOriginal.getString( bundleName, locale, key ); } - if (!value.contains("${")) + if ( !value.contains( "${" ) ) { return value; } @@ -511,6 +512,7 @@ public abstract class AbstractProjectInf } catch ( final IOException e ) { + //In which cases could this happen? And what should we do? } interpolator.addValueSource( new PropertiesBasedValueSource( System.getProperties() ) ); @@ -525,6 +527,7 @@ public abstract class AbstractProjectInf } catch ( final InterpolationException e ) { + //What does this exception mean? } return value; 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=1637570&r1=1637569&r2=1637570&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 Sat Nov 8 14:42:36 2014 @@ -366,7 +366,8 @@ public class DependencyConvergenceReport List<DependencyNode> projectNodes = getProjectNodes( depList ); - if (projectNodes == null || projectNodes.size() == 0){ + if ( projectNodes == null || projectNodes.size() == 0 ) + { getLog().warn( "Can't find project nodes for dependency list: " + depList.get( 0 ).getDependency() ); return; } @@ -374,13 +375,15 @@ public class DependencyConvergenceReport for ( DependencyNode projectNode : projectNodes ) { - if (isReactorBuild()){ + if ( isReactorBuild() ) + { sink.numberedListItem(); } showVersionDetails( projectNode, depList, sink ); - if (isReactorBuild()){ + if ( isReactorBuild() ) + { sink.numberedListItem_(); } @@ -399,7 +402,7 @@ public class DependencyConvergenceReport MavenProject project = depLink.getProject(); DependencyNode projectNode = this.projectMap.get( project ); - if ( projectNode != null && !projectNodes.contains( projectNode )) + if ( projectNode != null && !projectNodes.contains( projectNode ) ) { projectNodes.add( projectNode ); } @@ -409,14 +412,17 @@ public class DependencyConvergenceReport private void showVersionDetails( DependencyNode projectNode, List<ReverseDependencyLink> depList, Sink sink ) { - if (depList == null || depList.isEmpty() ){ + if ( depList == null || depList.isEmpty() ) + { return; } Dependency dependency = depList.get( 0 ).getDependency(); - String key = dependency.getGroupId() + ":" + dependency.getArtifactId() + ":" + dependency.getType() + ":" + dependency.getVersion(); + String key = + dependency.getGroupId() + ":" + dependency.getArtifactId() + ":" + dependency.getType() + ":" + + dependency.getVersion(); - serializeDependencyTree(projectNode, key, sink); + serializeDependencyTree( projectNode, key, sink ); } @@ -432,7 +438,7 @@ public class DependencyConvergenceReport visitor = new BuildingDependencyNodeVisitor( visitor ); - DependencyNodeFilter filter = createDependencyNodeFilter(key); + DependencyNodeFilter filter = createDependencyNodeFilter( key ); if ( filter != null ) { @@ -453,7 +459,7 @@ public class DependencyConvergenceReport * * @return the dependency node filter, or <code>null</code> if none required */ - private DependencyNodeFilter createDependencyNodeFilter(String includes) + private DependencyNodeFilter createDependencyNodeFilter( String includes ) { List<DependencyNodeFilter> filters = new ArrayList<DependencyNodeFilter>(); @@ -721,9 +727,9 @@ public class DependencyConvergenceReport } /** - * Produce a DependencyAnalyzeResult, it contains conflicting dependencies map, snapshot dependencies map and all dependencies map. - * Map structure is the relationships between dependencies (its groupId:artifactId) and reactor projects. This is the - * structure of the Map: + * Produce a DependencyAnalyzeResult, it contains conflicting dependencies map, snapshot dependencies map and all + * dependencies map. Map structure is the relationships between dependencies (its groupId:artifactId) and reactor + * projects. This is the structure of the Map: * * <pre> * +--------------------+----------------------------------+---------------| @@ -737,7 +743,8 @@ public class DependencyConvergenceReport * +--------------------+--------------------------------------------------| * </pre> * - * @return DependencyAnalyzeResult contains conflicting dependencies map, snapshot dependencies map and all dependencies map. + * @return DependencyAnalyzeResult contains conflicting dependencies map, snapshot dependencies map and all + * dependencies map. * @throws MavenReportException */ private DependencyAnalyzeResult analyzeDependencyTree() @@ -766,7 +773,8 @@ public class DependencyConvergenceReport * * @param conflictingDependencyMap * @param allDependencies - * @return DependencyAnalyzeResult contains conflicting dependencies map, snapshot dependencies map and all dependencies map. + * @return DependencyAnalyzeResult contains conflicting dependencies map, snapshot dependencies map and all + * dependencies map. */ private DependencyAnalyzeResult populateDependencyAnalyzeResult( Map<String, List<ReverseDependencyLink>> conflictingDependencyMap, Map<String, List<ReverseDependencyLink>> allDependencies ) @@ -808,12 +816,11 @@ public class DependencyConvergenceReport dependencyList = new ArrayList<ReverseDependencyLink>(); } - dependencyList.add( new ReverseDependencyLink( toDependency( dependencyNode.getArtifact() ), - reactorProject ) ); + dependencyList.add( new ReverseDependencyLink( toDependency( dependencyNode.getArtifact() ), reactorProject ) ); for ( DependencyNode workNode : nodes.subList( 1, nodes.size() ) ) { - dependencyList.add( new ReverseDependencyLink( toDependency( workNode.getArtifact() ), reactorProject) ); + dependencyList.add( new ReverseDependencyLink( toDependency( workNode.getArtifact() ), reactorProject ) ); } conflictingDependencyMap.put( key, dependencyList ); 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=1637570&r1=1637569&r2=1637570&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 Sat Nov 8 14:42:36 2014 @@ -169,11 +169,11 @@ public class MailingListsReport if ( otherArchives ) { - tableHeader( new String[]{ name, subscribe, unsubscribe, post, archive, archivesOther } ); + tableHeader( new String[] { name, subscribe, unsubscribe, post, archive, archivesOther } ); } else { - tableHeader( new String[]{ name, subscribe, unsubscribe, post, archive } ); + tableHeader( new String[] { name, subscribe, unsubscribe, post, archive } ); } for ( MailingList mailingList : model.getMailingLists() ) @@ -214,7 +214,7 @@ public class MailingListsReport textRow.add( createLinkPatternedText( getArchiveServer( otherArchive ), otherArchive ) ); - tableRow(textRow.toArray(new String[textRow.size()])); + tableRow( textRow.toArray( new String[textRow.size()] ) ); // Other lines... while ( it.hasNext() ) @@ -241,7 +241,7 @@ public class MailingListsReport textRow.add( createLinkPatternedText( getArchiveServer( otherArchive ), otherArchive ) ); - tableRow(textRow.toArray(new String[textRow.size()])); + tableRow( textRow.toArray( new String[textRow.size()] ) ); } } else @@ -251,7 +251,7 @@ public class MailingListsReport textRow.add( null ); } - tableRow(textRow.toArray(new String[textRow.size()])); + tableRow( textRow.toArray( new String[textRow.size()] ) ); } } @@ -261,10 +261,8 @@ public class MailingListsReport } /** - * Convenience method to return the name of a web-based mailing list archive - * server. <br> - * For instance, if the archive uri is - * <code>http://www.mail-archive.com/dev@maven.apache.org</code>, this + * Convenience method to return the name of a web-based mailing list archive server. <br> + * For instance, if the archive uri is <code>http://www.mail-archive.com/dev@maven.apache.org</code>, this * method return <code>www.mail-archive.com</code> * * @param uri 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=1637570&r1=1637569&r2=1637570&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 Sat Nov 8 14:42:36 2014 @@ -51,7 +51,6 @@ import org.apache.maven.artifact.reposit import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectBuilder; import org.apache.maven.project.ProjectBuildingException; -import org.apache.maven.reporting.AbstractMavenReportRenderer; import org.apache.maven.settings.Proxy; import org.apache.maven.settings.Server; import org.apache.maven.settings.Settings; 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=1637570&r1=1637569&r2=1637570&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 Sat Nov 8 14:42:36 2014 @@ -322,7 +322,9 @@ public class ScmReport /** * Render the anonymous access section depending the repository. - * <p>Note: ClearCase, Starteam et Perforce seems to have no anonymous access.</p> + * <p> + * Note: ClearCase, Starteam et Perforce seems to have no anonymous access. + * </p> * * @param anonymousRepository the anonymous repository */ @@ -338,29 +340,28 @@ public class ScmReport if ( anonymousRepository != null && isScmSystem( anonymousRepository, "cvs" ) ) { - CvsScmProviderRepository cvsRepo = (CvsScmProviderRepository) anonymousRepository - .getProviderRepository(); + CvsScmProviderRepository cvsRepo = + (CvsScmProviderRepository) anonymousRepository.getProviderRepository(); anonymousAccessCVS( cvsRepo ); } else if ( anonymousRepository != null && isScmSystem( anonymousRepository, "git" ) ) { - GitScmProviderRepository gitRepo = (GitScmProviderRepository) anonymousRepository - .getProviderRepository(); + GitScmProviderRepository gitRepo = + (GitScmProviderRepository) anonymousRepository.getProviderRepository(); anonymousAccessGit( gitRepo ); } else if ( anonymousRepository != null && isScmSystem( anonymousRepository, "hg" ) ) { - HgScmProviderRepository hgRepo = (HgScmProviderRepository) anonymousRepository - .getProviderRepository(); + HgScmProviderRepository hgRepo = (HgScmProviderRepository) anonymousRepository.getProviderRepository(); anonymousAccessMercurial( hgRepo ); } else if ( anonymousRepository != null && isScmSystem( anonymousRepository, "svn" ) ) { - SvnScmProviderRepository svnRepo = (SvnScmProviderRepository) anonymousRepository - .getProviderRepository(); + SvnScmProviderRepository svnRepo = + (SvnScmProviderRepository) anonymousRepository.getProviderRepository(); anonymousAccessSVN( svnRepo ); } @@ -412,15 +413,15 @@ public class ScmReport } else if ( devRepository != null && isScmSystem( devRepository, "perforce" ) ) { - PerforceScmProviderRepository perforceRepo = (PerforceScmProviderRepository) devRepository - .getProviderRepository(); + PerforceScmProviderRepository perforceRepo = + (PerforceScmProviderRepository) devRepository.getProviderRepository(); developerAccessPerforce( perforceRepo ); } else if ( devRepository != null && isScmSystem( devRepository, "starteam" ) ) { - StarteamScmProviderRepository starteamRepo = (StarteamScmProviderRepository) devRepository - .getProviderRepository(); + StarteamScmProviderRepository starteamRepo = + (StarteamScmProviderRepository) devRepository.getProviderRepository(); developerAccessStarteam( starteamRepo ); } @@ -455,7 +456,7 @@ public class ScmReport paragraph( getI18nString( "accessbehindfirewall.svn.intro" ) ); - verbatimText("$ svn checkout " + svnRepo.getUrl() + " " + checkoutDirectoryName); + verbatimText( "$ svn checkout " + svnRepo.getUrl() + " " + checkoutDirectoryName ); } else if ( devRepository != null && isScmSystem( devRepository, "cvs" ) ) { @@ -495,9 +496,11 @@ public class ScmReport // Clearcase /** - * Create the documentation to provide an developer access with a <code>Clearcase</code> SCM. - * For example, generate the following command line: - * <p>cleartool checkout module</p> + * Create the documentation to provide an developer access with a <code>Clearcase</code> SCM. For example, + * generate the following command line: + * <p> + * cleartool checkout module + * </p> */ private void developerAccessClearCase() { @@ -509,13 +512,18 @@ public class ScmReport // CVS /** - * Create the documentation to provide an anonymous access with a <code>CVS</code> SCM. - * For example, generate the following command line: - * <p>cvs -d :pserver:anon...@cvs.apache.org:/home/cvspublic login</p> - * <p>cvs -z3 -d :pserver:anon...@cvs.apache.org:/home/cvspublic co maven-plugins/dist</p> + * Create the documentation to provide an anonymous access with a <code>CVS</code> SCM. For example, generate + * the following command line: + * <p> + * cvs -d :pserver:anon...@cvs.apache.org:/home/cvspublic login + * </p> + * <p> + * cvs -z3 -d :pserver:anon...@cvs.apache.org:/home/cvspublic co maven-plugins/dist + * </p> * * @param cvsRepo - * @see <a href="https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115">https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115</a> + * @see <a + * href="https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115">https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115</a> */ private void anonymousAccessCVS( CvsScmProviderRepository cvsRepo ) { @@ -543,9 +551,11 @@ public class ScmReport } /** - * Create the documentation to provide an anonymous access with a <code>Git</code> SCM. - * For example, generate the following command line: - * <p>git clone uri</p> + * Create the documentation to provide an anonymous access with a <code>Git</code> SCM. For example, generate + * the following command line: + * <p> + * git clone uri + * </p> * * @param gitRepo */ @@ -561,9 +571,11 @@ public class ScmReport // Mercurial /** - * Create the documentation to provide an anonymous access with a <code>Mercurial</code> SCM. - * For example, generate the following command line: - * <p>hg clone uri</p> + * Create the documentation to provide an anonymous access with a <code>Mercurial</code> SCM. For example, + * generate the following command line: + * <p> + * hg clone uri + * </p> * * @param hgRepo */ @@ -577,13 +589,18 @@ public class ScmReport } /** - * Create the documentation to provide an developer access with a <code>CVS</code> SCM. - * For example, generate the following command line: - * <p>cvs -d :pserver:usern...@cvs.apache.org:/home/cvs login</p> - * <p>cvs -z3 -d :ext:usern...@cvs.apache.org:/home/cvs co maven-plugins/dist</p> + * Create the documentation to provide an developer access with a <code>CVS</code> SCM. For example, generate + * the following command line: + * <p> + * cvs -d :pserver:usern...@cvs.apache.org:/home/cvs login + * </p> + * <p> + * cvs -z3 -d :ext:usern...@cvs.apache.org:/home/cvs co maven-plugins/dist + * </p> * * @param cvsRepo - * @see <a href="https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115">https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115</a> + * @see <a + * href="https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115">https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115</a> */ private void developerAccessCVS( CvsScmProviderRepository cvsRepo ) { @@ -599,9 +616,11 @@ public class ScmReport // Git /** - * Create the documentation to provide an developer access with a <code>Git</code> SCM. - * For example, generate the following command line: - * <p>git clone repo </p> + * Create the documentation to provide an developer access with a <code>Git</code> SCM. For example, generate + * the following command line: + * <p> + * git clone repo + * </p> * * @param gitRepo */ @@ -617,9 +636,11 @@ public class ScmReport // Mercurial /** - * Create the documentation to provide an developer access with a <code>Mercurial</code> SCM. - * For example, generate the following command line: - * <p>hg clone repo </p> + * Create the documentation to provide an developer access with a <code>Mercurial</code> SCM. For example, + * generate the following command line: + * <p> + * hg clone repo + * </p> * * @param hgRepo */ @@ -635,13 +656,19 @@ public class ScmReport // Perforce /** - * Create the documentation to provide an developer access with a <code>Perforce</code> SCM. - * For example, generate the following command line: - * <p>p4 -H hostname -p port -u username -P password path</p> - * <p>p4 -H hostname -p port -u username -P password path submit -c changement</p> + * Create the documentation to provide an developer access with a <code>Perforce</code> SCM. For example, + * generate the following command line: + * <p> + * p4 -H hostname -p port -u username -P password path + * </p> + * <p> + * p4 -H hostname -p port -u username -P password path submit -c changement + * </p> * * @param perforceRepo - * @see <a href="http://www.perforce.com/perforce/doc.051/manuals/cmdref/index.html">http://www.perforce.com/perforce/doc.051/manuals/cmdref/index.html</> + * @see <a + * href="http://www.perforce.com/perforce/doc.051/manuals/cmdref/index.html">http://www.perforce.com/perforce + * /doc.051/manuals/cmdref/index.html</> */ private void developerAccessPerforce( PerforceScmProviderRepository perforceRepo ) { @@ -670,10 +697,14 @@ public class ScmReport // Starteam /** - * Create the documentation to provide an developer access with a <code>Starteam</code> SCM. - * For example, generate the following command line: - * <p>stcmd co -x -nologo -stop -p myusername:mypassword@myhost:1234/projecturl -is</p> - * <p>stcmd ci -x -nologo -stop -p myusername:mypassword@myhost:1234/projecturl -f NCI -is</p> + * Create the documentation to provide an developer access with a <code>Starteam</code> SCM. For example, + * generate the following command line: + * <p> + * stcmd co -x -nologo -stop -p myusername:mypassword@myhost:1234/projecturl -is + * </p> + * <p> + * stcmd ci -x -nologo -stop -p myusername:mypassword@myhost:1234/projecturl -f NCI -is + * </p> * * @param starteamRepo */ @@ -701,9 +732,11 @@ public class ScmReport // SVN /** - * Create the documentation to provide an anonymous access with a <code>SVN</code> SCM. - * For example, generate the following command line: - * <p>svn checkout http://svn.apache.org/repos/asf/maven/components/trunk maven</p> + * Create the documentation to provide an anonymous access with a <code>SVN</code> SCM. For example, generate + * the following command line: + * <p> + * svn checkout http://svn.apache.org/repos/asf/maven/components/trunk maven + * </p> * * @param svnRepo * @see <a href="http://svnbook.red-bean.com/">http://svnbook.red-bean.com/</a> @@ -716,10 +749,14 @@ public class ScmReport } /** - * Create the documentation to provide an developer access with a <code>SVN</code> SCM. - * For example, generate the following command line: - * <p>svn checkout https://svn.apache.org/repos/asf/maven/components/trunk maven</p> - * <p>svn commit --username your-username -m "A message"</p> + * Create the documentation to provide an developer access with a <code>SVN</code> SCM. For example, generate + * the following command line: + * <p> + * svn checkout https://svn.apache.org/repos/asf/maven/components/trunk maven + * </p> + * <p> + * svn commit --username your-username -m "A message" + * </p> * * @param svnRepo * @see <a href="http://svnbook.red-bean.com/">http://svnbook.red-bean.com/</a> 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=1637570&r1=1637569&r2=1637570&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 Sat Nov 8 14:42:36 2014 @@ -53,12 +53,11 @@ public class TeamListReport extends AbstractProjectInfoReport { /** - * Shows avatar images for team members that have - * a) properties/picUrl set - * b) An avatar at gravatar.com for their email address + * Shows avatar images for team members that have a) properties/picUrl set b) An avatar at gravatar.com for their + * email address * <p/> - * Future versions of this plugin may choose to implement different strategies for resolving - * avatar images, possibly using different providers. + * Future versions of this plugin may choose to implement different strategies for resolving avatar images, possibly + * using different providers. * * @since 2.6 */ @@ -72,8 +71,8 @@ public class TeamListReport @Override public void executeReport( Locale locale ) { - TeamListRenderer r = new TeamListRenderer( getSink(), project.getModel(), getI18N( locale ), locale, getLog(), - showAvatarImages ); + TeamListRenderer r = + new TeamListRenderer( getSink(), project.getModel(), getI18N( locale ), locale, getLog(), showAvatarImages ); r.render(); } @@ -158,11 +157,9 @@ public class TeamListReport 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 ); - javascript.append( " var developerDate = new Date(developerTime);" ).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( " document.getElementById(id).innerHTML = developerDate;" ).append( SystemUtils.LINE_SEPARATOR ); javascript.append( "}" ).append( SystemUtils.LINE_SEPARATOR ); javascript.append( SystemUtils.LINE_SEPARATOR ); javascript.append( "function init(){" ).append( SystemUtils.LINE_SEPARATOR ); @@ -239,8 +236,7 @@ public class TeamListReport } // To handle JS - javascript.append( "}" ).append( SystemUtils.LINE_SEPARATOR ).append( SystemUtils.LINE_SEPARATOR ).append( - "window.onLoad = init();" ).append( SystemUtils.LINE_SEPARATOR ); + javascript.append( "}" ).append( SystemUtils.LINE_SEPARATOR ).append( SystemUtils.LINE_SEPARATOR ).append( "window.onLoad = init();" ).append( SystemUtils.LINE_SEPARATOR ); javaScript( javascript.toString() ); endSection(); @@ -261,7 +257,7 @@ public class TeamListReport { picUrl = getGravatarUrl( member.getEmail() ); } - if (StringUtils.isEmpty( picUrl )) + if ( StringUtils.isEmpty( picUrl ) ) { picUrl = getSpacerGravatarUrl(); } @@ -314,7 +310,7 @@ public class TeamListReport { // Comma separated roles List<String> var = member.getRoles(); - tableCell( StringUtils.join(var.toArray(new String[var.size()]), ", " ) ); + tableCell( StringUtils.join( var.toArray( new String[var.size()] ), ", " ) ); } else { @@ -325,8 +321,8 @@ public class TeamListReport { tableCell( member.getTimezone() ); - if ( StringUtils.isNotEmpty( member.getTimezone() ) && ( !ProjectInfoReportUtils.isNumber( - member.getTimezone().trim() ) ) ) + if ( StringUtils.isNotEmpty( member.getTimezone() ) + && ( !ProjectInfoReportUtils.isNumber( member.getTimezone().trim() ) ) ) { String tz = member.getTimezone().trim(); try @@ -337,9 +333,9 @@ public class TeamListReport sink.tableCell(); sink.rawText( "<span id=\"" + type + "-" + rowId + "\">" ); text( tz ); - String offSet = String.valueOf( TimeZone.getTimeZone( tz ).getRawOffset() / 3600000 ); - javascript.append( " offsetDate('" ).append( type ).append( "-" ).append( rowId ).append( - "', '" ); + final long oneHoursInMilliSeconds = 3600000; + String offSet = String.valueOf( TimeZone.getTimeZone( tz ).getRawOffset() / oneHoursInMilliSeconds ); + javascript.append( " offsetDate('" ).append( type ).append( "-" ).append( rowId ).append( "', '" ); javascript.append( offSet ).append( "');" ).append( SystemUtils.LINE_SEPARATOR ); sink.rawText( "</span>" ); sink.tableCell_(); @@ -347,7 +343,7 @@ public class TeamListReport catch ( IllegalArgumentException e ) { log.warn( "The time zone '" + tz + "' for the " + type + " '" + member.getName() - + "' is not a recognised time zone, use a number in the range -12 and +14 instead of." ); + + "' is not a recognised time zone, use a number in the range -12 and +14 instead of." ); sink.tableCell(); sink.rawText( "<span id=\"" + type + "-" + rowId + "\">" ); @@ -368,21 +364,21 @@ public class TeamListReport else { // check if number is between -12 and +14 + final int lowerLimit = -12; + final int upperLimit = 14; float tz = ProjectInfoReportUtils.toFloat( member.getTimezone().trim(), Integer.MIN_VALUE ); - if ( tz == Integer.MIN_VALUE || !( tz >= -12 && tz <= 14 ) ) + if ( tz == Integer.MIN_VALUE || !( tz >= lowerLimit && tz <= upperLimit ) ) { text( null ); log.warn( "The time zone '" + member.getTimezone().trim() + "' for the " + type + " '" - + member.getName() - + "' is not a recognised time zone, use a number in the range -12 to +14 instead of." ); + + member.getName() + + "' is not a recognised time zone, use a number in the range -12 to +14 instead of." ); } else { text( member.getTimezone().trim() ); - javascript.append( " offsetDate('" ).append( type ).append( "-" ).append( rowId ).append( - "', '" ); - javascript.append( member.getTimezone() ).append( "');" ).append( - SystemUtils.LINE_SEPARATOR ); + javascript.append( " offsetDate('" ).append( type ).append( "-" ).append( rowId ).append( "', '" ); + javascript.append( member.getTimezone() ).append( "');" ).append( SystemUtils.LINE_SEPARATOR ); } } sink.rawText( "</span>" ); @@ -406,11 +402,11 @@ public class TeamListReport sink.tableRow_(); } - private static final String avatar_size = "s=60"; + private static final String AVATAR_SIZE = "s=60"; private String getSpacerGravatarUrl() { - return "http://www.gravatar.com/avatar/00000000000000000000000000000000?d=blank&f=y&" + avatar_size; + return "http://www.gravatar.com/avatar/00000000000000000000000000000000?d=blank&f=y&" + AVATAR_SIZE; } private String getGravatarUrl( String email ) @@ -428,11 +424,12 @@ public class TeamListReport md.update( email.getBytes() ); byte byteData[] = md.digest(); StringBuilder sb = new StringBuilder(); + final int lowerEightBitsOnly = 0xff; for ( byte aByteData : byteData ) { - sb.append( Integer.toString( ( aByteData & 0xff ) + 0x100, 16 ).substring( 1 ) ); + sb.append( Integer.toString( ( aByteData & lowerEightBitsOnly ) + 0x100, 16 ).substring( 1 ) ); } - return "http://www.gravatar.com/avatar/" + sb.toString() + "?d=mm&" + avatar_size; + return "http://www.gravatar.com/avatar/" + sb.toString() + "?d=mm&" + AVATAR_SIZE; } catch ( NoSuchAlgorithmException e ) { @@ -466,12 +463,12 @@ public class TeamListReport String timeZone = getI18nString( "contributors.timezone" ); String actualTime = getI18nString( "contributors.actualtime" ); String properties = getI18nString( "contributors.properties" ); - if ( requiredHeaders.get( IMAGE ) == Boolean.TRUE && showAvatarImages) + if ( requiredHeaders.get( IMAGE ) == Boolean.TRUE && showAvatarImages ) { requiredArray.add( image ); } - setRequiredArray( requiredHeaders, requiredArray, image, name, email, url, organization, organizationUrl, roles, - timeZone, actualTime, properties ); + setRequiredArray( requiredHeaders, requiredArray, image, name, email, url, organization, organizationUrl, + roles, timeZone, actualTime, properties ); return requiredArray.toArray( new String[requiredArray.size()] ); } @@ -496,7 +493,7 @@ public class TeamListReport String actualTime = getI18nString( "developers.actualtime" ); String properties = getI18nString( "developers.properties" ); - if ( requiredHeaders.get( IMAGE ) == Boolean.TRUE && showAvatarImages) + if ( requiredHeaders.get( IMAGE ) == Boolean.TRUE && showAvatarImages ) { requiredArray.add( image ); } @@ -505,8 +502,8 @@ public class TeamListReport requiredArray.add( id ); } - setRequiredArray( requiredHeaders, requiredArray, image, name, email, url, organization, organizationUrl, roles, - timeZone, actualTime, properties ); + setRequiredArray( requiredHeaders, requiredArray, image, name, email, url, organization, organizationUrl, + roles, timeZone, actualTime, properties ); return requiredArray.toArray( new String[requiredArray.size()] ); } @@ -526,8 +523,9 @@ public class TeamListReport * @param properties */ private void setRequiredArray( Map<String, Boolean> requiredHeaders, List<String> requiredArray, String image, - String name, String email, String url, String organization, String organizationUrl, - String roles, String timeZone, String actualTime, String properties ) + String name, String email, String url, String organization, + String organizationUrl, String roles, String timeZone, String actualTime, + String properties ) { if ( requiredHeaders.get( NAME ) == Boolean.TRUE ) { Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java?rev=1637570&r1=1637569&r2=1637570&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java Sat Nov 8 14:42:36 2014 @@ -9,7 +9,7 @@ package org.apache.maven.report.projecti * "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 + * 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 @@ -18,11 +18,7 @@ package org.apache.maven.report.projecti * specific language governing permissions and limitations * under the License. */ -/** - * @author Simon Wang - * @version $Id$ - * @since 2.8 - */ + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -32,9 +28,13 @@ import org.apache.maven.artifact.Artifac import org.apache.maven.shared.dependency.tree.DependencyNode; import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor; - - -public class DependencyVersionMap implements DependencyNodeVisitor +/** + * @author Simon Wang + * @version $Id$ + * @since 2.8 + */ +public class DependencyVersionMap + implements DependencyNodeVisitor { private boolean uniqueVersions; Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java?rev=1637570&r1=1637569&r2=1637570&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java Sat Nov 8 14:42:36 2014 @@ -9,7 +9,7 @@ package org.apache.maven.report.projecti * "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 + * 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 @@ -25,11 +25,9 @@ import org.apache.maven.doxia.sink.Sink; import org.apache.maven.shared.dependency.tree.DependencyNode; import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor; - - /** - * A dependency node visitor that serializes visited nodes to a sink writer. - * It's used to serialize tree in project information report page. + * A dependency node visitor that serializes visited nodes to a sink writer. It's used to serialize tree in project + * information report page. * * @author <a href="mailto:wangyf2...@gmail.com">Simon Wang</a> */ @@ -52,10 +50,13 @@ public class SinkSerializingDependencyNo public void addNodeIndent( boolean last ) { - if (last){ + if ( last ) + { sink.text( "\\-" ); sink.nonBreakingSpace(); - }else{ + } + else + { sink.text( "+-" ); sink.nonBreakingSpace(); } @@ -63,11 +64,14 @@ public class SinkSerializingDependencyNo public void fillIndent( boolean last ) { - if (last){ + if ( last ) + { sink.nonBreakingSpace(); sink.nonBreakingSpace(); sink.nonBreakingSpace(); - }else{ + } + else + { sink.text( "|" ); sink.nonBreakingSpace(); sink.nonBreakingSpace(); @@ -85,7 +89,7 @@ public class SinkSerializingDependencyNo /** * The tokens to use when serializing the dependency tree. */ - private final TreeTokens tokens ; + private final TreeTokens tokens; /** * The depth of the currently visited dependency node. @@ -98,15 +102,13 @@ public class SinkSerializingDependencyNo * Creates a dependency node visitor that serializes visited nodes to the specified writer using the specified * tokens. * - * @param sink - * the writer to serialize to - * @param tokens - * the tokens to use when serializing the dependency tree + * @param sink the writer to serialize to + * @param tokens the tokens to use when serializing the dependency tree */ public SinkSerializingDependencyNodeVisitor( Sink sink ) { this.sink = sink; - this.tokens = new TreeTokens(sink); + this.tokens = new TreeTokens( sink ); depth = 0; } @@ -142,8 +144,7 @@ public class SinkSerializingDependencyNo /** * Writes the necessary tokens to indent the specified dependency node to this visitor's writer. * - * @param node - * the dependency node to indent + * @param node the dependency node to indent */ private void indent( DependencyNode node ) { @@ -161,8 +162,7 @@ public class SinkSerializingDependencyNo /** * Gets whether the specified dependency node is the last of its siblings. * - * @param node - * the dependency node to check + * @param node the dependency node to check * @return <code>true</code> if the specified dependency node is the last of its last siblings */ private boolean isLast( DependencyNode node ) @@ -190,10 +190,8 @@ public class SinkSerializingDependencyNo /** * Gets whether the specified dependency node ancestor is the last of its siblings. * - * @param node - * the dependency node whose ancestor to check - * @param ancestorDepth - * the depth of the ancestor of the specified dependency node to check + * @param node the dependency node whose ancestor to check + * @param ancestorDepth the depth of the ancestor of the specified dependency node to check * @return <code>true</code> if the specified dependency node ancestor is the last of its siblings */ private boolean isLast( DependencyNode node, int ancestorDepth ) Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java?rev=1637570&r1=1637569&r2=1637570&view=diff ============================================================================== --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java (original) +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java Sat Nov 8 14:42:36 2014 @@ -156,7 +156,19 @@ public class DependenciesRenderer jarSubtype.add( "ejb" ); JAR_SUBTYPE = Collections.unmodifiableSet( jarSubtype ); - JAVASCRIPT = "<script language=\"javascript\" type=\"text/javascript\">" + SystemUtils.LINE_SEPARATOR + " function toggleDependencyDetail( divId, imgId )" + SystemUtils.LINE_SEPARATOR + " {" + SystemUtils.LINE_SEPARATOR + " var div = document.getElementById( divId );" + SystemUtils.LINE_SEPARATOR + " var img = document.getElementById( imgId );" + SystemUtils.LINE_SEPARATOR + " if( div.style.display == '' )" + SystemUtils.LINE_SEPARATOR + " {" + SystemUtils.LINE_SEPARATOR + " div.style.display = 'none';" + SystemUtils.LINE_SEPARATOR + " img.src='" + IMG_INFO_URL + "';" + SystemUtils.LINE_SEPARATOR + " }" + SystemUtils.LINE_SEPARATOR + " else" + SystemUtils.LINE_SEPARATOR + " {" + SystemUtils.LINE_SEPARATOR + " div.style.display = '';" + SystemUtils.LINE_SEPARATOR + " img.src='" + IMG_CLOSE_URL + "';" + SystemUtils.LINE_SEPARATOR + " }" + SystemUtils.LINE_SEPARATOR + " }" + SystemUtils.LINE_SEPARATOR + "</script>" + SystemUtils.LINE_SEPARATOR; + JAVASCRIPT = + "<script language=\"javascript\" type=\"text/javascript\">" + SystemUtils.LINE_SEPARATOR + + " function toggleDependencyDetail( divId, imgId )" + SystemUtils.LINE_SEPARATOR + " {" + + SystemUtils.LINE_SEPARATOR + " var div = document.getElementById( divId );" + + SystemUtils.LINE_SEPARATOR + " var img = document.getElementById( imgId );" + + SystemUtils.LINE_SEPARATOR + " if( div.style.display == '' )" + SystemUtils.LINE_SEPARATOR + + " {" + SystemUtils.LINE_SEPARATOR + " div.style.display = 'none';" + + SystemUtils.LINE_SEPARATOR + " img.src='" + IMG_INFO_URL + "';" + SystemUtils.LINE_SEPARATOR + + " }" + SystemUtils.LINE_SEPARATOR + " else" + SystemUtils.LINE_SEPARATOR + " {" + + SystemUtils.LINE_SEPARATOR + " div.style.display = '';" + SystemUtils.LINE_SEPARATOR + + " img.src='" + IMG_CLOSE_URL + "';" + SystemUtils.LINE_SEPARATOR + " }" + + SystemUtils.LINE_SEPARATOR + " }" + SystemUtils.LINE_SEPARATOR + "</script>" + + SystemUtils.LINE_SEPARATOR; } /** @@ -528,12 +540,12 @@ public class DependenciesRenderer if ( hasSealed ) { tableHeader = new String[] { filename, size, entries, classes, packages, jdkrev, debugInformation, sealed }; - tableHeaderTitles = new String[] {null, null, null, null, null, null, debugInformationTitle, null}; + tableHeaderTitles = new String[] { null, null, null, null, null, null, debugInformationTitle, null }; } else { tableHeader = new String[] { filename, size, entries, classes, packages, jdkrev, debugInformation }; - tableHeaderTitles = new String[] {null, null, null, null, null, null, debugInformationTitle}; + tableHeaderTitles = new String[] { null, null, null, null, null, null, debugInformationTitle }; } tableHeader( tableHeader, tableHeaderTitles ); @@ -648,14 +660,20 @@ public class DependenciesRenderer if ( content != null ) { if ( titles != null && content.length != titles.length ) + { throw new IllegalArgumentException( "Length of title array must equal the length of the content array" ); + } for ( int i = 0; i < content.length; i++ ) { if ( titles != null ) + { tableHeaderCell( content[i], titles[i] ); + } else + { tableHeaderCell( content[i] ); + } } } @@ -1362,7 +1380,7 @@ public class DependenciesRenderer sink.link_(); sink.tableCell_(); - totalByRepo.put( repokey, old.intValue() + 1); + totalByRepo.put( repokey, old.intValue() + 1 ); } else { @@ -1501,7 +1519,8 @@ public class DependenciesRenderer * * @see <a href="https://en.wikipedia.org/wiki/Metric_prefix">https://en.wikipedia.org/wiki/Metric_prefix</a> * @see <a href="https://en.wikipedia.org/wiki/Binary_prefix">https://en.wikipedia.org/wiki/Binary_prefix</a> - * @see <a href="https://en.wikipedia.org/wiki/Octet_%28computing%29">https://en.wikipedia.org/wiki/Octet_(computing)</a> + * @see <a + * href="https://en.wikipedia.org/wiki/Octet_%28computing%29">https://en.wikipedia.org/wiki/Octet_(computing)</a> */ static class FileDecimalFormat extends DecimalFormat