modules/javafx.base/src/main/java/javafx/beans/property/adapter/JavaBeanObjectProperty.java

rev 10441 : imported patch fix-8177566-trampoline
rev 10444 : imported patch doc-8177566-trampoline
rev 10445 : [mq]: doc-v1-8177566-trampoline

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2017, 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

@@ -24,10 +24,11 @@
  */
 
 package javafx.beans.property.adapter;
 
 import com.sun.javafx.binding.ExpressionHelper;
+import com.sun.javafx.property.MethodHelper;
 import com.sun.javafx.property.adapter.Disposer;
 import com.sun.javafx.property.adapter.PropertyDescriptor;
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.value.ChangeListener;

@@ -38,28 +39,52 @@
 
 import java.security.AccessController;
 import java.security.AccessControlContext;
 import java.security.PrivilegedAction;
 
-import sun.reflect.misc.MethodUtil;
-
 /**
  * A {@code JavaBeanObjectProperty} provides an adapter between a regular
  * Java Bean property of type {@code T} and a JavaFX
  * {@code ObjectProperty<T>}. It cannot be created directly, but a
  * {@link JavaBeanObjectPropertyBuilder} has to be used.
  * <p>
- * As a minimum, the Java Bean must implement a getter and a setter for the
- * property. If the getter of an instance of this class is called, the property of
+ * As a minimum, the Java Bean class must implement a getter and a setter for the
+ * property.
+ * The class, as well as the getter and a setter methods, must be declared public.
+ * If the getter of an instance of this class is called, the property of
  * the Java Bean is returned. If the setter is called, the value will be passed
  * to the Java Bean property. If the Java Bean property is bound (i.e. it supports
  * PropertyChangeListeners), this {@code JavaBeanObjectProperty} will be
  * aware of changes in the Java Bean. Otherwise it can be notified about
  * changes by calling {@link #fireValueChangedEvent()}. If the Java Bean property
  * is also constrained (i.e. it supports VetoableChangeListeners), this
  * {@code JavaBeanObjectProperty} will reject changes, if it is bound to an
  * {@link javafx.beans.value.ObservableValue ObservableValue&lt;Object&gt;}.
+ * </p>
+ * <p><b>Deploying an Application as a Module</b></p>
+ * <p>
+ * If the Java Bean class is in a named module, then it must be reflectively
+ * accessible to the {@code javafx.base} module.
+ * A class is reflectively accessible if the module
+ * {@link Module#isOpen(String,Module) opens} the containing package to at
+ * least the {@code javafx.base} module.
+ * </p>
+ * <p>
+ * For example, if {@code com.foo.MyBeanClass} is in the {@code foo.app} module,
+ * the {@code module-info.java} might
+ * look like this:
+ * </p>
+ *
+<pre>{@code module foo.app {
+    opens com.foo to javafx.base;
+}}</pre>
+ *
+ * <p>
+ * Alternatively, a class is reflectively accessible if the module
+ * {@link Module#isExported(String) exports} the containing package
+ * unconditionally.
+ * </p>
  *
  * @see javafx.beans.property.ObjectProperty
  * @see JavaBeanObjectPropertyBuilder
  *
  * @param T type of the wrapped {@code Object}

@@ -92,11 +117,11 @@
     @SuppressWarnings("unchecked")
     @Override
     public T get() {
         return AccessController.doPrivileged((PrivilegedAction<T>) () -> {
             try {
-                return (T)MethodUtil.invoke(descriptor.getGetter(), getBean(), (Object[])null);
+                return (T)MethodHelper.invoke(descriptor.getGetter(), getBean(), (Object[])null);
             } catch (IllegalAccessException e) {
                 throw new UndeclaredThrowableException(e);
             } catch (InvocationTargetException e) {
                 throw new UndeclaredThrowableException(e);
             }

@@ -116,11 +141,11 @@
             throw new RuntimeException("A bound value cannot be set.");
         }
 
         AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
             try {
-                MethodUtil.invoke(descriptor.getSetter(), getBean(), new Object[] {value});
+                MethodHelper.invoke(descriptor.getSetter(), getBean(), new Object[] {value});
                 ExpressionHelper.fireValueChangedEvent(helper);
             } catch (IllegalAccessException e) {
                 throw new UndeclaredThrowableException(e);
             } catch (InvocationTargetException e) {
                 throw new UndeclaredThrowableException(e);