diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java index 469dc9745..ef72b65a4 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java @@ -30,7 +30,7 @@ public class StringToBooleanConverter super( String.class, Boolean.class ); } - public Object convert( final Object object, final Context context ) + public Object convert( final Object object, final Object context ) throws ConverterException { final String string = (String)object; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java index f6e606631..21779b6aa 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java @@ -30,7 +30,7 @@ public class StringToByteConverter super( String.class, Byte.class ); } - public Object convert( final Object object, final Context context ) + public Object convert( final Object object, final Object context ) throws ConverterException { try diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java index 1ed3975c1..fcfc7621d 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java @@ -30,7 +30,7 @@ public class StringToClassConverter super( String.class, Class.class ); } - public Object convert( final Object object, final Context context ) + public Object convert( final Object object, final Object context ) throws ConverterException { //TODO: Should we use ContextClassLoader here??? diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java index aedb1d8b9..5dba59ff2 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java @@ -30,7 +30,7 @@ public class StringToDoubleConverter super( String.class, Double.class ); } - public Object convert( final Object object, final Context context ) + public Object convert( final Object object, final Object context ) throws ConverterException { try diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java index b56dee737..49e9d52ec 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java @@ -30,7 +30,7 @@ public class StringToEnumConverter public Object convert( final Class destination, final Object original, - final Context context ) + final Object context ) throws ConverterException { final Object object = getEnum( destination, original ); diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java index 198631bce..374c15d43 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java @@ -10,7 +10,6 @@ package org.apache.antlib.core; import java.io.File; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; -import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.converter.AbstractConverter; @@ -33,7 +32,7 @@ public class StringToFileConverter super( String.class, File.class ); } - public Object convert( final Object object, final Context context ) + public Object convert( final Object object, final Object context ) throws ConverterException { try diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java index 8e6dd663d..eda27ac62 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java @@ -30,7 +30,7 @@ public class StringToFloatConverter super( String.class, Float.class ); } - public Object convert( final Object object, final Context context ) + public Object convert( final Object object, final Object context ) throws ConverterException { try diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java index 81e53b6bd..21a81fc92 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java @@ -30,7 +30,7 @@ public class StringToIntegerConverter super( String.class, Integer.class ); } - public Object convert( final Object object, final Context context ) + public Object convert( final Object object, final Object context ) throws ConverterException { try diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java index 9086419a6..600016dc3 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java @@ -30,7 +30,7 @@ public class StringToLongConverter super( String.class, Long.class ); } - public Object convert( final Object object, final Context context ) + public Object convert( final Object object, final Object context ) throws ConverterException { try diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java index 5c70214ab..2563d27ba 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java @@ -30,7 +30,7 @@ public class StringToShortConverter super( String.class, Short.class ); } - public Object convert( final Object object, final Context context ) + public Object convert( final Object object, final Object context ) throws ConverterException { try diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java index bf19e7d44..ee5b87dc7 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java @@ -32,7 +32,7 @@ public class StringToURLConverter super( String.class, URL.class ); } - public Object convert( final Object object, final Context context ) + public Object convert( final Object object, final Object context ) throws ConverterException { try diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java index 970d83fbf..d5f81fab1 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java @@ -74,7 +74,7 @@ public class DefaultMasterConverter */ public Object convert( final Class destination, final Object original, - final Context context ) + final Object context ) throws ConverterException { final Class originalClass = original.getClass(); diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/converter/AbstractConverter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/converter/AbstractConverter.java index 77edec3df..00f88629d 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/converter/AbstractConverter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/converter/AbstractConverter.java @@ -9,7 +9,6 @@ package org.apache.myrmidon.converter; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; -import org.apache.avalon.framework.context.Context; /** * Instances of this interface are used to convert between different types. @@ -45,11 +44,11 @@ public abstract class AbstractConverter * @param original the original Object * @param context the context in which to convert * @return the converted object - * @exception Exception if an error occurs + * @exception ConverterException if an error occurs */ public Object convert( final Class destination, final Object original, - final Context context ) + final Object context ) throws ConverterException { if( m_destination != destination ) @@ -75,9 +74,9 @@ public abstract class AbstractConverter * @param original the original Object * @param context the context in which to convert * @return the converted object - * @exception Exception if an error occurs + * @exception ConverterException if an error occurs */ - protected abstract Object convert( Object original, Context context ) + protected abstract Object convert( Object original, Object context ) throws ConverterException; } diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/converter/Converter.java b/proposal/myrmidon/src/java/org/apache/myrmidon/converter/Converter.java index db5355868..91cc29d80 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/converter/Converter.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/converter/Converter.java @@ -7,8 +7,6 @@ */ package org.apache.myrmidon.converter; -import org.apache.avalon.framework.context.Context; - /** * Instances of this interface are used to convert between different types. * @@ -31,6 +29,6 @@ public interface Converter * @return the converted object * @exception ConverterException if an error occurs */ - Object convert( Class destination, Object original, Context context ) + Object convert( Class destination, Object original, Object context ) throws ConverterException; } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/converters/StringToPathConverter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/converters/StringToPathConverter.java index 2e70cccc2..9cc9d505f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/converters/StringToPathConverter.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/converters/StringToPathConverter.java @@ -36,7 +36,7 @@ public class StringToPathConverter * @return the converted object * @exception Exception if an error occurs */ - protected Object convert( Object original, Context context ) + protected Object convert( Object original, Object context ) throws ConverterException { /* diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/converters/StringToPathConverter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/converters/StringToPathConverter.java index 2e70cccc2..9cc9d505f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/converters/StringToPathConverter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/converters/StringToPathConverter.java @@ -36,7 +36,7 @@ public class StringToPathConverter * @return the converted object * @exception Exception if an error occurs */ - protected Object convert( Object original, Context context ) + protected Object convert( Object original, Object context ) throws ConverterException { /*