modules/fxml/src/main/java/com/sun/javafx/fxml/BeanAdapter.java

rev 9619 : [mq]: 9-jake.patch

@@ -207,11 +207,11 @@
         Method getterMethod = key.endsWith(PROPERTY_SUFFIX) ? localCache.getMethod(key) : getGetterMethod(key);
 
         Object value;
         if (getterMethod != null) {
             try {
-                value = MethodUtil.invoke(getterMethod, bean, (Object[]) null);
+                value = ModuleHelper.invoke(getterMethod, bean, (Object[]) null);
             } catch (IllegalAccessException exception) {
                 throw new RuntimeException(exception);
             } catch (InvocationTargetException exception) {
                 throw new RuntimeException(exception);
             }

@@ -253,11 +253,11 @@
             throw new PropertyNotFoundException("Property \"" + key + "\" does not exist"
                 + " or is read-only.");
         }
 
         try {
-            MethodUtil.invoke(setterMethod, bean, new Object[] { coerce(value, getType(key)) });
+            ModuleHelper.invoke(setterMethod, bean, new Object[] { coerce(value, getType(key)) });
         } catch (IllegalAccessException exception) {
             throw new RuntimeException(exception);
         } catch (InvocationTargetException exception) {
             throw new RuntimeException(exception);
         }

@@ -501,11 +501,11 @@
                 && Character.isLowerCase(((String)value).charAt(0))) {
                 value = toAllCaps((String)value);
             }
 
             try {
-                coercedValue = MethodUtil.invoke(valueOfMethod, null, new Object[] { value });
+                coercedValue = ModuleHelper.invoke(valueOfMethod, null, new Object[] { value });
             } catch (IllegalAccessException exception) {
                 throw new RuntimeException(exception);
             } catch (InvocationTargetException exception) {
                 throw new RuntimeException(exception);
             } catch (SecurityException exception) {

@@ -539,11 +539,11 @@
         Class<?> targetType = target.getClass();
         Method getterMethod = getStaticGetterMethod(sourceType, key, targetType);
 
         if (getterMethod != null) {
             try {
-                value = (T) MethodUtil.invoke(getterMethod, null, new Object[] { target } );
+                value = (T) ModuleHelper.invoke(getterMethod, null, new Object[] { target } );
             } catch (InvocationTargetException exception) {
                 throw new RuntimeException(exception);
             } catch (IllegalAccessException exception) {
                 throw new RuntimeException(exception);
             }

@@ -597,11 +597,11 @@
                 + " or is read-only.");
         }
 
         // Invoke the setter
         try {
-            MethodUtil.invoke(setterMethod, null, new Object[] { target, value });
+            ModuleHelper.invoke(setterMethod, null, new Object[] { target, value });
         } catch (InvocationTargetException exception) {
             throw new RuntimeException(exception);
         } catch (IllegalAccessException exception) {
             throw new RuntimeException(exception);
         }