Generalized the converter architecture by making the "context" a raw object that can be cast for the needs of a specific project

Thus converters are now independent of ant and avalon


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271465 13f79535-47bb-0310-9956-ffa450edef68

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;

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

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???

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

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 );

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

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

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

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

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

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

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();

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;
 }
 

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;
 }

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
     {
         /*

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
     {
         /*