avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/metainfo ComponentDescriptor.java ContextDescriptor.java
Date Tue, 11 Jun 2002 00:16:17 GMT
mcconnell    2002/06/10 17:16:17

  Modified:    containerkit/src/java/org/apache/excalibur/containerkit/metainfo
                        ComponentDescriptor.java ContextDescriptor.java
  Log:
  removed dependency of i18n
  
  Revision  Changes    Path
  1.13      +3 -9      jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/metainfo/ComponentDescriptor.java
  
  Index: ComponentDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/metainfo/ComponentDescriptor.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ComponentDescriptor.java	10 Jun 2002 22:45:59 -0000	1.12
  +++ ComponentDescriptor.java	11 Jun 2002 00:16:17 -0000	1.13
  @@ -9,8 +9,6 @@
   
   import java.util.Properties;
   import org.apache.avalon.framework.Version;
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
   
   /**
    * This class is used to provide explicit information to assembler
  @@ -57,9 +55,6 @@
       extends FeatureDescriptor
   {
   
  -    private static final Resources REZ =
  -        ResourceManager.getPackageResources( ComponentDescriptor.class );
  -
       /**
        * The short name of the Component Type. Useful for displaying
        * human readable strings describing the type in
  @@ -79,6 +74,7 @@
   
       /**
        * The version of component that descriptor describes.
  +     * @exception IllegalArgumentException if the classname format is invalid
        */
       private final Version m_version;
   
  @@ -92,9 +88,7 @@
   
           if( classname.indexOf("/") > -1 )
           {
  -            final String message =
  -              REZ.getString( "component.invalid-classname", classname );
  -            throw new IllegalArgumentException( message );
  +            throw new IllegalArgumentException( "classname: " + classname );
           }
   
           m_name = name;
  
  
  
  1.5       +4 -9      jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/metainfo/ContextDescriptor.java
  
  Index: ContextDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/metainfo/ContextDescriptor.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ContextDescriptor.java	10 Jun 2002 22:45:59 -0000	1.4
  +++ ContextDescriptor.java	11 Jun 2002 00:16:17 -0000	1.5
  @@ -8,8 +8,6 @@
   package org.apache.excalibur.containerkit.metainfo;
   
   import java.util.Properties;
  -import org.apache.avalon.excalibur.i18n.ResourceManager;
  -import org.apache.avalon.excalibur.i18n.Resources;
   
   /**
    * A descriptor describing the Context that the Component
  @@ -32,9 +30,6 @@
       extends FeatureDescriptor
   {
   
  -    private static final Resources REZ =
  -        ResourceManager.getPackageResources( ContextDescriptor.class );
  -
       private final String m_classname;
       private final EntryDescriptor[] m_entrys;
   
  @@ -49,6 +44,8 @@
   
       /**
        * Create a descriptor.
  +     * @exception NullPointerException if classname or entry argument is null
  +     * @exception IllegalArgumentException if the classname format is invalid
        */
       public ContextDescriptor( final String classname,
                                 final EntryDescriptor[] entrys,
  @@ -68,9 +65,7 @@
   
           if( classname.indexOf("/") > -1 )
           {
  -            final String message =
  -              REZ.getString( "component.invalid-classname", classname );
  -            throw new IllegalArgumentException( message );
  +            throw new IllegalArgumentException( "classname: " + classname );
           }
   
           m_classname = classname;
  
  
  

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


Mime
View raw message