@@ -11,7 +11,6 @@ import java.util.Properties;
import java.util.Stack; import java.util.Stack;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.util.FileNameMapper;
/** /**
@@ -19,23 +18,15 @@ import org.apache.tools.ant.util.FileNameMapper;
* *
* @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
*/ */
public class Mapper extends DataType implements Cloneable
public class Mapper
extends DataType
implements Cloneable
{ {
protected MapperType type = null;
protected String classname = null;
protected Path classpath = null;
protected String from = null;
protected String to = null;
public Mapper( Project p )
{
setProject( p );
}
private MapperType m_type;
private String m_classname;
private Path m_classpath;
private String m_from;
private String m_to;
/** /**
* Set the class name of the FileNameMapper to use. * Set the class name of the FileNameMapper to use.
@@ -49,7 +40,7 @@ public class Mapper extends DataType implements Cloneable
{ {
throw tooManyAttributes(); throw tooManyAttributes();
} }
this.classname = classname;
this.m_ classname = classname;
} }
/** /**
@@ -64,13 +55,13 @@ public class Mapper extends DataType implements Cloneable
{ {
throw tooManyAttributes(); throw tooManyAttributes();
} }
if( this.classpath == null )
if( this.m_ classpath == null )
{ {
this.classpath = classpath;
this.m_ classpath = classpath;
} }
else else
{ {
this.classpath.append( classpath );
this.m_ classpath.append( classpath );
} }
} }
@@ -102,7 +93,7 @@ public class Mapper extends DataType implements Cloneable
{ {
throw tooManyAttributes(); throw tooManyAttributes();
} }
this.from = from;
this.m_ from = from;
} }
/** /**
@@ -116,7 +107,7 @@ public class Mapper extends DataType implements Cloneable
public void setRefid( Reference r ) public void setRefid( Reference r )
throws TaskException throws TaskException
{ {
if( type != null || from != null || to != null )
if( m_ type != null || m_ from != null || m_ to != null )
{ {
throw tooManyAttributes(); throw tooManyAttributes();
} }
@@ -135,7 +126,7 @@ public class Mapper extends DataType implements Cloneable
{ {
throw tooManyAttributes(); throw tooManyAttributes();
} }
this.to = to;
this.m_ to = to;
} }
/** /**
@@ -150,7 +141,7 @@ public class Mapper extends DataType implements Cloneable
{ {
throw tooManyAttributes(); throw tooManyAttributes();
} }
this.type = type;
this.m_ type = type;
} }
/** /**
@@ -167,39 +158,39 @@ public class Mapper extends DataType implements Cloneable
return getRef().getImplementation(); return getRef().getImplementation();
} }
if( type == null && classname == null )
if( m_ type == null && m_ classname == null )
{ {
throw new TaskException( "one of the attributes type or classname is required" ); throw new TaskException( "one of the attributes type or classname is required" );
} }
if( type != null && classname != null )
if( m_ type != null && m_ classname != null )
{ {
throw new TaskException( "must not specify both type and classname attribute" ); throw new TaskException( "must not specify both type and classname attribute" );
} }
try try
{ {
if( type != null )
if( m_ type != null )
{ {
classname = type.getImplementation();
m_ classname = m_ type.getImplementation();
} }
Class c = null; Class c = null;
if( classpath == null )
if( m_ classpath == null )
{ {
c = Class.forName( classname );
c = Class.forName( m_ classname );
} }
else else
{ {
AntClassLoader al = new AntClassLoader( getProject(), AntClassLoader al = new AntClassLoader( getProject(),
classpath );
c = al.loadClass( classname );
m_ classpath );
c = al.loadClass( m_ classname );
AntClassLoader.initializeClass( c ); AntClassLoader.initializeClass( c );
} }
FileNameMapper m = (FileNameMapper)c.newInstance(); FileNameMapper m = (FileNameMapper)c.newInstance();
m.setFrom( from );
m.setTo( to );
m.setFrom( m_ from );
m.setTo( m_ to );
return m; return m;
} }
catch( TaskException be ) catch( TaskException be )
@@ -212,9 +203,9 @@ public class Mapper extends DataType implements Cloneable
} }
finally finally
{ {
if( type != null )
if( m_ type != null )
{ {
classname = null;
m_ classname = null;
} }
} }
} }
@@ -231,11 +222,11 @@ public class Mapper extends DataType implements Cloneable
{ {
throw noChildrenAllowed(); throw noChildrenAllowed();
} }
if( this.classpath == null )
if( this.m_ classpath == null )
{ {
this.classpath = new Path( getProject() );
this.m_ classpath = new Path();
} }
return this.classpath.createPath();
return this.m_ classpath.createPath();
} }
/** /**
@@ -266,39 +257,4 @@ public class Mapper extends DataType implements Cloneable
} }
} }
/**
* Class as Argument to FileNameMapper.setType.
*
* @author RT
*/
public static class MapperType extends EnumeratedAttribute
{
private Properties implementations;
public MapperType()
{
implementations = new Properties();
implementations.put( "identity",
"org.apache.tools.ant.util.IdentityMapper" );
implementations.put( "flatten",
"org.apache.tools.ant.util.FlatFileNameMapper" );
implementations.put( "glob",
"org.apache.tools.ant.util.GlobPatternMapper" );
implementations.put( "merge",
"org.apache.tools.ant.util.MergingMapper" );
implementations.put( "regexp",
"org.apache.tools.ant.util.RegexpPatternMapper" );
}
public String getImplementation()
{
return implementations.getProperty( getValue() );
}
public String[] getValues()
{
return new String[]{"identity", "flatten", "glob", "merge", "regexp"};
}
}
} }
Peter Donald