Author: vsiveton
Date: Sat Oct 25 04:54:41 2008
New Revision: 707840
URL: http://svn.apache.org/viewvc?rev=707840&view=rev
Log:
o startPlexusContainer() should be after parameter validation
Modified:
maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java
Modified:
maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java?rev=707840&r1=707839&r2=707840&view=diff
==============================================================================
---
maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java
(original)
+++
maven/doxia/doxia-tools/trunk/doxia-converter/src/main/java/org/apache/maven/doxia/DefaultConverter.java
Sat Oct 25 04:54:41 2008
@@ -159,22 +159,22 @@
public void convert( InputFileWrapper input, OutputFileWrapper output )
throws UnsupportedFormatException, ConverterException
{
- try
+ if ( input == null )
{
- startPlexusContainer();
+ throw new IllegalArgumentException( "input is required" );
}
- catch ( PlexusContainerException e )
+ if ( output == null )
{
- throw new ConverterException( "PlexusContainerException: " +
e.getMessage(), e );
+ throw new IllegalArgumentException( "output is required" );
}
- if ( input == null )
+ try
{
- throw new IllegalArgumentException( "input is required" );
+ startPlexusContainer();
}
- if ( output == null )
+ catch ( PlexusContainerException e )
{
- throw new IllegalArgumentException( "output is required" );
+ throw new ConverterException( "PlexusContainerException: " +
e.getMessage(), e );
}
try
@@ -219,22 +219,22 @@
public void convert( InputReaderWrapper input, OutputWriterWrapper output )
throws UnsupportedFormatException, ConverterException
{
- try
+ if ( input == null )
{
- startPlexusContainer();
+ throw new IllegalArgumentException( "input is required" );
}
- catch ( PlexusContainerException e )
+ if ( output == null )
{
- throw new ConverterException( "PlexusContainerException: " +
e.getMessage(), e );
+ throw new IllegalArgumentException( "output is required" );
}
- if ( input == null )
+ try
{
- throw new IllegalArgumentException( "input is required" );
+ startPlexusContainer();
}
- if ( output == null )
+ catch ( PlexusContainerException e )
{
- throw new IllegalArgumentException( "output is required" );
+ throw new ConverterException( "PlexusContainerException: " +
e.getMessage(), e );
}
try
@@ -597,17 +597,17 @@
// Handle Doxia text files
if ( supportedFromFormat.equalsIgnoreCase( APT_PARSER )
- && isDoxiaFormat( f, supportedFromFormat ) )
+ && isDoxiaFileName( f, supportedFromFormat ) )
{
return supportedFromFormat;
}
else if ( supportedFromFormat.equalsIgnoreCase( CONFLUENCE_PARSER )
- && isDoxiaFormat( f, supportedFromFormat ) )
+ && isDoxiaFileName( f, supportedFromFormat ) )
{
return supportedFromFormat;
}
else if ( supportedFromFormat.equalsIgnoreCase( TWIKI_PARSER )
- && isDoxiaFormat( f, supportedFromFormat ) )
+ && isDoxiaFileName( f, supportedFromFormat ) )
{
return supportedFromFormat;
}
@@ -652,7 +652,7 @@
* @param format could be null
* @return <code>true</code> if the file name computes the format.
*/
- private static boolean isDoxiaFormat( File f, String format )
+ private static boolean isDoxiaFileName( File f, String format )
{
if ( f == null )
{
