modules/jmx/src/main/java/com/oracle/javafx/jmx/SGMXBeanImpl.java

@@ -49,10 +49,11 @@
 import javafx.css.Styleable;
 import javafx.css.StyleableProperty;
 import com.sun.javafx.jmx.HighlightRegion;
 import com.sun.javafx.jmx.MXNodeAlgorithm;
 import com.sun.javafx.jmx.MXNodeAlgorithmContext;
+import com.sun.javafx.scene.SceneHelper;
 import com.sun.javafx.stage.WindowHelper;
 import com.sun.javafx.tk.TKPulseListener;
 import com.sun.javafx.tk.TKScene;
 import com.sun.javafx.tk.Toolkit;
 import com.sun.media.jfxmedia.AudioClip;

@@ -177,11 +178,11 @@
         if (!paused) {
             throw new IllegalStateException(SGMX_NOT_PAUSED_TEXT);
         }
         Toolkit.getToolkit().getHighlightedRegions().add(
                                 createHighlightRegion(nodeId));
-        getNode(nodeId).getScene().impl_getPeer().markDirty();
+        SceneHelper.getPeer(getNode(nodeId).getScene()).markDirty();
     }
 
     /**
      * {@inheritDoc}
      */

@@ -190,11 +191,11 @@
         if (!paused) {
             throw new IllegalStateException(SGMX_NOT_PAUSED_TEXT);
         }
         Toolkit.getToolkit().getHighlightedRegions().remove(
                                 createHighlightRegion(nodeId));
-        getNode(nodeId).getScene().impl_getPeer().markDirty();
+        SceneHelper.getPeer(getNode(nodeId).getScene()).markDirty();
     }
 
     /**
      * {@inheritDoc}
      */

@@ -203,11 +204,11 @@
         throws IllegalStateException
     {
         if (!paused) {
             throw new IllegalStateException(SGMX_NOT_PAUSED_TEXT);
         }
-        TKScene scenePeer = getScene(windowId).impl_getPeer();
+        TKScene scenePeer = SceneHelper.getPeer(getScene(windowId));
         Toolkit.getToolkit().getHighlightedRegions().add(
                           new HighlightRegion(scenePeer, x, y, w, h));
         scenePeer.markDirty();
     }
 

@@ -219,11 +220,11 @@
         throws IllegalStateException
     {
         if (!paused) {
             throw new IllegalStateException(SGMX_NOT_PAUSED_TEXT);
         }
-        TKScene scenePeer = getScene(windowId).impl_getPeer();
+        TKScene scenePeer = SceneHelper.getPeer(getScene(windowId));
         Toolkit.getToolkit().getHighlightedRegions().remove(
                           new HighlightRegion(scenePeer, x, y, w, h));
         scenePeer.markDirty();
     }
 

@@ -250,11 +251,11 @@
     }
 
     private HighlightRegion createHighlightRegion(int nodeId) {
         Node node = getNode(nodeId);
         Bounds bounds = node.localToScene(node.getBoundsInLocal());
-        return new HighlightRegion(node.getScene().impl_getPeer(),
+        return new HighlightRegion(SceneHelper.getPeer(node.getScene()),
                                    bounds.getMinX(),
                                    bounds.getMinY(),
                                    bounds.getWidth(),
                                    bounds.getHeight());
     }