From 126320356ba4ae3622b3cf0a7de331ee2cddde65 Mon Sep 17 00:00:00 2001
From: Vincent Siveton <vsiveton@apache.org>
Date: Sat, 9 Aug 2008 12:14:13 +0000
Subject: [PATCH] o code readingness

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@684237 13f79535-47bb-0310-9956-ffa450edef68
---
 .../BeanshellMojoDescriptorExtractor.java     | 65 ++++++++++---------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/maven-plugin-tools-beanshell/src/main/java/org/apache/maven/tools/plugin/extractor/beanshell/BeanshellMojoDescriptorExtractor.java b/maven-plugin-tools-beanshell/src/main/java/org/apache/maven/tools/plugin/extractor/beanshell/BeanshellMojoDescriptorExtractor.java
index 1b2126a..c846bfd 100644
--- a/maven-plugin-tools-beanshell/src/main/java/org/apache/maven/tools/plugin/extractor/beanshell/BeanshellMojoDescriptorExtractor.java
+++ b/maven-plugin-tools-beanshell/src/main/java/org/apache/maven/tools/plugin/extractor/beanshell/BeanshellMojoDescriptorExtractor.java
@@ -47,35 +47,6 @@ import java.util.Set;
 public class BeanshellMojoDescriptorExtractor
     extends AbstractScriptedMojoDescriptorExtractor
 {
-    private MojoDescriptor createMojoDescriptor( String basedir, String resource, PluginDescriptor pluginDescriptor )
-        throws InvalidPluginDescriptorException
-    {
-        MojoDescriptor mojoDescriptor = new MojoDescriptor();
-        mojoDescriptor.setPluginDescriptor( pluginDescriptor );
-
-        mojoDescriptor.setLanguage( "bsh" );
-        mojoDescriptor.setComponentConfigurator( "bsh" );
-
-        mojoDescriptor.setImplementation( resource );
-
-        Interpreter interpreter = new Interpreter();
-
-        try
-        {
-            interpreter.set( "file", new File( basedir, resource ) );
-
-            interpreter.set( "mojoDescriptor", mojoDescriptor );
-
-            interpreter.eval( new InputStreamReader( getClass().getResourceAsStream( "/extractor.bsh" ) ) );
-        }
-        catch ( EvalError evalError )
-        {
-            throw new InvalidPluginDescriptorException( "Error scanning beanshell script", evalError );
-        }
-
-        return mojoDescriptor;
-    }
-
     /** {@inheritDoc} */
     protected String getScriptFileExtension()
     {
@@ -117,4 +88,40 @@ public class BeanshellMojoDescriptorExtractor
 
         return descriptors;
     }
+
+    /**
+     * @param basedir not null
+     * @param resource not null
+     * @param pluginDescriptor not null
+     * @return a new Mojo descriptor instance
+     * @throws InvalidPluginDescriptorException if any
+     */
+    private MojoDescriptor createMojoDescriptor( String basedir, String resource, PluginDescriptor pluginDescriptor )
+        throws InvalidPluginDescriptorException
+    {
+        MojoDescriptor mojoDescriptor = new MojoDescriptor();
+        mojoDescriptor.setPluginDescriptor( pluginDescriptor );
+
+        mojoDescriptor.setLanguage( "bsh" );
+        mojoDescriptor.setComponentConfigurator( "bsh" );
+
+        mojoDescriptor.setImplementation( resource );
+
+        Interpreter interpreter = new Interpreter();
+
+        try
+        {
+            interpreter.set( "file", new File( basedir, resource ) );
+
+            interpreter.set( "mojoDescriptor", mojoDescriptor );
+
+            interpreter.eval( new InputStreamReader( getClass().getResourceAsStream( "/extractor.bsh" ) ) );
+        }
+        catch ( EvalError evalError )
+        {
+            throw new InvalidPluginDescriptorException( "Error scanning beanshell script", evalError );
+        }
+
+        return mojoDescriptor;
+    }
 }
\ No newline at end of file