Browse Source

Inline getName() method as it was causing conflicts with some tasks.

SO instead of going getName() need to go getContext().getName()


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271105 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 23 years ago
parent
commit
4c0dbfa05f
3 changed files with 4 additions and 3 deletions
  1. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/archive/Pack.java
  2. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/archive/Unpack.java
  3. +2
    -1
      proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java

+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/archive/Pack.java View File

@@ -60,7 +60,7 @@ public abstract class Pack
} }
catch( final IOException ioe ) catch( final IOException ioe )
{ {
final String message = "Problem creating " + getName() +
final String message = "Problem creating " + getContext().getName() +
":" + ioe.getMessage(); ":" + ioe.getMessage();
throw new TaskException( message, ioe ); throw new TaskException( message, ioe );
} }


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/archive/Unpack.java View File

@@ -115,7 +115,7 @@ public abstract class Unpack
{ {
if( null == m_src ) if( null == m_src )
{ {
final String message = "No Src for " + getName() + " specified";
final String message = "No Src for " + getContext().getName() + " specified";
throw new TaskException( message ); throw new TaskException( message );
} }




+ 2
- 1
proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java View File

@@ -114,7 +114,8 @@ public class LoadProperties
try try
{ {
final Object objectValue = resolveValue( value.toString() ); final Object objectValue = resolveValue( value.toString() );
setProperty( m_prefix + name, objectValue );
final String name1 = m_prefix + name;
getContext().setProperty( name1, objectValue );
} }
catch( final TaskException te ) catch( final TaskException te )
{ {


Loading…
Cancel
Save