You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2013/09/09 22:24:34 UTC
svn commit: r1521279 - in
/maven/plugins/trunk/maven-project-info-reports-plugin/src/main:
java/org/apache/maven/report/projectinfo/dependencies/renderer/ resources/
Author: michaelo
Date: Mon Sep 9 20:24:34 2013
New Revision: 1521279
URL: http://svn.apache.org/r1521279
Log:
[MPIR-265] Improve debug information in Dependencies report
- Second shot with debug information column title.
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_nl.properties
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=1521279&r1=1521278&r2=1521279&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 Mon Sep 9 20:24:34 2013
@@ -47,6 +47,8 @@ import org.apache.maven.artifact.reposit
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkEventAttributeSet;
+import org.apache.maven.doxia.sink.SinkEventAttributes;
import org.apache.maven.doxia.util.HtmlTools;
import org.apache.maven.model.License;
import org.apache.maven.plugin.logging.Log;
@@ -498,6 +500,7 @@ public class DependenciesRenderer
String packages = getI18nString( "file.details.column.packages" );
String jdkrev = getI18nString( "file.details.column.jdkrev" );
String debugInformation = getI18nString( "file.details.column.debuginformation" );
+ String debugInformationTitle = getI18nString( "file.details.columntitle.debuginformation" );
String debugInformationCellYes = getI18nString( "file.details.cell.debuginformation.yes" );
String debugInformationCellNo = getI18nString( "file.details.cell.debuginformation.no" );
String sealed = getI18nString( "file.details.column.sealed" );
@@ -521,15 +524,18 @@ public class DependenciesRenderer
// Table header
String[] tableHeader;
+ String[] tableHeaderTitles;
if ( hasSealed )
{
tableHeader = new String[] { filename, size, entries, classes, packages, jdkrev, debugInformation, sealed };
+ 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};
}
- tableHeader( tableHeader );
+ tableHeader( tableHeader, tableHeaderTitles );
// Table rows
for ( Artifact artifact : alldeps )
@@ -634,6 +640,45 @@ public class DependenciesRenderer
endSection();
}
+ // Almost as same as in the abstract class but includes the title attribute
+ private void tableHeader( String[] content, String[] titles )
+ {
+ sink.tableRow();
+
+ 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] );
+ }
+ }
+
+ sink.tableRow_();
+ }
+
+ protected void tableHeaderCell( String text, String title )
+ {
+ if ( title != null )
+ {
+ SinkEventAttributes attributes = new SinkEventAttributeSet( SinkEventAttributes.TITLE, title );
+ sink.tableHeaderCell( attributes );
+ }
+ else
+ {
+ sink.tableHeaderCell();
+ }
+
+ text( text );
+
+ sink.tableHeaderCell_();
+ }
+
private void tableRow( boolean fullRow, String[] content )
{
sink.tableRow();
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties?rev=1521279&r1=1521278&r2=1521279&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties Mon Sep 9 20:24:34 2013
@@ -63,6 +63,7 @@ report.dependencies.file.details.column.
report.dependencies.file.details.column.size.gb = GB
report.dependencies.file.details.column.size.mb = MB
report.dependencies.file.details.column.size.kb = kB
+report.dependencies.file.details.columntitle.debuginformation = Indicates whether these dependencies have been compiled with debug information.
report.dependencies.file.details.title = Dependency File Details
report.dependencies.file.details.total = Total
report.dependencies.graph.tables.licenses = Licenses
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties?rev=1521279&r1=1521278&r2=1521279&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties Mon Sep 9 20:24:34 2013
@@ -63,6 +63,7 @@ report.dependencies.file.details.column.
report.dependencies.file.details.column.size.gb = GB
report.dependencies.file.details.column.size.mb = MB
report.dependencies.file.details.column.size.kb = kB
+report.dependencies.file.details.columntitle.debuginformation = Gibt an, ob diese Abhängigkeiten mit Debug-Informationen kompiliert wurden.
report.dependencies.file.details.title = Details zu den Abh\u00e4ngigkeiten
report.dependencies.file.details.total = Gesamt
report.dependencies.graph.tables.licenses = Lizenzen
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_nl.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_nl.properties?rev=1521279&r1=1521278&r2=1521279&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_nl.properties (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_nl.properties Mon Sep 9 20:24:34 2013
@@ -25,6 +25,7 @@ report.cim.general.intro
report.cim.hudson.intro = Dit project gebruikt {Hudson, http://hudson-ci.org/}.
report.cim.jenkins.intro = Dit project gebruikt {Jenkins, https://jenkins-ci.org/}.
report.cim.luntbuild.intro = Dit project gebruikt {Luntbuild, http://luntbuild.javaforge.com/}.
+report.dependencies.file.details.columntitle.debuginformation = Geeft aan of deze afhankelijkheden met debug-informatie gecompileerd zijn.
report.dependencies.graph.tables.licenses = Vergunningen
report.dependencies.graph.tables.unknown =
report.index.nodescription = Er bestaat op dit moment geen beschrijving voor dit project.