Browse Source

Convert parameter to use FIle type directly rather than converting from String.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269296 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 24 years ago
parent
commit
cbbb531caa
2 changed files with 6 additions and 9 deletions
  1. +3
    -4
      proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java
  2. +3
    -5
      proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java

+ 3
- 4
proposal/myrmidon/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java View File

@@ -31,7 +31,7 @@ public abstract class AbstractTypeDef
extends AbstractTask extends AbstractTask
implements Composable implements Composable
{ {
private String m_lib;
private File m_lib;
private String m_name; private String m_name;
private String m_className; private String m_className;
private TypeManager m_typeManager; private TypeManager m_typeManager;
@@ -44,7 +44,7 @@ public abstract class AbstractTypeDef
m_roleManager = (RoleManager)componentManager.lookup( RoleManager.ROLE ); m_roleManager = (RoleManager)componentManager.lookup( RoleManager.ROLE );
} }


public void setLib( final String lib )
public void setLib( final File lib )
{ {
//In the future this would be replaced by ClassPath sub-element //In the future this would be replaced by ClassPath sub-element
m_lib = lib; m_lib = lib;
@@ -92,8 +92,7 @@ public abstract class AbstractTypeDef
//TODO: Make this support classpath sub-element in future //TODO: Make this support classpath sub-element in future
try try
{ {
final File file = getContext().resolveFile( m_lib );
final URL url = file.getCanonicalFile().toURL();
final URL url = m_lib.toURL();
final ClassLoader classLoader = final ClassLoader classLoader =
Thread.currentThread().getContextClassLoader(); Thread.currentThread().getContextClassLoader();




+ 3
- 5
proposal/myrmidon/src/java/org/apache/myrmidon/libs/runtime/ConverterDef.java View File

@@ -31,7 +31,7 @@ public class ConverterDef
{ {
private String m_sourceType; private String m_sourceType;
private String m_destinationType; private String m_destinationType;
private String m_lib;
private File m_lib;
private String m_classname; private String m_classname;
private ConverterRegistry m_converterRegistry; private ConverterRegistry m_converterRegistry;
private TypeManager m_typeManager; private TypeManager m_typeManager;
@@ -43,7 +43,7 @@ public class ConverterDef
m_typeManager = (TypeManager)componentManager.lookup( TypeManager.ROLE ); m_typeManager = (TypeManager)componentManager.lookup( TypeManager.ROLE );
} }


public void setLib( final String lib )
public void setLib( final File lib )
{ {
m_lib = lib; m_lib = lib;
} }
@@ -83,13 +83,11 @@ public class ConverterDef
throw new TaskException( "Must specify the lib parameter" ); throw new TaskException( "Must specify the lib parameter" );
} }


final File file = getContext().resolveFile( m_lib );

try try
{ {
m_converterRegistry.registerConverter( m_classname, m_sourceType, m_destinationType ); m_converterRegistry.registerConverter( m_classname, m_sourceType, m_destinationType );


final URL url = file.toURL();
final URL url = m_lib.toURL();
final DefaultTypeFactory factory = new DefaultTypeFactory( new URL[] { url } ); final DefaultTypeFactory factory = new DefaultTypeFactory( new URL[] { url } );
factory.addNameClassMapping( m_classname, m_classname ); factory.addNameClassMapping( m_classname, m_classname );




Loading…
Cancel
Save