From 92cf6a4b4869a2b00fca66a84622c27c47f3178d Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Wed, 6 Dec 2000 10:39:52 +0000 Subject: [PATCH] Removed *Entry abstraction as it was overkill for Ant atm. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268320 13f79535-47bb-0310-9956-ffa450edef68 --- proposal/myrmidon/lib/avalonapi.jar | Bin 161852 -> 162212 bytes .../apache/ant/convert/ConverterEntry.java | 37 ------------------ .../apache/ant/convert/ConverterFactory.java | 2 +- .../ant/convert/DefaultConverterEngine.java | 3 +- .../ant/convert/DefaultConverterFactory.java | 12 ++---- .../tasklet/engine/DefaultTaskletEngine.java | 6 +-- .../tasklet/engine/DefaultTaskletFactory.java | 10 ++--- .../ant/tasklet/engine/TaskletEntry.java | 31 --------------- .../ant/tasklet/engine/TaskletFactory.java | 3 +- 9 files changed, 13 insertions(+), 91 deletions(-) delete mode 100644 proposal/myrmidon/src/java/org/apache/ant/convert/ConverterEntry.java delete mode 100644 proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletEntry.java diff --git a/proposal/myrmidon/lib/avalonapi.jar b/proposal/myrmidon/lib/avalonapi.jar index acd6ca71e5c1393c1f758fee824b87634ffb0d09..5f6e764fe2ecfb26349225d23eac3bee60ef0c91 100644 GIT binary patch delta 5225 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 delta 4809 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 diff --git a/proposal/myrmidon/src/java/org/apache/ant/convert/ConverterEntry.java b/proposal/myrmidon/src/java/org/apache/ant/convert/ConverterEntry.java deleted file mode 100644 index 6b411e788..000000000 --- a/proposal/myrmidon/src/java/org/apache/ant/convert/ConverterEntry.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE file. - */ -package org.apache.ant.convert; - -import org.apache.ant.convert.Converter; -import org.apache.avalon.camelot.AbstractEntry; - -/** - * An entry representing an instance of Converter. - * See Cameloy documentation for more details. - * - * @author Peter Donald - */ -public class ConverterEntry - extends AbstractEntry -{ - public ConverterEntry( final ConverterInfo info, final Converter converter ) - { - super( info, converter ); - } - - /** - * Retrieve instance of converter. - * - * @return the component instance - */ - public Converter getConverter() - { - return (Converter)getInstance(); - } -} - diff --git a/proposal/myrmidon/src/java/org/apache/ant/convert/ConverterFactory.java b/proposal/myrmidon/src/java/org/apache/ant/convert/ConverterFactory.java index fd5dd8266..8987cc771 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/convert/ConverterFactory.java +++ b/proposal/myrmidon/src/java/org/apache/ant/convert/ConverterFactory.java @@ -25,6 +25,6 @@ public interface ConverterFactory * @return the entry * @exception FactoryException if an error occurs */ - ConverterEntry create( ConverterInfo info ) + Converter createConverter( ConverterInfo info ) throws FactoryException; } diff --git a/proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterEngine.java b/proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterEngine.java index 31e650436..a23c1a1a2 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterEngine.java +++ b/proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterEngine.java @@ -65,8 +65,7 @@ public class DefaultConverterEngine " 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 ); } } diff --git a/proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterFactory.java b/proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterFactory.java index d6766f740..e6fe33775 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterFactory.java +++ b/proposal/myrmidon/src/java/org/apache/ant/convert/DefaultConverterFactory.java @@ -34,7 +34,7 @@ public class DefaultConverterFactory * @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 @@ public class DefaultConverterFactory * @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 ) diff --git a/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletEngine.java b/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletEngine.java index 02d381881..555326fc7 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletEngine.java +++ b/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletEngine.java @@ -244,9 +244,7 @@ public class DefaultTaskletEngine 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 @@ public class DefaultTaskletEngine info.getLocation() + ")", fe ); } - - return entry.getTasklet(); } } diff --git a/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletFactory.java b/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletFactory.java index 553f8ea39..2df505a14 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletFactory.java +++ b/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/DefaultTaskletFactory.java @@ -27,7 +27,7 @@ public class DefaultTaskletFactory 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 @@ public class DefaultTaskletFactory } 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 ) diff --git a/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletEntry.java b/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletEntry.java deleted file mode 100644 index b8003b772..000000000 --- a/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletEntry.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE file. - */ -package org.apache.ant.tasklet.engine; - -import org.apache.ant.tasklet.Tasklet; -import org.apache.avalon.camelot.AbstractEntry; - -public class TaskletEntry - extends AbstractEntry -{ - public TaskletEntry( final TaskletInfo info, final Tasklet tasklet ) - { - super( info, tasklet ); - } - - /** - * Retrieve instance of tasklet. - * - * @return the component instance - */ - public Tasklet getTasklet() - { - return (Tasklet)getInstance(); - } -} - diff --git a/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletFactory.java b/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletFactory.java index eaaf8be55..a36d133a7 100644 --- a/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletFactory.java +++ b/proposal/myrmidon/src/java/org/apache/ant/tasklet/engine/TaskletFactory.java @@ -9,6 +9,7 @@ package org.apache.ant.tasklet.engine; 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 @@ import org.apache.avalon.camelot.FactoryException; public interface TaskletFactory extends Factory { - TaskletEntry create( TaskletInfo info ) + Tasklet createTasklet( TaskletInfo info ) throws FactoryException; }