Imported GNU Classpath 0.90

       * scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
       * gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
       * java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
       * java/lang/Math.java: New override file.
       * java/lang/Character.java: Merged from Classpath.
       (start, end): Now 'int's.
       (canonicalName): New field.
       (CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
       (UnicodeBlock): Added argument.
       (of): New overload.
       (forName): New method.
       Updated unicode blocks.
       (sets): Updated.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@111942 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 30 insertions, 20 deletions

diff --git a/libjava/classpath/java/awt/datatransfer/DataFlavor.java b/libjava/classpath/java/awt/datatransfer/DataFlavor.java
index 32bf4d6cf37..788ae6d6a52 100644
--- a/libjava/classpath/java/awt/datatransfer/DataFlavor.java
+++ b/libjava/classpath/java/awt/datatransfer/DataFlavor.java
@@ -157,38 +157,42 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
                                              ClassLoader classLoader)
     throws ClassNotFoundException
   {
+    // Bootstrap
     try
       {
-        return(Class.forName(className));
+        return Class.forName(className);
       }
-    catch(Exception e) { ; }
-    // Commented out for Java 1.1
-    /*
-    try
+    catch(ClassNotFoundException cnfe)
       {
-        return(className.getClass().getClassLoader().findClass(className));
+	// Ignored.
       }
-    catch(Exception e) { ; }
   
+    // System
     try
       {
-        return(ClassLoader.getSystemClassLoader().findClass(className));
+	ClassLoader loader = ClassLoader.getSystemClassLoader();
+        return Class.forName(className, true, loader);
       }
-    catch(Exception e) { ; }
-    */
-  
-    // FIXME: What is the context class loader?
-    /*
+    catch(ClassNotFoundException cnfe)
+      {
+	// Ignored.
+      }
+ 
+    // Context
     try
       {
+	ClassLoader loader = Thread.currentThread().getContextClassLoader();
+        return Class.forName(className, true, loader);
       }
-    catch(Exception e) { ; }
-    */
-  
+    catch(ClassNotFoundException cnfe)
+      {
+	// Ignored.
+      }
+ 
     if (classLoader != null)
-      return(classLoader.loadClass(className));
-    else
-      throw new ClassNotFoundException(className);
+      return Class.forName(className, true, classLoader);
+
+    throw new ClassNotFoundException(className);
   }
   
   private static Class getRepresentationClassFromMime(String mimeString,
@@ -203,7 +207,13 @@ public class DataFlavor implements java.io.Externalizable, Cloneable
             }
           catch(Exception e)
             {
-              throw new IllegalArgumentException("classname: " + e.getMessage());
+	      IllegalArgumentException iae;
+              iae = new IllegalArgumentException("mimeString: "
+						 + mimeString
+			      			 + " classLoader: "
+						 + classLoader);
+	      iae.initCause(e);
+	      throw iae;
             }
         }
       else