From 46532f2300e36b01b1bd23dba8e224f60ff1912b Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Sat, 26 May 2012 17:12:27 +0000 Subject: [PATCH] code simplification git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1342928 13f79535-47bb-0310-9956-ffa450edef68 --- .../plugin/generator/GeneratorUtils.java | 5 ++++ .../generator/PluginDescriptorGenerator.java | 24 +++++-------------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java index 6592820..6799a8a 100644 --- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java +++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java @@ -113,6 +113,11 @@ public final class GeneratorUtils w.endElement(); } + public static void element( XMLWriter w, String name, String value, boolean asText ) + { + element( w, name, asText ? GeneratorUtils.toText( value ) : value ); + } + /** * @param dependencies not null list of Dependency * @return list of component dependencies diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java index e3994e7..92e8515 100644 --- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java +++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGenerator.java @@ -146,14 +146,8 @@ public class PluginDescriptorGenerator w.startElement( "plugin" ); GeneratorUtils.element( w, "name", pluginDescriptor.getName() ); - if ( helpDescriptor ) - { - GeneratorUtils.element( w, "description", GeneratorUtils.toText( pluginDescriptor.getDescription() ) ); - } - else - { - GeneratorUtils.element( w, "description", pluginDescriptor.getDescription() ); - } + + GeneratorUtils.element( w, "description", pluginDescriptor.getDescription(), helpDescriptor ); GeneratorUtils.element( w, "groupId", pluginDescriptor.getGroupId() ); @@ -475,17 +469,11 @@ public class PluginDescriptorGenerator GeneratorUtils.element( w, "required", Boolean.toString( parameter.isRequired() ) ); GeneratorUtils.element( w, "editable", Boolean.toString( parameter.isEditable() ) ); - if ( helpDescriptor ) - { - GeneratorUtils.element( w, "description", GeneratorUtils.toText( parameter.getDescription() ) ); - } - else - { - GeneratorUtils.element( w, "description", parameter.getDescription() ); - } - if ( StringUtils.isNotEmpty( parameter.getDefaultValue() ) || StringUtils.isNotEmpty( - parameter.getExpression() ) ) + GeneratorUtils.element( w, "description", parameter.getDescription(), helpDescriptor ); + + if ( StringUtils.isNotEmpty( parameter.getDefaultValue() ) + || StringUtils.isNotEmpty( parameter.getExpression() ) ) { configuration.add( parameter ); }