donaldp 00/12/06 02:36:42
Modified: proposal/myrmidon/src/java/org/apache/ant/convert
ConverterFactory.java DefaultConverterEngine.java
DefaultConverterFactory.java
proposal/myrmidon/src/java/org/apache/ant/tasklet/engine
DefaultTaskletEngine.java
DefaultTaskletFactory.java TaskletFactory.java
Removed: proposal/myrmidon/src/java/org/apache/ant/convert
ConverterEntry.java
proposal/myrmidon/src/java/org/apache/ant/tasklet/engine
TaskletEntry.java
Log:
Removed *Entry abstraction as it was overkill for Ant atm.
Revision Changes Path
1.3 +1 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/convert/ConverterFactory.java
Index: ConverterFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/convert/ConverterFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConverterFactory.java 2000/12/06 00:23:21 1.2
+++ ConverterFactory.java 2000/12/06 10:35:57 1.3
@@ -25,6 +25,6 @@
* @return the entry
* @exception FactoryException if an error occurs
*/
- ConverterEntry create( ConverterInfo info )
+ Converter createConverter( ConverterInfo info )
throws FactoryException;
}
1.2 +1 -2
jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterEngine.java
Index: DefaultConverterEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterEngine.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultConverterEngine.java 2000/12/06 06:11:24 1.1
+++ DefaultConverterEngine.java 2000/12/06 10:35:58 1.2
@@ -65,8 +65,7 @@
" conversion" );
}
- final ConverterEntry entry = m_converterFactory.create( info );
- final Converter converter = entry.getConverter();
+ final Converter converter = m_converterFactory.createConverter( info
);
return converter.convert( destination, original );
}
}
1.3 +4 -8
jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterFactory.java
Index: DefaultConverterFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultConverterFactory.java 2000/12/06 00:23:22 1.2
+++ DefaultConverterFactory.java 2000/12/06 10:35:59 1.3
@@ -34,7 +34,7 @@
* @return the created entry
* @exception FactoryException if an error occurs
*/
- public Entry create( final Info info )
+ public Object create( final Info info )
throws FactoryException
{
if( info.getClass().equals( ConverterInfo.class ) )
@@ -51,27 +51,23 @@
* @return the created entry
* @exception FactoryException if an error occurs
*/
- public ConverterEntry create( final ConverterInfo info )
+ public Converter createConverter( final ConverterInfo info )
throws FactoryException
{
final ConverterLoader loader = getLoader( info.getLocation() );
- Object object = null;
-
- try { object = loader.load( info.getClassname() ); }
+ try { return (Converter)loader.load( info.getClassname() ); }
catch( final Exception e )
{
throw new FactoryException( "Failed loading converter from " +
info.getLocation() +
" due to " + e, e );
}
-
- return new ConverterEntry( info, (Converter)object );
}
/**
* Get a loader for a particular location
*
- * @param locationthe location
+ * @param location the location
* @return the loader
*/
protected ConverterLoader getLoader( final URL location )
1.5 +1 -5
jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletEngine.java
Index: DefaultTaskletEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletEngine.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultTaskletEngine.java 2000/12/06 06:11:26 1.4
+++ DefaultTaskletEngine.java 2000/12/06 10:36:04 1.5
@@ -244,9 +244,7 @@
throw new AntException( "Unable to locate task " + name, re );
}
- TaskletEntry entry = null;
-
- try { entry = m_taskletFactory.create( info ); }
+ try { return m_taskletFactory.createTasklet( info ); }
catch( final FactoryException fe )
{
throw new AntException( "Unable to create task " + name +
@@ -254,7 +252,5 @@
info.getLocation() + ")",
fe );
}
-
- return entry.getTasklet();
}
}
1.2 +4 -6
jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletFactory.java
Index: DefaultTaskletFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultTaskletFactory.java 2000/12/04 13:37:31 1.1
+++ DefaultTaskletFactory.java 2000/12/06 10:36:33 1.2
@@ -27,7 +27,7 @@
extends DefaultConverterFactory
implements TaskletFactory
{
- public Entry create( final Info info )
+ public Object create( final Info info )
throws FactoryException
{
if( !info.getClass().equals( TaskletInfo.class ) )
@@ -36,25 +36,23 @@
}
else
{
- return create( (TaskletInfo)info );
+ return createTasklet( (TaskletInfo)info );
}
}
- public TaskletEntry create( final TaskletInfo info )
+ public Tasklet createTasklet( final TaskletInfo info )
throws FactoryException
{
final TaskletLoader loader = (TaskletLoader)getLoader(
info.getLocation() );
Object object = null;
- try { object = loader.load( info.getClassname() ); }
+ try { return (Tasklet)loader.load( info.getClassname() ); }
catch( final Exception e )
{
throw new FactoryException( "Failed loading tasklet from " +
info.getLocation() +
" due to " + e, e );
}
-
- return new TaskletEntry( info, (Tasklet)object );
}
protected ConverterLoader createLoader( final URL location )
1.2 +2 -1
jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletFactory.java
Index: TaskletFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TaskletFactory.java 2000/12/04 13:37:31 1.1
+++ TaskletFactory.java 2000/12/06 10:36:37 1.2
@@ -9,6 +9,7 @@
import org.apache.avalon.camelot.Factory;
import org.apache.avalon.camelot.FactoryException;
+import org.apache.ant.tasklet.Tasklet;
/**
* Facility used to load Tasklets.
@@ -18,6 +19,6 @@
public interface TaskletFactory
extends Factory
{
- TaskletEntry create( TaskletInfo info )
+ Tasklet createTasklet( TaskletInfo info )
throws FactoryException;
}
