ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core LoadProperties.java
Date Sun, 03 Feb 2002 03:37:48 GMT
donaldp     02/02/02 19:37:48

  Modified:    proposal/myrmidon/src/java/org/apache/antlib/archive
                        Pack.java Unpack.java
               proposal/myrmidon/src/java/org/apache/antlib/core
                        LoadProperties.java
  Log:
  Inline getName() method as it was causing conflicts with some tasks.
  
  SO instead of going getName() need to go getContext().getName()
  
  Revision  Changes    Path
  1.3       +1 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/archive/Pack.java
  
  Index: Pack.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/archive/Pack.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Pack.java	20 Jan 2002 17:32:56 -0000	1.2
  +++ Pack.java	3 Feb 2002 03:37:48 -0000	1.3
  @@ -60,7 +60,7 @@
           }
           catch( final IOException ioe )
           {
  -            final String message = "Problem creating " + getName() +
  +            final String message = "Problem creating " + getContext().getName() +
                   ":" + ioe.getMessage();
               throw new TaskException( message, ioe );
           }
  
  
  
  1.2       +1 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/archive/Unpack.java
  
  Index: Unpack.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/archive/Unpack.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Unpack.java	19 Jan 2002 07:41:48 -0000	1.1
  +++ Unpack.java	3 Feb 2002 03:37:48 -0000	1.2
  @@ -115,7 +115,7 @@
       {
           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 );
           }
   
  
  
  
  1.5       +2 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java
  
  Index: LoadProperties.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LoadProperties.java	25 Jan 2002 11:24:28 -0000	1.4
  +++ LoadProperties.java	3 Feb 2002 03:37:48 -0000	1.5
  @@ -114,7 +114,8 @@
           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 )
           {
  
  
  

--
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