7015156: Remove JSR 308 changes from core libraries
authordarcy
Fri, 28 Jan 2011 17:09:49 -0800
changeset 8161 c64f086785d9
parent 8160 4257e268578e
child 8162 d91ca3f845b0
7015156: Remove JSR 308 changes from core libraries Reviewed-by: mduigou
jdk/src/share/classes/java/lang/SuppressWarnings.java
jdk/src/share/classes/java/lang/annotation/ElementType.java
--- a/jdk/src/share/classes/java/lang/SuppressWarnings.java	Fri Jan 28 13:26:14 2011 +0000
+++ b/jdk/src/share/classes/java/lang/SuppressWarnings.java	Fri Jan 28 17:09:49 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2011, Oracle and/or its affiliates. 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
@@ -44,7 +44,7 @@
  * @since 1.5
  * @author Josh Bloch
  */
-@Target({TYPE, FIELD, METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE, TYPE_PARAMETER})
+@Target({TYPE, FIELD, METHOD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE})
 @Retention(RetentionPolicy.SOURCE)
 public @interface SuppressWarnings {
     /**
--- a/jdk/src/share/classes/java/lang/annotation/ElementType.java	Fri Jan 28 13:26:14 2011 +0000
+++ b/jdk/src/share/classes/java/lang/annotation/ElementType.java	Fri Jan 28 17:09:49 2011 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. 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,12 +40,6 @@
     /** 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,