Add missing Java 1.7 java/lang/reflect/Modifier methods

Signed-off-by: Pekka Enberg <penberg@kernel.org>

2 files changed, 50 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 50e1c987b..78d453372 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2012-03-12  Pekka Enberg  <penberg@kernel.org>
 
+	* java/lang/reflect/Modifier.java:
+	(classModifiers): Add missing method.
+	(interfaceModifiers): Add missing method.
+	(constructorModifiers): Add missing method.
+	(methodModifiers): Add missing method.
+	(fieldModifiers): Add missing method.
+
+2012-03-12  Pekka Enberg  <penberg@kernel.org>
+
 	* java/lang/ClassNotFoundException,
 	* java/lang/IllegalAccessException.java,
 	* java/lang/InstantiationException.java,
diff --git a/java/lang/reflect/Modifier.java b/java/lang/reflect/Modifier.java
index 15bad05e7..c75f7b818 100644
--- a/java/lang/reflect/Modifier.java
+++ b/java/lang/reflect/Modifier.java
@@ -1,5 +1,5 @@
 /* java.lang.reflect.Modifier
-   Copyright (C) 1998, 1999, 2001, 2002, 2005, 2008  Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2001, 2002, 2005, 2008, 2012  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -300,6 +300,46 @@ public class Modifier
   }
 
   /**
+   * @since 1.7
+   */
+  public static int classModifiers()
+  {
+    return PUBLIC | PROTECTED | PRIVATE | STATIC | ABSTRACT | FINAL | STRICT;
+  }
+
+  /**
+   * @since 1.7
+   */
+  public static int interfaceModifiers()
+  {
+    return PUBLIC | PROTECTED | PRIVATE | STATIC | ABSTRACT | STRICT;
+  }
+
+  /**
+   * @since 1.7
+   */
+  public static int constructorModifiers()
+  {
+    return PUBLIC | PROTECTED | PRIVATE;
+  }
+
+  /**
+   * @since 1.7
+   */
+  public static int methodModifiers()
+  {
+    return PUBLIC | PROTECTED | PRIVATE | STATIC | ABSTRACT | FINAL | STRICT | SYNCHRONIZED | NATIVE;
+  }
+
+  /**
+   * @since 1.7
+   */
+  public static int fieldModifiers()
+  {
+    return PUBLIC | PROTECTED | PRIVATE | STATIC | FINAL | TRANSIENT | VOLATILE;
+  }
+
+  /**
    * Get a string representation of all the modifiers represented by the
    * given int. The keywords are printed in this order:
    * <code>&lt;public|protected|private&gt; abstract static final transient