You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2008/07/25 01:43:52 UTC
svn commit: r679614 - in
/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo:
./ dependencies/renderer/
Author: vsiveton
Date: Thu Jul 24 16:43:50 2008
New Revision: 679614
URL: http://svn.apache.org/viewvc?rev=679614&view=rev
Log:
o fixed checkstyle
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.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/dependencies/renderer/DependenciesRenderer.java
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java?rev=679614&r1=679613&r2=679614&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java Thu Jul 24 16:43:50 2008
@@ -285,7 +285,8 @@
if ( resourceList != null )
{
- LineNumberReader reader = new LineNumberReader( new InputStreamReader( resourceList, ReaderFactory.US_ASCII ) );
+ LineNumberReader reader =
+ new LineNumberReader( new InputStreamReader( resourceList, ReaderFactory.US_ASCII ) );
String line = reader.readLine();
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=679614&r1=679613&r2=679614&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 Thu Jul 24 16:43:50 2008
@@ -146,9 +146,9 @@
* @param artifactFactory
* @param localRepository
*/
- public PluginManagementRenderer( Log log, Sink sink, Locale locale, I18N i18n, List plugins, MavenProject project,
- MavenProjectBuilder mavenProjectBuilder, ArtifactFactory artifactFactory,
- ArtifactRepository localRepository )
+ public PluginManagementRenderer( Log log, Sink sink, Locale locale, I18N i18n, List plugins,
+ MavenProject project, MavenProjectBuilder mavenProjectBuilder,
+ ArtifactFactory artifactFactory, ArtifactRepository localRepository )
{
super( sink );
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=679614&r1=679613&r2=679614&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 Thu Jul 24 16:43:50 2008
@@ -148,9 +148,9 @@
* @param artifactFactory
* @param localRepository
*/
- public PluginsRenderer( Log log, Sink sink, Locale locale, I18N i18n, Set plugins, Set reports, MavenProject project,
- MavenProjectBuilder mavenProjectBuilder, ArtifactFactory artifactFactory,
- ArtifactRepository localRepository )
+ public PluginsRenderer( Log log, Sink sink, Locale locale, I18N i18n, Set plugins, Set reports,
+ MavenProject project, MavenProjectBuilder mavenProjectBuilder,
+ ArtifactFactory artifactFactory, ArtifactRepository localRepository )
{
super( sink );
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=679614&r1=679613&r2=679614&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 Thu Jul 24 16:43:50 2008
@@ -188,7 +188,7 @@
* @param artifactId not null
* @param link could be null
* @return the artifactId cell with or without a link pattern
- * @see {@link org.apache.maven.reporting.AbstractMavenReportRenderer#linkPatternedText(String)}
+ * @see AbstractMavenReportRenderer#linkPatternedText(String)
*/
public static String getArtifactIdCell( String artifactId, String link )
{
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=679614&r1=679613&r2=679614&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 Thu Jul 24 16:43:50 2008
@@ -403,9 +403,9 @@
String debug = getReportString( "report.dependencies.file.details.column.debug" );
String sealed = getReportString( "report.dependencies.file.details.column.sealed" );
- int[] justification = new int[]{Parser.JUSTIFY_LEFT, Parser.JUSTIFY_RIGHT, Parser.JUSTIFY_RIGHT,
- Parser.JUSTIFY_RIGHT, Parser.JUSTIFY_RIGHT, Parser.JUSTIFY_CENTER, Parser.JUSTIFY_CENTER,
- Parser.JUSTIFY_CENTER};
+ int[] justification =
+ new int[] { Parser.JUSTIFY_LEFT, Parser.JUSTIFY_RIGHT, Parser.JUSTIFY_RIGHT, Parser.JUSTIFY_RIGHT,
+ Parser.JUSTIFY_RIGHT, Parser.JUSTIFY_CENTER, Parser.JUSTIFY_CENTER, Parser.JUSTIFY_CENTER };
startTable();
@@ -415,7 +415,7 @@
TotalCell totaldepsize = new TotalCell( fileLengthDecimalFormat );
TotalCell totalentries = new TotalCell( DEFAULT_DECIMAL_FORMAT );
TotalCell totalclasses = new TotalCell( DEFAULT_DECIMAL_FORMAT );
- TotalCell totalpackages = new TotalCell( DEFAULT_DECIMAL_FORMAT );
+ TotalCell totalpackages = new TotalCell( DEFAULT_DECIMAL_FORMAT );
double highestjdk = 0.0;
TotalCell totaldebug = new TotalCell( DEFAULT_DECIMAL_FORMAT );
TotalCell totalsealed = new TotalCell( DEFAULT_DECIMAL_FORMAT );
@@ -423,7 +423,6 @@
boolean hasSealed = hasSealed( alldeps );
// Table header
-
String[] tableHeader;
if ( hasSealed )
{
@@ -436,7 +435,6 @@
tableHeader( tableHeader );
// Table rows
-
for ( Iterator it = alldeps.iterator(); it.hasNext(); )
{
Artifact artifact = (Artifact) it.next();
@@ -488,15 +486,12 @@
totalsealed.incrementTotal( artifact.getScope() );
}
- tableRow( hasSealed, new String[] {
- artifactFile.getName(),
+ tableRow( hasSealed, new String[] { artifactFile.getName(),
fileLengthDecimalFormat.format( artifactFile.length() ),
DEFAULT_DECIMAL_FORMAT.format( jarDetails.getNumEntries() ),
DEFAULT_DECIMAL_FORMAT.format( jarDetails.getNumClasses() ),
- DEFAULT_DECIMAL_FORMAT.format( jarDetails.getNumPackages() ),
- jarDetails.getJdkRevision(),
- debugstr,
- sealedstr } );
+ DEFAULT_DECIMAL_FORMAT.format( jarDetails.getNumPackages() ), jarDetails.getJdkRevision(),
+ debugstr, sealedstr } );
}
catch ( IOException e )
{
@@ -511,26 +506,20 @@
}
// Total raws
-
tableHeader[0] = getReportString( "report.dependencies.file.details.total" );
tableHeader( tableHeader );
justification[0] = Parser.JUSTIFY_RIGHT;
justification[6] = Parser.JUSTIFY_RIGHT;
- for( int i = -1; i < TotalCell.SCOPES_COUNT; i++ )
+ for ( int i = -1; i < TotalCell.SCOPES_COUNT; i++ )
{
if ( totaldeps.getTotal( i ) > 0 )
{
- tableRow( hasSealed, new String[] {
- totaldeps.getTotalString( i ),
- totaldepsize.getTotalString( i ),
- totalentries.getTotalString( i ),
- totalclasses.getTotalString( i ),
- totalpackages.getTotalString( i ),
- ( i < 0 ) ? String.valueOf( highestjdk ) : "",
- totaldebug.getTotalString( i ),
- totalsealed.getTotalString( i )} );
+ tableRow( hasSealed, new String[] { totaldeps.getTotalString( i ), totaldepsize.getTotalString( i ),
+ totalentries.getTotalString( i ), totalclasses.getTotalString( i ),
+ totalpackages.getTotalString( i ), ( i < 0 ) ? String.valueOf( highestjdk ) : "",
+ totaldebug.getTotalString( i ), totalsealed.getTotalString( i ) } );
}
}
@@ -556,8 +545,8 @@
private void createExceptionInfoTableRow( Artifact artifact, File artifactFile, Exception e, boolean hasSealed )
{
- tableRow( hasSealed,
- new String[]{artifact.getId(), artifactFile.getAbsolutePath(), e.getMessage(), "", "", "", "", ""} );
+ tableRow( hasSealed, new String[] { artifact.getId(), artifactFile.getAbsolutePath(), e.getMessage(), "", "",
+ "", "", "" } );
}
private void populateRepositoryMap( Map repos, List rowRepos )
@@ -724,33 +713,27 @@
*/
private void renderArtifactRow( Artifact artifact, boolean withClassifier, boolean withOptional )
{
- String isOptional = artifact.isOptional() ? getReportString( "report.dependencies.column.isOptional" )
- : getReportString( "report.dependencies.column.isNotOptional" );
-
- String url = ProjectInfoReportUtils.getArtifactUrl( artifactFactory, artifact, mavenProjectBuilder, remoteRepositories, localRepository );
+ String isOptional =
+ artifact.isOptional() ? getReportString( "report.dependencies.column.isOptional" )
+ : getReportString( "report.dependencies.column.isNotOptional" );
+
+ String url =
+ ProjectInfoReportUtils.getArtifactUrl( artifactFactory, artifact, mavenProjectBuilder, remoteRepositories,
+ localRepository );
String artifactIdCell = ProjectInfoReportUtils.getArtifactIdCell( artifact.getArtifactId(), url );
String content[];
if ( withClassifier )
{
- content = new String[] {
- artifact.getGroupId(),
- artifactIdCell,
- artifact.getVersion(),
- artifact.getClassifier(),
- artifact.getType(),
- isOptional
- };
+ content =
+ new String[] { artifact.getGroupId(), artifactIdCell, artifact.getVersion(), artifact.getClassifier(),
+ artifact.getType(), isOptional };
}
else
{
- content = new String[] {
- artifact.getGroupId(),
- artifactIdCell,
- artifact.getVersion(),
- artifact.getType(),
- isOptional
- };
+ content =
+ new String[] { artifact.getGroupId(), artifactIdCell, artifact.getVersion(), artifact.getType(),
+ isOptional };
}
tableRow( withOptional, content );
@@ -1003,21 +986,15 @@
if ( repoUrlBlackListed.isEmpty() )
{
tableHeader = new String[] { repoid, url, release, snapshot };
- justificationRepo = new int[] {
- Parser.JUSTIFY_LEFT,
- Parser.JUSTIFY_LEFT,
- Parser.JUSTIFY_CENTER,
- Parser.JUSTIFY_CENTER };
+ justificationRepo =
+ new int[] { Parser.JUSTIFY_LEFT, Parser.JUSTIFY_LEFT, Parser.JUSTIFY_CENTER, Parser.JUSTIFY_CENTER };
}
else
{
tableHeader = new String[] { repoid, url, release, snapshot, blacklisted };
- justificationRepo = new int[] {
- Parser.JUSTIFY_LEFT,
- Parser.JUSTIFY_LEFT,
- Parser.JUSTIFY_CENTER,
- Parser.JUSTIFY_CENTER,
- Parser.JUSTIFY_CENTER };
+ justificationRepo =
+ new int[] { Parser.JUSTIFY_LEFT, Parser.JUSTIFY_LEFT, Parser.JUSTIFY_CENTER, Parser.JUSTIFY_CENTER,
+ Parser.JUSTIFY_CENTER };
}
sink.tableRows( justificationRepo, true );
@@ -1130,7 +1107,7 @@
String depUrl = repoUtils.getDependencyUrlFromRepository( dependency, repo );
- Integer old = (Integer)totalByRepo.get( repokey );
+ Integer old = (Integer) totalByRepo.get( repokey );
if ( old == null )
{
totalByRepo.put( repokey, new Integer( 0 ) );
@@ -1192,7 +1169,7 @@
// Total row
- //reused key
+ // reused key
tableHeader[0] = getReportString( "report.dependencies.file.details.total" );
tableHeader( tableHeader );
String[] totalRow = new String[repoIdList.size() + 1];
@@ -1227,7 +1204,7 @@
{
Artifact artifact = (Artifact) iterator.next();
- if ( StringUtils.isNotEmpty( artifact.getClassifier() ) )
+ if ( StringUtils.isNotEmpty( artifact.getClassifier() ) )
{
return true;
}
@@ -1333,7 +1310,8 @@
* @see <a href="http://en.wikipedia.org/wiki/Octet_(computing)">
* http://en.wikipedia.org/wiki/Octet_(computing)</a>
*/
- static class FileDecimalFormat extends DecimalFormat
+ static class FileDecimalFormat
+ extends DecimalFormat
{
private static final long serialVersionUID = 4062503546523610081L;
@@ -1361,21 +1339,26 @@
if ( fs > 1024 * 1024 * 1024 )
{
result = super.format( (float) fs / ( 1024 * 1024 * 1024 ), result, fieldPosition );
- result.append( " " ).append( i18n.getString( "project-info-report", locale, "report.dependencies.file.details.column.size.gb" ) );
+ result.append( " " ).append( getString( i18n, "report.dependencies.file.details.column.size.gb" ) );
return result;
}
if ( fs > 1024 * 1024 )
{
result = super.format( (float) fs / ( 1024 * 1024 ), result, fieldPosition );
- result.append( " " ).append( i18n.getString( "project-info-report", locale, "report.dependencies.file.details.column.size.mb" ) );
+ result.append( " " ).append( getString( i18n, "report.dependencies.file.details.column.size.mb" ) );
return result;
}
result = super.format( (float) fs / ( 1024 ), result, fieldPosition );
- result.append( " " ).append( i18n.getString( "project-info-report", locale, "report.dependencies.file.details.column.size.kb" ) );
+ result.append( " " ).append( getString( i18n, "report.dependencies.file.details.column.size.kb" ) );
return result;
}
+
+ private String getString( I18N i18n, String key )
+ {
+ return i18n.getString( "project-info-report", locale, key );
+ }
}
/**
@@ -1499,11 +1482,11 @@
sb.append( " (" );
boolean needSeparator = false;
- for (int i = 0; i < SCOPES_COUNT; i++)
+ for ( int i = 0; i < SCOPES_COUNT; i++ )
{
if ( getTotal( i ) > 0 )
{
- if (needSeparator)
+ if ( needSeparator )
{
sb.append( ", " );
}