2006-04-23 Jeroen Frijters <jeroen@frijters.net>

        * java/lang/Class.java (getEnumConstants): Implemented without
        delegating to VMClass.
        * vm/reference/java/lang/VMClass.java (getEnumConstants): Removed.

1 files changed, 25 insertions, 1 deletions

diff --git a/java/lang/Class.java b/java/lang/Class.java
index 2152accf3..c5ec1536d 100644
--- a/java/lang/Class.java
+++ b/java/lang/Class.java
@@ -1374,7 +1374,31 @@ public final class Class<T>
    */
   public T[] getEnumConstants()
   {
-    return (T[])VMClass.getEnumConstants(this);
+    if (isEnum())
+      {
+	try
+	  {
+	    return (T[]) getMethod("values").invoke(null);
+	  }
+	catch (NoSuchMethodException exception)
+	  {
+	    throw new Error("Enum lacks values() method");
+	  }
+	catch (IllegalAccessException exception)
+	  {
+	    throw new Error("Unable to access Enum class");
+	  }
+	catch (InvocationTargetException exception)
+	  {
+	    throw new
+	      RuntimeException("The values method threw an exception",
+			       exception);
+	  }
+      }
+    else
+      {
+	return null;
+      }
   }
 
   /**