Class.forName() patch committed

[Archie Cobbs]

FYI,

Patch below committed.

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com


Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2237
diff -u -U5 -r1.2237 ChangeLog
--- ChangeLog   7 Jun 2004 21:42:44 -0000       1.2237
+++ ChangeLog   8 Jun 2004 18:54:56 -0000
@@ -1,5 +1,10 @@
+2004-06-07  Archie Cobbs  <address@hidden>
+
+       * gnu/java/io/EncodingManager.java, java/util/ResourceBundle.java:
+       Replace ``Class.forName("Foo")'' with ``Foo.class''.
+
 2004-06-07  Steven Augart  <address@hidden>
 
        * native/jni/gtk-peer/gthread-jni.c (c-font-lock-extra-types): 
          Added jfieldID, jmethodID.
        * include/jni.h (c-font-lock-extra-types): Added.
Index: gnu/java/io/EncodingManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/io/EncodingManager.java,v
retrieving revision 1.6
diff -u -U5 -r1.6 EncodingManager.java
--- gnu/java/io/EncodingManager.java    22 Jan 2002 22:26:57 -0000      1.6
+++ gnu/java/io/EncodingManager.java    8 Jun 2004 18:54:56 -0000
@@ -203,11 +203,11 @@
       try
         {
           Class cls = Class.forName(classname);
 
           Class[] params = new Class[1];
-          params[0] = Class.forName("java.io.InputStream");
+          params[0] = InputStream.class;
 
           Constructor cons = cls.getConstructor(params);
 
           if (cache)
             decoder_cons.put(encoding, cons);            
@@ -246,11 +246,11 @@
       try
         {
           Class cls = Class.forName(classname);
 
           Class[] params = new Class[1];
-          params[0] = Class.forName("java.io.OutputStream");
+          params[0] = OutputStream.class;
 
           Constructor cons = cls.getConstructor(params);
 
           if (cache)
             encoder_cons.put(encoding, cons);            
Index: java/util/ResourceBundle.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/ResourceBundle.java,v
retrieving revision 1.23
diff -u -U5 -r1.23 ResourceBundle.java
--- java/util/ResourceBundle.java       23 Apr 2004 20:34:11 -0000      1.23
+++ java/util/ResourceBundle.java       8 Jun 2004 18:54:56 -0000
@@ -101,25 +101,10 @@
    * The locale of this resource bundle. You can read this with
    * <code>getLocale</code> and it is automatically set in
    * <code>getBundle</code>.
    */
   private Locale locale;
-
-  private static Class resourceBundleClass;
-  private static Class securityClass;
-
-  static
-  {
-    try
-      {
-       resourceBundleClass = Class.forName("java.util.ResourceBundle");
-       securityClass = Class.forName("java.util.ResourceBundle$Security");
-      }
-    catch (ClassNotFoundException e)
-      {
-      }
-  }
       
   /**
    * We override SecurityManager in order to access getClassContext().
    */
   private static final class Security extends SecurityManager
@@ -138,11 +123,11 @@
     ClassLoader getCallingClassLoader()
     {
       Class[] stack = getClassContext();
       for (int i = 0; i < stack.length; i++)
        {
-         if (stack[i] != securityClass && stack[i] != resourceBundleClass)
+         if (stack[i] != Security.class && stack[i] != ResourceBundle.class)
            return stack[i].getClassLoader();
        }
 
       return null;
     }