modules/fxml/src/main/java/com/sun/javafx/fxml/builder/ProxyBuilder.java

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

@@ -23,10 +23,11 @@
  * questions.
  */
 package com.sun.javafx.fxml.builder;
 
 import com.sun.javafx.fxml.BeanAdapter;
+import com.sun.javafx.fxml.ModuleHelper;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;

@@ -43,11 +44,10 @@
 import java.util.Set;
 import java.util.TreeSet;
 import javafx.beans.NamedArg;
 import javafx.util.Builder;
 import sun.reflect.misc.ConstructorUtil;
-import sun.reflect.misc.MethodUtil;
 import sun.reflect.misc.ReflectUtil;
 
 /**
  * Using this builder assumes that some of the constructors of desired class
  * with arguments are annotated with NamedArg annotation.

@@ -554,11 +554,11 @@
             super(m, t);
         }
 
         public void invoke(Object obj, Object argStr) throws Exception {
             Object arg[] = new Object[]{BeanAdapter.coerce(argStr, type)};
-            MethodUtil.invoke(method, obj, arg);
+            ModuleHelper.invoke(method, obj, arg);
         }
     }
 
     private static class Getter extends Property {
 

@@ -567,11 +567,11 @@
         }
 
         @Override
         public void invoke(Object obj, Object argStr) throws Exception {
             // we know that this.method returns collection otherwise it wouldn't be here
-            Collection to = (Collection) MethodUtil.invoke(method, obj, new Object[]{});
+            Collection to = (Collection) ModuleHelper.invoke(method, obj, new Object[]{});
             if (argStr instanceof Collection) {
                 Collection from = (Collection) argStr;
                 to.addAll(from);
             } else {
                 to.add(argStr);