From 4c0dbfa05f14aa756e24f4bce1fc5f7f836b47d9 Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Sun, 3 Feb 2002 03:37:48 +0000
Subject: [PATCH] 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
---
 proposal/myrmidon/src/java/org/apache/antlib/archive/Pack.java | 2 +-
 .../myrmidon/src/java/org/apache/antlib/archive/Unpack.java    | 2 +-
 .../src/java/org/apache/antlib/core/LoadProperties.java        | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/proposal/myrmidon/src/java/org/apache/antlib/archive/Pack.java b/proposal/myrmidon/src/java/org/apache/antlib/archive/Pack.java
index 9343ca370..b8eab4645 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/archive/Pack.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/archive/Pack.java
@@ -60,7 +60,7 @@ public abstract class Pack
         }
         catch( final IOException ioe )
         {
-            final String message = "Problem creating " + getName() +
+            final String message = "Problem creating " + getContext().getName() +
                 ":" + ioe.getMessage();
             throw new TaskException( message, ioe );
         }
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/archive/Unpack.java b/proposal/myrmidon/src/java/org/apache/antlib/archive/Unpack.java
index 0475e51ca..012b86935 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/archive/Unpack.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/archive/Unpack.java
@@ -115,7 +115,7 @@ public abstract class Unpack
     {
         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 );
         }
 
diff --git a/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java b/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java
index 9d43d7a5e..6a5249951 100644
--- a/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java
+++ b/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java
@@ -114,7 +114,8 @@ public class LoadProperties
         try
         {
             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 )
         {