You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2008/08/01 21:54:35 UTC
svn commit: r681803 - in
/maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/src:
main/java/org/apache/maven/report/projectinfo/dependencies/renderer/
test/java/org/apache/maven/report/projectinfo/
Author: ltheussl
Date: Fri Aug 1 12:54:34 2008
New Revision: 681803
URL: http://svn.apache.org/viewvc?rev=681803&view=rev
Log:
Correct list and table rendering
Modified:
maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java
Modified: maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java?rev=681803&r1=681802&r2=681803&view=diff
==============================================================================
--- maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java (original)
+++ maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java Fri Aug 1 12:54:34 2008
@@ -280,11 +280,9 @@
{
// for Dependencies Graph Tree
startSection( getReportString( "report.dependencies.graph.tree.title" ) );
- sink.paragraph();
sink.list();
printDependencyListing( dependencyTree.getRootNode() );
sink.list_();
- sink.paragraph_();
endSection();
}
@@ -295,7 +293,12 @@
List alldeps = dependencies.getAllDependencies();
Collections.sort( alldeps, getArtifactComparator() );
- startTable();
+ int[] justification = new int[]{Sink.JUSTIFY_LEFT, Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_RIGHT,
+ Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_CENTER, Sink.JUSTIFY_CENTER,
+ Sink.JUSTIFY_CENTER};
+
+ startTable( justification, false );
+
String filename = getReportString( "report.dependencies.file.details.column.file" );
String size = getReportString( "report.dependencies.file.details.column.size" );
String entries = getReportString( "report.dependencies.file.details.column.entries" );
@@ -308,11 +311,6 @@
String[] tableHeader = new String[]{filename, size, entries, classes, packages, jdkrev, debug, sealed};
tableHeader( tableHeader );
- int[] justification = new int[]{Sink.JUSTIFY_LEFT, Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_RIGHT,
- Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_CENTER, Sink.JUSTIFY_CENTER,
- Sink.JUSTIFY_CENTER};
- sink.tableRows( justification, true );
-
int totaldeps = 0;
long totaldepsize = 0;
int totalentries = 0;
@@ -692,6 +690,8 @@
sink.text( id );
sink.link_();
+ sink.paragraph_();
+
if ( !node.getChildren().isEmpty() )
{
sink.list();
@@ -703,7 +703,6 @@
sink.list_();
}
- sink.paragraph_();
sink.listItem_();
}
Modified: maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java?rev=681803&r1=681802&r2=681803&view=diff
==============================================================================
--- maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java (original)
+++ maven/plugins/branches/maven-project-info-reports-plugin-doxia-beta-1/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java Fri Aug 1 12:54:34 2008
@@ -87,6 +87,6 @@
assertEquals( textBlocks[6].getText(), getString( "report.dependencies.intro.test" ) );
assertEquals( textBlocks[7].getText(), getString( "report.dependencies.graph.title" ) );
assertEquals( textBlocks[8].getText(), getString( "report.dependencies.graph.tree.title" ) );
- assertEquals( textBlocks[14].getText(), getString( "report.dependencies.graph.tables.title" ) );
+ assertEquals( textBlocks[9].getText(), getString( "report.dependencies.graph.tables.title" ) );
}
}