modules/fxml/src/main/java/javafx/fxml/JavaFXBuilderFactory.java

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

*** 208,218 ****
              private Object                   builder = null;
              private Map<Object,Object>       properties;
  
              private ObjectBuilder() {
                  try {
!                     builder = MethodUtil.invoke(createMethod, null, NO_ARGS);
                  } catch (Exception e) {
                      //TODO
                      throw new RuntimeException("Creation of the builder " + builderClass.getName() + " failed.", e);
                  }
              }
--- 208,218 ----
              private Object                   builder = null;
              private Map<Object,Object>       properties;
  
              private ObjectBuilder() {
                  try {
!                     builder = createMethod.invoke(null, NO_ARGS);
                  } catch (Exception e) {
                      //TODO
                      throw new RuntimeException("Creation of the builder " + builderClass.getName() + " failed.", e);
                  }
              }
*** 225,235 ****
                      put(entry.getKey(), entry.getValue());
                  }
  
                  Object res;
                  try {
!                     res = MethodUtil.invoke(buildMethod, builder, NO_ARGS);
                      // TODO:
                      // temporary special case for Node properties until
                      // platform builders are fixed
                      if (properties != null && res instanceof Node) {
                          ((Map<Object, Object>)((Node)res).getProperties()).putAll(properties);
--- 225,235 ----
                      put(entry.getKey(), entry.getValue());
                  }
  
                  Object res;
                  try {
!                     res = buildMethod.invoke(builder, NO_ARGS);
                      // TODO:
                      // temporary special case for Node properties until
                      // platform builders are fixed
                      if (properties != null && res instanceof Node) {
                          ((Map<Object, Object>)((Node)res).getProperties()).putAll(properties);
*** 306,316 ****
                                  Array.set(array, i, BeanAdapter.coerce(list.get(i), componentType));
                              }
                              value = array;
                          }
  
!                         MethodUtil.invoke(m, builder, new Object[] { BeanAdapter.coerce(value, type) });
                      } catch (Exception e) {
                          Logger.getLogger(ObjectBuilderWrapper.class.getName()).log(Level.WARNING,
                                  "Method " + m.getName() + " failed", e);
                      }
                      //TODO Is it OK to return null here?
--- 306,316 ----
                                  Array.set(array, i, BeanAdapter.coerce(list.get(i), componentType));
                              }
                              value = array;
                          }
  
!                         m.invoke(builder, new Object[] { BeanAdapter.coerce(value, type) });
                      } catch (Exception e) {
                          Logger.getLogger(ObjectBuilderWrapper.class.getName()).log(Level.WARNING,
                                  "Method " + m.getName() + " failed", e);
                      }
                      //TODO Is it OK to return null here?