diff --git a/tasklist/project.xml b/tasklist/project.xml index 2c27893f..963e3f70 100644 --- a/tasklist/project.xml +++ b/tasklist/project.xml @@ -5,7 +5,7 @@ 3 maven-tasklist-plugin Maven Tasklist Plug-in - 2.2 + 2.3-SNAPSHOT Create xdoc from @TODO tags http://maven.apache.org/reference/plugins/tasklist/ diff --git a/tasklist/src/plugin-resources/templates/tasklist.vm b/tasklist/src/plugin-resources/templates/tasklist.vm index 9b52f29c..b373c5db 100644 --- a/tasklist/src/plugin-resources/templates/tasklist.vm +++ b/tasklist/src/plugin-resources/templates/tasklist.vm @@ -8,12 +8,17 @@
-

-

- + +
+ + + + + + #set ($classesCount = 0) #foreach ($class in $docInfo.classes) #set ($classTodosCount = $class.getTags($jellyContext.taskTag).size() ) #set ($methodTodosCount = 0) @@ -24,6 +29,7 @@ #end #end #if ($classTodosCount > 0 || $methodTodosCount > 0) + #set ($classesCount = $classesCount + 1 ) #end #end + #if ($classesCount == 0) + + + + #end +
Class Class Todos Count Method with Todos
$class.name @@ -45,9 +51,14 @@
No class or method todo found
-
-

+ #foreach ($class in $docInfo.classes) #set ($todoTags = $class.getTags($jellyContext.taskTag)) #set ($hasToDoMethod = false) @@ -59,10 +70,14 @@ #end #if ($todoTags.size() > 0 || $hasToDoMethod) - #if ($todoTags.size() > 0) - +
+ + + + + #foreach ($tag in $todoTags) #end +
Class Todos
@@ -70,14 +85,20 @@
#end #foreach ($m in $class.methods) #set ($methodTodoTags = $m.getTags($jellyContext.taskTag)) #if ($methodTodoTags.size() > 0) - +
+ + + + + #foreach ($tag in $methodTodoTags) #end +
Method Todos
@@ -85,13 +106,13 @@
#end #end #end #end -

diff --git a/tasklist/xdocs/changes.xml b/tasklist/xdocs/changes.xml index 8bcf2c82..2004459c 100644 --- a/tasklist/xdocs/changes.xml +++ b/tasklist/xdocs/changes.xml @@ -8,6 +8,11 @@ + + + Fix bad html generation. + + update to use maven.docs.*/maven.gen.docs