avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/data ImportDirective.java
Date Thu, 17 Jul 2003 00:36:59 GMT
mcconnell    2003/07/16 17:36:59

  Modified:    merlin/meta/src/java/org/apache/avalon/meta/data/writer
                        XMLDeploymentProfileWriter.java
               merlin/meta-spi/src/java/org/apache/avalon/meta/data
                        ImportDirective.java
  Log:
  Fix the green-lantern bug (context import key was showing up as the context key).
  
  Revision  Changes    Path
  1.6       +2 -2      avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/data/writer/XMLDeploymentProfileWriter.java
  
  Index: XMLDeploymentProfileWriter.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/data/writer/XMLDeploymentProfileWriter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XMLDeploymentProfileWriter.java	17 Jul 2003 00:05:20 -0000	1.5
  +++ XMLDeploymentProfileWriter.java	17 Jul 2003 00:36:59 -0000	1.6
  @@ -361,7 +361,7 @@
           {
               ImportDirective imp = (ImportDirective) entry;
               writer.write( "\n" + padding + "<import" );
  -            writer.write( " key=\"" + imp.getKey() + "\"" );
  +            writer.write( " key=\"" + imp.getImportKey() + "\"" );
               writer.write( "/>" );
           }
           else if( entry instanceof ConstructorDirective  )
  
  
  
  1.4       +7 -7      avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/data/ImportDirective.java
  
  Index: ImportDirective.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/data/ImportDirective.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ImportDirective.java	10 Jul 2003 19:41:21 -0000	1.3
  +++ ImportDirective.java	17 Jul 2003 00:36:59 -0000	1.4
  @@ -85,21 +85,21 @@
       /**
        * The container scoped key.
        */
  -    private final String m_key;
  +    private final String m_import;
   
       /**
        * Creation of a new entry directive.
  -     * @param component the componet entry key
  -     * @param container the container scope key value to import
  +     * @param key the context entry key
  +     * @param containerKey the container scoped key value to import
        */
       public ImportDirective( final String key, final String containerKey )
       {
           super( key );
           if( null == containerKey )
           {
  -            throw new NullPointerException( "key" );
  +            throw new NullPointerException( "containerKey" );
           }
  -        m_key = containerKey;
  +        m_import = containerKey;
       }
   
       /**
  @@ -109,6 +109,6 @@
        */
       public String getImportKey()
       {
  -        return m_key;
  +        return m_import;
       }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message