code simplification

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1354217 13f79535-47bb-0310-9956-ffa450edef68
master
Herve Boutemy 2012-06-26 20:40:36 +00:00
parent 2585ccafb2
commit d75dfaa768
1 changed files with 9 additions and 14 deletions

View File

@ -27,6 +27,7 @@ import org.apache.velocity.VelocityContext;
import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger; import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.velocity.VelocityComponent; import org.codehaus.plexus.velocity.VelocityComponent;
@ -36,9 +37,7 @@ import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.StringWriter; import java.io.StringWriter;
import java.io.Writer;
import java.util.List; import java.util.List;
import java.util.Properties; import java.util.Properties;
@ -146,27 +145,23 @@ public class PluginHelpGenerator
IOUtil.close( fos ); IOUtil.close( fos );
} }
try
{
String sourcePath = helpImplementation.replace( '.', File.separatorChar ) + ".java"; String sourcePath = helpImplementation.replace( '.', File.separatorChar ) + ".java";
File helpClass = new File( destinationDirectory, sourcePath ); File helpClass = new File( destinationDirectory, sourcePath );
helpClass.getParentFile().mkdirs(); helpClass.getParentFile().mkdirs();
Writer writer = null;
try
{
String pluginResourcesPath = "META-INF/maven/" + mavenProject.getGroupId() + "/" + mavenProject.getArtifactId(); String pluginResourcesPath = "META-INF/maven/" + mavenProject.getGroupId() + "/" + mavenProject.getArtifactId();
writer = new OutputStreamWriter( new FileOutputStream( helpClass ), request.getEncoding() ); String helpClassSources = getHelpClassSources( pluginResourcesPath, pluginDescriptor );
writer.write( getHelpClassSources( pluginResourcesPath, pluginDescriptor ) );
writer.flush(); FileUtils.fileWrite( helpClass, request.getEncoding(), helpClassSources );
} }
catch ( IOException e ) catch ( IOException e )
{ {
throw new GeneratorException( e.getMessage(), e ); throw new GeneratorException( e.getMessage(), e );
} }
finally
{
IOUtil.close( writer );
}
} }
public PluginHelpGenerator setHelpPackageName( String helpPackageName ) public PluginHelpGenerator setHelpPackageName( String helpPackageName )