--- old/src/share/classes/com/sun/beans/TypeResolver.java 2014-01-23 18:38:55.000000000 -0800 +++ new/src/share/classes/com/sun/beans/TypeResolver.java 2014-01-23 18:38:55.000000000 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -238,7 +238,7 @@ return (Class) pt.getRawType(); } if (type instanceof TypeVariable) { - TypeVariable tv = (TypeVariable)type; + TypeVariable tv = (TypeVariable)type; Type[] bounds = tv.getBounds(); return (0 < bounds.length) ? erase(bounds[0]) @@ -267,9 +267,9 @@ * * @see #erase(Type) */ - public static Class[] erase(Type[] types) { + public static Class[] erase(Type[] types) { int length = types.length; - Class[] classes = new Class[length]; + Class[] classes = new Class[length]; for (int i = 0; i < length; i++) { classes[i] = TypeResolver.erase(types[i]); } --- old/src/share/classes/com/sun/beans/editors/EnumEditor.java 2014-01-23 18:38:55.000000000 -0800 +++ new/src/share/classes/com/sun/beans/editors/EnumEditor.java 2014-01-23 18:38:55.000000000 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 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 @@ -45,17 +45,18 @@ public final class EnumEditor implements PropertyEditor { private final List listeners = new ArrayList(); - private final Class type; + @SuppressWarnings("rawtypes") + private final Class type; private final String[] tags; private Object value; - public EnumEditor( Class type ) { + public EnumEditor(Class type) { Object[] values = type.getEnumConstants(); if ( values == null ) { throw new IllegalArgumentException( "Unsupported " + type ); } - this.type = type; + this.type = type.asSubclass(java.lang.Enum.class); this.tags = new String[values.length]; for ( int i = 0; i < values.length; i++ ) { this.tags[i] = ( ( Enum )values[i] ).name(); @@ -98,9 +99,11 @@ } public void setAsText( String text ) { - setValue( ( text != null ) - ? Enum.valueOf( this.type, text ) - : null ); + @SuppressWarnings("unchecked") + Object tmp = ( text != null ) + ? Enum.valueOf( (Class)this.type, text ) + : null; + setValue(tmp); } public String[] getTags() { --- old/src/share/classes/com/sun/beans/finder/ConstructorFinder.java 2014-01-23 18:38:56.000000000 -0800 +++ new/src/share/classes/com/sun/beans/finder/ConstructorFinder.java 2014-01-23 18:38:56.000000000 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 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 @@ -44,7 +44,7 @@ public final class ConstructorFinder extends AbstractFinder> { private static final Cache> CACHE = new Cache>(SOFT, SOFT) { @Override - public Constructor create(Signature signature) { + public Constructor create(Signature signature) { try { ConstructorFinder finder = new ConstructorFinder(signature.getArgs()); return finder.find(signature.getType().getConstructors()); --- old/src/share/classes/com/sun/beans/finder/InstanceFinder.java 2014-01-23 18:38:57.000000000 -0800 +++ new/src/share/classes/com/sun/beans/finder/InstanceFinder.java 2014-01-23 18:38:57.000000000 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 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 @@ -93,7 +93,9 @@ type = ClassFinder.findClass(name, type.getClassLoader()); } if (this.type.isAssignableFrom(type)) { - return (T) type.newInstance(); + @SuppressWarnings("unchecked") + T tmp = (T) type.newInstance(); + return tmp; } } catch (Exception exception) { --- old/src/share/classes/com/sun/beans/finder/SignatureException.java 2014-01-23 18:38:58.000000000 -0800 +++ new/src/share/classes/com/sun/beans/finder/SignatureException.java 2014-01-23 18:38:57.000000000 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 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 @@ -25,6 +25,8 @@ package com.sun.beans.finder; final class SignatureException extends RuntimeException { + private static final long serialVersionUID = 4536098341586118473L; + SignatureException(Throwable cause) { super(cause); } --- old/src/share/classes/com/sun/beans/util/Cache.java 2014-01-23 18:38:58.000000000 -0800 +++ new/src/share/classes/com/sun/beans/util/Cache.java 2014-01-23 18:38:58.000000000 -0800 @@ -244,7 +244,7 @@ * @param size requested capacity MUST be a power of two * @return a new array for the cache entries */ - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) private CacheEntry[] newTable(int size) { return (CacheEntry[]) new CacheEntry[size]; } @@ -265,6 +265,7 @@ synchronized (this.queue) { do { if (reference instanceof Ref) { + @SuppressWarnings("rawtypes") Ref ref = (Ref) reference; @SuppressWarnings("unchecked") CacheEntry owner = (CacheEntry) ref.getOwner();