changeset 1385:bd4f0613dd92

Merge
author tbell
date Sun, 28 Jun 2009 00:00:25 -0700
parents 9f243df213fa a5f7d97c3f82
children 35b19adcb215
files
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/lang/annotation/ElementType.java	Fri Jun 26 10:25:45 2009 -0700
+++ b/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,