geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject cvs commit: incubator-geronimo/modules/common/src/java/org/apache/geronimo/common Classes.java
Date Wed, 03 Sep 2003 17:32:11 GMT
jdillon     2003/09/03 10:32:11

  Modified:    modules/common/src/java/org/apache/geronimo/common
                        Classes.java
  Log:
   o Removed methods which were duplicated in commons-lang ClassUtils
  
  Revision  Changes    Path
  1.3       +7 -83     incubator-geronimo/modules/common/src/java/org/apache/geronimo/common/Classes.java
  
  Index: Classes.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/common/src/java/org/apache/geronimo/common/Classes.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Classes.java	29 Aug 2003 19:33:43 -0000	1.2
  +++ Classes.java	3 Sep 2003 17:32:11 -0000	1.3
  @@ -59,96 +59,20 @@
   import java.lang.reflect.Array;
   import java.lang.reflect.Method;
   import java.lang.reflect.Modifier;
  +
   import java.util.HashMap;
   import java.util.Map;
   
  +import org.apache.commons.lang.ClassUtils;
  +
   /**
    * A collection of <code>Class</code> utilities.
    *
    * @version $Revision$ $Date$
    */
  -public final class Classes
  +public class Classes
  +    extends ClassUtils
   {
  -    /** The string used to separator packages */
  -    public static final String PACKAGE_SEPARATOR = ".";
  -    
  -    /** The characther used to separator packages */
  -    public static final char PACKAGE_SEPARATOR_CHAR = '.';
  -    
  -    /** The default package name. */
  -    public static final String DEFAULT_PACKAGE_NAME = "";
  -    
  -    /**
  -     * Get the short name of the specified class by striping off the package name.
  -     *
  -     * @param className  Class name.
  -     * @return           Short class name.
  -     */
  -    public static String stripPackageName(final String className) {
  -        if (className == null) {
  -            throw new NullArgumentException("className");
  -        }
  -        
  -        int idx = className.lastIndexOf(PACKAGE_SEPARATOR);
  -        
  -        if (idx != -1)
  -            return className.substring(idx + 1, className.length());
  -        return className;
  -    }
  -    
  -    /**
  -     * Get the short name of the specified class by striping off the package
  -     * name.
  -     *
  -     * @param type    Class name.
  -     * @return        Short class name.
  -     */
  -    public static String stripPackageName(final Class type) {
  -        if (type == null) {
  -            throw new NullArgumentException("type");
  -        }
  -        
  -        return stripPackageName(type.getName());
  -    }
  -    
  -    /**
  -     * Get the package name of the specified class.
  -     *
  -     * @param className  Class name.
  -     * @return           Package name or {@link #DEFAULT_PACKAGE_NAME} if the className
is in the
  -     *                   <i>default</i> package.
  -     *
  -     * @throws IllegalArgumentException     className is an empty string.
  -     */
  -    public static String getPackageName(final String className) {
  -        if (className == null) {
  -            throw new NullArgumentException("className");
  -        }
  -        if (className.length() == 0) {
  -            throw new IllegalArgumentException("className string is empty");
  -        }
  -        
  -        int index = className.lastIndexOf(PACKAGE_SEPARATOR);
  -        if (index != -1) {
  -            return className.substring(0, index);
  -        }
  -        return DEFAULT_PACKAGE_NAME;
  -    }
  -    
  -    /**
  -     * Get the package name of the specified class.
  -     *
  -     * @param type    Class.
  -     * @return        Package name.
  -     */
  -    public static String getPackageName(final Class type) {
  -        if (type == null) {
  -            throw new NullArgumentException("type");
  -        }
  -        
  -        return getPackageName(type.getName());
  -    }
  -    
       /**
        * Force the given class to be loaded fully.
        *
  @@ -169,7 +93,7 @@
           if (type.isPrimitive()) return;
           
           // don't attempt to force java.* classes to load
  -        String packageName = Classes.getPackageName(type);
  +        String packageName = ClassUtils.getPackageName(type);
           assert packageName != null;
           
           if (packageName.startsWith("java.") || 
  
  
  

Mime
View raw message