Merge
authortbell
Sun, 28 Jun 2009 00:00:25 -0700
changeset 3064 1f377edfe18f
parent 3062 67816db34b33 (current diff)
parent 3063 a3fd491f7754 (diff)
child 3069 d83a89ff2c3b
Merge
--- a/jdk/src/share/classes/java/lang/annotation/ElementType.java	Fri Jun 26 10:25:45 2009 -0700
+++ b/jdk/src/share/classes/java/lang/annotation/ElementType.java	Sun Jun 28 00:00:25 2009 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright 2003-2009 Sun Microsystems, Inc.  All Rights Reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,12 @@
     /** Class, interface (including annotation type), or enum declaration */
     TYPE,
 
+    /** Uses of a type */
+    TYPE_USE,
+
+    /** type parameters */
+    TYPE_PARAMETER,
+
     /** Field declaration (includes enum constants) */
     FIELD,