OpenJDK / bsd-port / bsd-port / jdk
changeset 3630:d21a1ce074a7
7015156: Remove JSR 308 changes from core libraries
Reviewed-by: mduigou
| author | darcy |
|---|---|
| date | Fri, 28 Jan 2011 17:09:49 -0800 |
| parents | dea360853f8b |
| children | f110edeb4428 |
| files | src/share/classes/java/lang/SuppressWarnings.java src/share/classes/java/lang/annotation/ElementType.java |
| diffstat | 2 files changed, 3 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/lang/SuppressWarnings.java Fri Jan 28 13:26:14 2011 +0000 +++ b/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/src/share/classes/java/lang/annotation/ElementType.java Fri Jan 28 13:26:14 2011 +0000 +++ b/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,