Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authormullan
Fri, 15 Jan 2010 09:58:48 -0500
changeset 4674 e842c85ac8f4
parent 4672 ca386fa28a62 (diff)
parent 4673 1536565aebcc (current diff)
child 4675 68f287672813
Merge
--- a/jdk/src/share/classes/java/lang/Deprecated.java	Fri Jan 15 09:48:21 2010 -0500
+++ b/jdk/src/share/classes/java/lang/Deprecated.java	Fri Jan 15 09:58:48 2010 -0500
@@ -26,6 +26,7 @@
 package java.lang;
 
 import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.*;
 
 /**
  * A program element annotated @Deprecated is one that programmers
@@ -38,5 +39,6 @@
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
+@Target(value={CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE})
 public @interface Deprecated {
 }
--- a/jdk/src/share/classes/java/lang/SuppressWarnings.java	Fri Jan 15 09:48:21 2010 -0500
+++ b/jdk/src/share/classes/java/lang/SuppressWarnings.java	Fri Jan 15 09:58:48 2010 -0500
@@ -26,7 +26,6 @@
 package java.lang;
 
 import java.lang.annotation.*;
-import java.lang.annotation.ElementType;
 import static java.lang.annotation.ElementType.*;
 
 /**
@@ -45,7 +44,7 @@
  * @since 1.5
  * @author Josh Bloch
  */
-@Target({TYPE, FIELD, METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE})
+@Target({TYPE, FIELD, METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE, TYPE_PARAMETER})
 @Retention(RetentionPolicy.SOURCE)
 public @interface SuppressWarnings {
     /**
jdk-sandbox