donaldp 02/02/21 01:25:41
Modified: proposal/myrmidon/src/java/org/apache/antlib/core
StringToBooleanConverter.java
StringToByteConverter.java
StringToClassConverter.java
StringToDoubleConverter.java
StringToEnumConverter.java
StringToFileConverter.java
StringToFloatConverter.java
StringToIntegerConverter.java
StringToLongConverter.java
StringToShortConverter.java
StringToURLConverter.java
proposal/myrmidon/src/java/org/apache/myrmidon/components/converter
DefaultMasterConverter.java
proposal/myrmidon/src/java/org/apache/myrmidon/converter
AbstractConverter.java Converter.java
Log:
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
Revision Changes Path
1.4 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java
Index: StringToBooleanConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToBooleanConverter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StringToBooleanConverter.java 20 Jan 2002 17:32:58 -0000 1.3
+++ StringToBooleanConverter.java 21 Feb 2002 09:25:40 -0000 1.4
@@ -30,7 +30,7 @@
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;
1.6 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java
Index: StringToByteConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToByteConverter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StringToByteConverter.java 20 Jan 2002 17:32:58 -0000 1.5
+++ StringToByteConverter.java 21 Feb 2002 09:25:40 -0000 1.6
@@ -30,7 +30,7 @@
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
1.6 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java
Index: StringToClassConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToClassConverter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StringToClassConverter.java 20 Jan 2002 17:32:58 -0000 1.5
+++ StringToClassConverter.java 21 Feb 2002 09:25:40 -0000 1.6
@@ -30,7 +30,7 @@
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???
1.6 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java
Index: StringToDoubleConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToDoubleConverter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StringToDoubleConverter.java 20 Jan 2002 17:32:58 -0000 1.5
+++ StringToDoubleConverter.java 21 Feb 2002 09:25:40 -0000 1.6
@@ -30,7 +30,7 @@
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
1.5 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java
Index: StringToEnumConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToEnumConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StringToEnumConverter.java 20 Jan 2002 17:32:58 -0000 1.4
+++ StringToEnumConverter.java 21 Feb 2002 09:25:40 -0000 1.5
@@ -30,7 +30,7 @@
public Object convert( final Class destination,
final Object original,
- final Context context )
+ final Object context )
throws ConverterException
{
final Object object = getEnum( destination, original );
1.5 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java
Index: StringToFileConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFileConverter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StringToFileConverter.java 20 Jan 2002 17:32:58 -0000 1.4
+++ StringToFileConverter.java 21 Feb 2002 09:25:40 -0000 1.5
@@ -10,7 +10,6 @@
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 @@
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
1.6 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java
Index: StringToFloatConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToFloatConverter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StringToFloatConverter.java 20 Jan 2002 17:32:58 -0000 1.5
+++ StringToFloatConverter.java 21 Feb 2002 09:25:40 -0000 1.6
@@ -30,7 +30,7 @@
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
1.6 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java
Index: StringToIntegerConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToIntegerConverter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StringToIntegerConverter.java 20 Jan 2002 17:32:58 -0000 1.5
+++ StringToIntegerConverter.java 21 Feb 2002 09:25:40 -0000 1.6
@@ -30,7 +30,7 @@
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
1.6 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java
Index: StringToLongConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToLongConverter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StringToLongConverter.java 20 Jan 2002 17:32:58 -0000 1.5
+++ StringToLongConverter.java 21 Feb 2002 09:25:40 -0000 1.6
@@ -30,7 +30,7 @@
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
1.6 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java
Index: StringToShortConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToShortConverter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StringToShortConverter.java 20 Jan 2002 17:32:58 -0000 1.5
+++ StringToShortConverter.java 21 Feb 2002 09:25:40 -0000 1.6
@@ -30,7 +30,7 @@
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
1.6 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java
Index: StringToURLConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/StringToURLConverter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StringToURLConverter.java 20 Jan 2002 17:32:58 -0000 1.5
+++ StringToURLConverter.java 21 Feb 2002 09:25:40 -0000 1.6
@@ -32,7 +32,7 @@
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
1.17 +2 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java
Index: DefaultMasterConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DefaultMasterConverter.java 10 Feb 2002 02:23:12 -0000 1.16
+++ DefaultMasterConverter.java 21 Feb 2002 09:25:41 -0000 1.17
@@ -26,7 +26,7 @@
* Converter engine to handle converting between types.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.16 $ $Date: 2002/02/10 02:23:12 $
+ * @version $Revision: 1.17 $ $Date: 2002/02/21 09:25:41 $
*/
public class DefaultMasterConverter
extends AbstractLogEnabled
@@ -74,7 +74,7 @@
*/
public Object convert( final Class destination,
final Object original,
- final Context context )
+ final Object context )
throws ConverterException
{
final Class originalClass = original.getClass();
1.9 +5 -6
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/converter/AbstractConverter.java
Index: AbstractConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/converter/AbstractConverter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AbstractConverter.java 7 Feb 2002 13:00:52 -0000 1.8
+++ AbstractConverter.java 21 Feb 2002 09:25:41 -0000 1.9
@@ -9,13 +9,12 @@
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.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.8 $ $Date: 2002/02/07 13:00:52 $
+ * @version $Revision: 1.9 $ $Date: 2002/02/21 09:25:41 $
*/
public abstract class AbstractConverter
implements Converter
@@ -45,11 +44,11 @@
* @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 @@
* @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;
}
1.8 +2 -4
jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/converter/Converter.java
Index: Converter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/converter/Converter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Converter.java 14 Feb 2002 09:46:54 -0000 1.7
+++ Converter.java 21 Feb 2002 09:25:41 -0000 1.8
@@ -7,13 +7,11 @@
*/
package org.apache.myrmidon.converter;
-import org.apache.avalon.framework.context.Context;
-
/**
* Instances of this interface are used to convert between different types.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.7 $ $Date: 2002/02/14 09:46:54 $
+ * @version $Revision: 1.8 $ $Date: 2002/02/21 09:25:41 $
* @ant:role shorthand="converter"
*/
public interface Converter
@@ -31,6 +29,6 @@
* @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;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
