diff --git a/src/share/classes/java/beans/PropertyDescriptor.java b/src/share/classes/java/beans/PropertyDescriptor.java index 91e17e38aa7b532a1388f302677594b091a8e75a..45235a14ba623a27d0a53e2432e61a4aeef11998 100644 --- a/src/share/classes/java/beans/PropertyDescriptor.java +++ b/src/share/classes/java/beans/PropertyDescriptor.java @@ -109,6 +109,10 @@ public class PropertyDescriptor extends FeatureDescriptor { if (writeMethodName != null && getWriteMethod() == null) { throw new IntrospectionException("Method not found: " + writeMethodName); } + boundInitialization(beanClass); + } + + private void boundInitialization(Class beanClass) { // If this class or one of its base classes allow PropertyChangeListener, // then we assume that any properties we discover are "bound". // See Introspector.getTargetPropertyInfo() method. @@ -159,6 +163,7 @@ public class PropertyDescriptor extends FeatureDescriptor { setReadMethod(read); setWriteMethod(write); this.baseName = base; + boundInitialization(bean); } /** diff --git a/test/java/beans/Introspector/Test7192955.java b/test/java/beans/Introspector/Test7192955.java new file mode 100644 index 0000000000000000000000000000000000000000..13e874ba71967c7b1a51df69ced4bc06b40150c9 --- /dev/null +++ b/test/java/beans/Introspector/Test7192955.java @@ -0,0 +1,83 @@ +/* + * Copyright (c) 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 7192955 + * @summary Tests that all properties are bound + * @author Sergey Malenkov + */ + +import java.beans.PropertyChangeListener; +import java.util.List; + +public class Test7192955 { + + public static void main(String[] args) { + if (!BeanUtils.findPropertyDescriptor(MyBean.class, "test").isBound()) { + throw new Error("a simple property is not bound"); + } + if (!BeanUtils.findPropertyDescriptor(MyBean.class, "list").isBound()) { + throw new Error("a generic property is not bound"); + } + if (!BeanUtils.findPropertyDescriptor(MyBean.class, "readOnly").isBound()) { + throw new Error("a read-only property is not bound"); + } + } + + public static class BaseBean { + + private List list; + + public List getList() { + return this.list; + } + + public void setList(List list) { + this.list = list; + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + } + + public List getReadOnly() { + return this.list; + } + } + + public static class MyBean extends BaseBean { + + private String test; + + public String getTest() { + return this.test; + } + + public void setTest(String test) { + this.test = test; + } + } +}