apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMLoader.java

rev 9240 : 8076423: JEP 253: Prepare JavaFX UI Controls & CSS APIs for Modularization

@@ -31,11 +31,11 @@
  */
 package com.oracle.javafx.scenebuilder.kit.fxom;
 
 import com.oracle.javafx.scenebuilder.kit.util.Deprecation;
 import com.oracle.javafx.scenebuilder.kit.metadata.util.PropertyName;
-import com.sun.javafx.fxml.LoadListener;
+import javafx.fxml.LoadListener;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
 import javafx.fxml.FXMLLoader;

@@ -74,13 +74,12 @@
         FXMLLoader fxmlLoader = new FXMLLoader();
         
         fxmlLoader.setLocation(document.getLocation());
         fxmlLoader.setResources(new ResourceKeyCollector(document.getResources()));
         fxmlLoader.setClassLoader(new TransientClassLoader(classLoader));
-        fxmlLoader.setBuilderFactory(new FXOMBuilderFactory(classLoader));
+        fxmlLoader.setLoadListener(this);
         Deprecation.setStaticLoad(fxmlLoader, true);
-        Deprecation.setLoadListener(fxmlLoader, this);
         
         final Charset utf8 = Charset.forName("UTF-8");
         try (final InputStream is = new ByteArrayInputStream(fxmlText.getBytes(utf8))) {
             glueCursor = new GlueCursor(document.getGlue());
             currentTransientNode = null;