ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adammurd...@apache.org
Subject cvs commit: jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework AbstractTypeDef.java
Date Wed, 22 May 2002 07:44:02 GMT
adammurdoch    02/05/22 00:44:02

  Modified:    antlib/src/java/org/apache/antlib/runtime ConverterDef.java
                        TypeDef.java
               framework/src/java/org/apache/myrmidon/framework
                        AbstractTypeDef.java
  Log:
  Oops.  Make classname private again.
  
  Revision  Changes    Path
  1.4       +3 -2      jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/runtime/ConverterDef.java
  
  Index: ConverterDef.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/runtime/ConverterDef.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ConverterDef.java	22 May 2002 07:36:21 -0000	1.3
  +++ ConverterDef.java	22 May 2002 07:44:02 -0000	1.4
  @@ -54,10 +54,11 @@
           attrs.put( TypeDefinition.ATTRIBUTE_DESTINATION_CLASS, m_destinationType );
   
           // Generate a type name
  -        final String name = m_classname.replace( TypeManager.NAMESPACE_SEPARATOR, '_' );
  +        final String classname = getClassname();
  +        final String name = classname.replace( TypeManager.NAMESPACE_SEPARATOR, '_' );
   
           final ClassLoaderTypeFactory typeFactory = new ClassLoaderTypeFactory( library.getClassLoader()
);
  -        typeFactory.addNameClassMapping( name, m_classname );
  +        typeFactory.addNameClassMapping( name, classname );
   
           final TypeDefinition typeDef = new TypeDefinition( name, Converter.ROLE, typeFactory,
attrs );
   
  
  
  
  1.4       +1 -1      jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/runtime/TypeDef.java
  
  Index: TypeDef.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/runtime/TypeDef.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TypeDef.java	22 May 2002 07:36:21 -0000	1.3
  +++ TypeDef.java	22 May 2002 07:44:02 -0000	1.4
  @@ -57,7 +57,7 @@
           throws Exception
       {
           final ClassLoaderTypeFactory typeFactory = new ClassLoaderTypeFactory( library.getClassLoader()
);
  -        typeFactory.addNameClassMapping( m_name, m_classname );
  +        typeFactory.addNameClassMapping( m_name, getClassname() );
   
           final Deployer deployer = (Deployer)getService( Deployer.class );
           final TypeLibraryDeployer typeDeployer = deployer.createDeployer( library, m_namespace
);
  
  
  
  1.9       +7 -2      jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java
  
  Index: AbstractTypeDef.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/AbstractTypeDef.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- AbstractTypeDef.java	22 May 2002 07:36:24 -0000	1.8
  +++ AbstractTypeDef.java	22 May 2002 07:44:02 -0000	1.9
  @@ -20,7 +20,7 @@
    * Abstract task to extend to define a type.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.8 $ $Date: 2002/05/22 07:36:24 $
  + * @version $Revision: 1.9 $ $Date: 2002/05/22 07:44:02 $
    */
   public abstract class AbstractTypeDef
       extends AbstractContainerTask
  @@ -29,11 +29,16 @@
           ResourceManager.getPackageResources( AbstractTypeDef.class );
   
       private Path m_classpath = new Path();
  -    protected String m_classname;
  +    private String m_classname;
   
       public void setClassname( final String classname )
       {
           m_classname = classname;
  +    }
  +
  +    protected String getClassname()
  +    {
  +        return m_classname;
       }
   
       public void setClasspath( final String path )
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message