From 197ce98685e04b52bd74cd5e42087f777c7667b6 Mon Sep 17 00:00:00 2001
From: Robert Scholte <rfscholte@apache.org>
Date: Mon, 5 Nov 2012 22:34:46 +0000
Subject: [PATCH] Remove setUseAnnotations from PluginHelpGenerator,
 PluginToolsRequest has enough info to decide this.

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1406001 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/maven/plugin/plugin/HelpGeneratorMojo.java | 2 +-
 .../maven/tools/plugin/generator/PluginHelpGenerator.java | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
index 25ea26d..1b390e6 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/HelpGeneratorMojo.java
@@ -76,7 +76,7 @@ public class HelpGeneratorMojo
      */
     protected Generator createGenerator()
     {
-        return new PluginHelpGenerator().setHelpPackageName( helpPackageName ).setUseAnnotations( project.getArtifactMap().containsKey( "org.apache.maven.plugin-tools:maven-plugin-annotations" ) ).setVelocityComponent( this.velocity );
+        return new PluginHelpGenerator().setHelpPackageName( helpPackageName ).setVelocityComponent( this.velocity );
     }
 
     /**
diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
index b45c113..1a564e1 100644
--- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
+++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginHelpGenerator.java
@@ -136,6 +136,8 @@ public class PluginHelpGenerator
         }
 
         writeHelpPropertiesFile( request, destinationDirectory );
+        
+        useAnnotations = request.getProject().getArtifactMap().containsKey( "org.apache.maven.plugin-tools:maven-plugin-annotations" );
 
         try
         {
@@ -160,12 +162,6 @@ public class PluginHelpGenerator
         return this;
     }
     
-    public PluginHelpGenerator setUseAnnotations( boolean useAnnotations )
-    {
-        this.useAnnotations = useAnnotations;
-        return this;
-    }
-
     public VelocityComponent getVelocityComponent()
     {
         return velocityComponent;