diff --git a/proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java index 3ff5e046d..b2dbdf769 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/vfile/StringToFileObjectConverter.java @@ -22,7 +22,8 @@ import org.apache.myrmidon.converter.ConverterException; * @author Adam Murdoch * @ant:converter source="java.lang.String" destination="org.apache.aut.vfs.FileObject" */ -public class StringToFileObjectConverter extends AbstractConverter +public class StringToFileObjectConverter + extends AbstractConverter { private final static Resources REZ = ResourceManager.getPackageResources( StringToFileObjectConverter.class ); @@ -35,22 +36,23 @@ public class StringToFileObjectConverter extends AbstractConverter /** * Converts a String into a FileObject. */ - protected Object convert( Object original, Context context ) + protected Object convert( final Object original, final Object context ) throws ConverterException { - final String fileUri = (String)original; + final String uri = (String)original; final TaskContext taskContext = (TaskContext)context; try { - final FileSystemManager manager = (FileSystemManager)taskContext.getService( FileSystemManager.class ); + final FileSystemManager manager = + (FileSystemManager)taskContext.getService( FileSystemManager.class ); // TODO - change TaskContext.getBaseDirectory() to return a FileObject - return manager.resolveFile( taskContext.getBaseDirectory(), fileUri ); + return manager.resolveFile( taskContext.getBaseDirectory(), uri ); } catch( Exception e ) { - final String message = REZ.getString( "bad-convert-string-to-file.error", fileUri ); + final String message = REZ.getString( "bad-convert-string-to-file.error", uri ); throw new ConverterException( message, e ); } } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java index 7d2dfd641..1ce758f1e 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java @@ -24,7 +24,7 @@ public class StringToMyRole1Converter super( String.class, MyRole1.class ); } - protected Object convert( Object original, Context context ) + protected Object convert( Object original, Object context ) throws ConverterException { return new MyType1(); diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/TestConverter1.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/TestConverter1.java index a35c763f0..57d250c01 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/TestConverter1.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/TestConverter1.java @@ -22,7 +22,7 @@ public class TestConverter1 /** * Convert original to destination type. */ - public Object convert( Class destination, Object original, Context context ) + public Object convert( Class destination, Object original, Object context ) throws ConverterException { return new TestType1(); diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java index 7d2dfd641..1ce758f1e 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/StringToMyRole1Converter.java @@ -24,7 +24,7 @@ public class StringToMyRole1Converter super( String.class, MyRole1.class ); } - protected Object convert( Object original, Context context ) + protected Object convert( Object original, Object context ) throws ConverterException { return new MyType1(); diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/TestConverter1.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/TestConverter1.java index a35c763f0..57d250c01 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/TestConverter1.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/TestConverter1.java @@ -22,7 +22,7 @@ public class TestConverter1 /** * Convert original to destination type. */ - public Object convert( Class destination, Object original, Context context ) + public Object convert( Class destination, Object original, Object context ) throws ConverterException { return new TestType1();