src/share/classes/com/sun/beans/TypeResolver.java

Print this page

        

*** 1,7 **** /* ! * Copyright (c) 2003, 2012, 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 * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. Oracle designates this --- 1,7 ---- /* ! * Copyright (c) 2003, 2014, 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 * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. Oracle designates this
*** 236,246 **** if (type instanceof ParameterizedType) { ParameterizedType pt = (ParameterizedType) type; return (Class<?>) pt.getRawType(); } if (type instanceof TypeVariable) { ! TypeVariable tv = (TypeVariable)type; Type[] bounds = tv.getBounds(); return (0 < bounds.length) ? erase(bounds[0]) : Object.class; } --- 236,246 ---- if (type instanceof ParameterizedType) { ParameterizedType pt = (ParameterizedType) type; return (Class<?>) pt.getRawType(); } if (type instanceof TypeVariable) { ! TypeVariable<?> tv = (TypeVariable<?>)type; Type[] bounds = tv.getBounds(); return (0 < bounds.length) ? erase(bounds[0]) : Object.class; }
*** 265,277 **** * @param types the array of types to convert * @return an array of corresponding classes * * @see #erase(Type) */ ! public static Class[] erase(Type[] types) { int length = types.length; ! Class[] classes = new Class[length]; for (int i = 0; i < length; i++) { classes[i] = TypeResolver.erase(types[i]); } return classes; } --- 265,277 ---- * @param types the array of types to convert * @return an array of corresponding classes * * @see #erase(Type) */ ! public static Class<?>[] erase(Type[] types) { int length = types.length; ! Class<?>[] classes = new Class<?>[length]; for (int i = 0; i < length; i++) { classes[i] = TypeResolver.erase(types[i]); } return classes; }