1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8014836: Have GenericDeclaration extend AnnotatedElement

Browse Source 
Reviewed-by: abuckley, jfranck
This commit is contained in:
Joe Darcy 2013-05-22 20:03:45 -07:00
parent 4ef977fec3
commit 7c644b0a4b
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jdk/src/share/classes/java/lang/Class.java
View File

@ -28,6 +28,7 @@ package java.lang;
import java.lang.reflect.AnnotatedElement; import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.lang.reflect.GenericArrayType; import java.lang.reflect.GenericArrayType;
import java.lang.reflect.GenericDeclaration;
import java.lang.reflect.Member; import java.lang.reflect.Member;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Executable; import java.lang.reflect.Executable;
@ -115,9 +116,9 @@ import sun.reflect.misc.ReflectUtil;
* @since JDK1.0 * @since JDK1.0
*/ */
public final class Class<T> implements java.io.Serializable, public final class Class<T> implements java.io.Serializable,
java.lang.reflect.GenericDeclaration, GenericDeclaration,
java.lang.reflect.Type, Type,
java.lang.reflect.AnnotatedElement { AnnotatedElement {
private static final int ANNOTATION= 0x00002000; private static final int ANNOTATION= 0x00002000;
private static final int ENUM = 0x00004000; private static final int ENUM = 0x00004000;
private static final int SYNTHETIC = 0x00001000; private static final int SYNTHETIC = 0x00001000;
@ -3182,7 +3183,7 @@ public final class Class<T> implements java.io.Serializable,
*/ */
@Override @Override
public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) { public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
return AnnotatedElement.super.isAnnotationPresent(annotationClass); return GenericDeclaration.super.isAnnotationPresent(annotationClass);
} }
/** /**

4
jdk/src/share/classes/java/lang/reflect/GenericDeclaration.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -30,7 +30,7 @@ package java.lang.reflect;
* *
* @since 1.5 * @since 1.5
*/ */
public interface GenericDeclaration { public interface GenericDeclaration extends AnnotatedElement {
/** /**
* Returns an array of {@code TypeVariable} objects that * Returns an array of {@code TypeVariable} objects that
* represent the type variables declared by the generic * represent the type variables declared by the generic