Browse Source

Update class to use new configuration of attribute method.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269100 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 24 years ago
parent
commit
7a87980dc3
1 changed files with 3 additions and 31 deletions
  1. +3
    -31
      proposal/myrmidon/src/java/org/apache/ant/modules/basic/Property.java

+ 3
- 31
proposal/myrmidon/src/java/org/apache/ant/modules/basic/Property.java View File

@@ -52,48 +52,20 @@ public class Property
throws ConfigurationException throws ConfigurationException
{ {
final String[] attributes = configuration.getAttributeNames(); final String[] attributes = configuration.getAttributeNames();

for( int i = 0; i < attributes.length; i++ ) for( int i = 0; i < attributes.length; i++ )
{ {
final String name = attributes[ i ]; final String name = attributes[ i ];
final String value = configuration.getAttribute( name ); final String value = configuration.getAttribute( name );

final Object object = resolve( value );

if( name.equals( "name" ) )
{
final String convertedValue = (String)convert( String.class, object );
setName( convertedValue );
}
else if( name.equals( "value" ) )
{
try { setValue( object ); }
catch( final TaskException te )
{
throw new ConfigurationException( "Error setting value: " + value, te );
}
}
else if( name.equals( "local-scope" ) )
{
final Boolean localScope = (Boolean)convert( Boolean.class, object );
setLocalScope( Boolean.TRUE == localScope );
}
else
{
throw new ConfigurationException( "Unknown attribute " + name );
}
configure( this, name, value );
} }


final Configuration[] children = configuration.getChildren(); final Configuration[] children = configuration.getChildren();

for( int i = 0; i < children.length; i++ ) for( int i = 0; i < children.length; i++ )
{ {
final Configuration child = children[ i ];

try try
{ {
final DataType value = (DataType)m_factory.create( child.getName() );
configure( value, child );
final DataType value = (DataType)m_factory.create( children[ i ].getName() );
configure( value, children[ i ] );
setValue( value ); setValue( value );
} }
catch( final Exception e ) catch( final Exception e )


Loading…
Cancel
Save