donaldp 2002/11/11 18:56:56
Modified: info/src/java/org/apache/avalon/framework/tools/generator
MetaGenerateTask.java
Log:
Factored nicely
Revision Changes Path
1.2 +22 -28
jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/tools/generator/MetaGenerateTask.java
Index: MetaGenerateTask.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/info/src/java/org/apache/avalon/framework/tools/generator/MetaGenerateTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MetaGenerateTask.java 12 Nov 2002 01:23:34 -0000 1.1
+++ MetaGenerateTask.java 12 Nov 2002 02:56:56 -0000 1.2
@@ -140,38 +140,32 @@
final String baseFile =
new File( m_destDir, filename ).getCanonicalPath();
+ InfoWriter writer;
+ String extension;
if( m_xmlOutput )
{
- final OutputStream outputStream = new FileOutputStream(
baseFile + ".xml" );
- try
- {
- c_xmlWriter.writeComponentInfo( info, outputStream );
- }
- catch( final Exception e )
- {
- log( "Error writing " + baseFile + ". Cause: " + e );
- }
- finally
- {
- shutdownStream( outputStream );
- }
-
+ extension = ".xml";
+ writer = c_xmlWriter;
}
else
{
- final OutputStream outputStream = new FileOutputStream(
baseFile + ".ser" );
- try
- {
- c_serWriter.writeComponentInfo( info, outputStream );
- }
- catch( final Exception e )
- {
- log( "Error writing " + baseFile + ". Cause: " + e );
- }
- finally
- {
- shutdownStream( outputStream );
- }
+ extension = ".ser";
+ writer = c_serWriter;
+ }
+
+ final String fullFilename = baseFile + extension;
+ final OutputStream outputStream = new FileOutputStream(
fullFilename );
+ try
+ {
+ writer.writeComponentInfo( info, outputStream );
+ }
+ catch( final Exception e )
+ {
+ log( "Error writing " + fullFilename + ". Cause: " + e );
+ }
+ finally
+ {
+ shutdownStream( outputStream );
}
}
}
--
To unsubscribe, e-mail: <mailto:avalon-cvs-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@;jakarta.apache.org>
