From 6ddd1a47483cde948285643c4f6ccb3f99ae94e8 Mon Sep 17 00:00:00 2001
From: Benjamin Bentmann <bentmann@apache.org>
Date: Sun, 18 May 2008 14:27:37 +0000
Subject: [PATCH] [MPLUGIN-116] Improve XHTML compliance

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@657566 13f79535-47bb-0310-9956-ffa450edef68
---
 .../plugin/generator/PluginXdocGenerator.java   | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
index 623d5f1..117d311 100644
--- a/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
+++ b/maven-plugin-tools-api/src/main/java/org/apache/maven/tools/plugin/generator/PluginXdocGenerator.java
@@ -172,18 +172,17 @@ public class PluginXdocGenerator
         w.writeMarkup( "<strong>"+ getBundle( locale ).getString( "pluginxdoc.description" ) + "</strong>:" );
         w.endElement(); //p
 
-        w.startElement( "p" );
         if ( StringUtils.isNotEmpty( mojoDescriptor.getDescription() ) )
         {
             w.writeMarkup( PluginUtils.makeHtmlValid( mojoDescriptor.getDescription() ) );
         }
         else
         {
+            w.startElement( "p" );
             w.writeText( getBundle( locale ).getString( "pluginxdoc.nodescription" ) );
+            w.endElement(); // p
         }
 
-        w.endElement(); // p
-
         writeGoalAttributes( mojoDescriptor, w );
 
         writeGoalParameterTable( mojoDescriptor, w );
@@ -375,18 +374,16 @@ public class PluginXdocGenerator
             w.writeMarkup( "<strong><a name=\"" + parameter.getName() + "\">" + parameter.getName() + "</a>:</strong>" );
             w.endElement(); //p
 
-            String description = parameter.getDescription();
-            if ( StringUtils.isEmpty( description ) )
+            if ( StringUtils.isNotEmpty( parameter.getDescription() ) )
             {
-                description = getBundle( locale ).getString( "pluginxdoc.nodescription" );
+                w.writeMarkup( PluginUtils.makeHtmlValid( parameter.getDescription() ) );
             }
             else
             {
-                description = PluginUtils.makeHtmlValid( description );
+                w.startElement( "p" );
+                w.writeMarkup( getBundle( locale ).getString( "pluginxdoc.nodescription" ) );
+                w.endElement(); // p
             }
-            w.startElement( "p" );
-            w.writeMarkup( description );
-            w.endElement(); //p
 
             w.startElement( "ul" );