modules/graphics/src/main/java/javafx/scene/shape/MeshView.java

@@ -61,10 +61,26 @@
             @Override
             public void doUpdatePeer(Node node) {
                 ((MeshView) node).doUpdatePeer();
             }
 
+            @Override
+            public BaseBounds doComputeGeomBounds(Node node,
+            BaseBounds bounds, BaseTransform tx) {
+                return ((MeshView) node).doComputeGeomBounds(bounds, tx);
+            }
+
+            @Override
+            public boolean doComputeContains(Node node, double localX, double localY) {
+                return ((MeshView) node).doComputeContains(localX, localY);
+            }
+
+            @Override
+            public boolean doComputeIntersects(Node node, PickRay pickRay,
+            PickResultChooser pickResult) {
+                return ((MeshView) node).doComputeIntersects(pickRay, pickResult);
+            }
         });
     }
 
     {
         // To initialize the class helper at the begining each constructor of this class

@@ -107,11 +123,11 @@
                 private Mesh old = null;
                 private final ChangeListener<Boolean> meshChangeListener =
                         (observable, oldValue, newValue) -> {
                             if (newValue) {
                                 NodeHelper.markDirty(MeshView.this, DirtyBits.MESH_GEOM);
-                                impl_geomChanged();
+                                NodeHelper.geomChanged(MeshView.this);
                             }
                         };
                 private final WeakChangeListener<Boolean> weakMeshChangeListener =
                         new WeakChangeListener(meshChangeListener);
 

@@ -124,11 +140,11 @@
                     if (newMesh != null) {
                         newMesh.dirtyProperty().addListener(weakMeshChangeListener);
                     }
                     NodeHelper.markDirty(MeshView.this, DirtyBits.MESH);
                     NodeHelper.markDirty(MeshView.this, DirtyBits.MESH_GEOM);
-                    impl_geomChanged();
+                    NodeHelper.geomChanged(MeshView.this);
                     old = newMesh;
                 }
             };
         }
         return mesh;

@@ -152,42 +168,33 @@
      */
     private NGNode doCreatePeer() {
         return new NGMeshView();
     }
 
-    /**
-     * @treatAsPrivate implementation detail
-     * @deprecated This is an internal API that is not intended for use and will be removed in the next version
+    /*
+     * Note: This method MUST only be called via its accessor method.
      */
-    @Deprecated
-    @Override
-    public BaseBounds impl_computeGeomBounds(BaseBounds bounds, BaseTransform tx) {
+    private BaseBounds doComputeGeomBounds(BaseBounds bounds, BaseTransform tx) {
         if (getMesh() != null) {
             bounds = getMesh().computeBounds(bounds);
             bounds = tx.transform(bounds, bounds);
         } else {
             bounds.makeEmpty();
         }
         return bounds;
     }
 
-    /**
-     * @treatAsPrivate implementation detail
-     * @deprecated This is an internal API that is not intended for use and will be removed in the next version
+    /*
+     * Note: This method MUST only be called via its accessor method.
      */
-    @Deprecated
-    @Override
-    protected boolean impl_computeContains(double localX, double localY) {
+    private boolean doComputeContains(double localX, double localY) {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
-    /**
-     * @treatAsPrivate implementation detail
-     * @deprecated This is an internal API that is not intended for use and will be removed in the next version
+    /*
+     * Note: This method MUST only be called via its accessor method.
      */
-    @Override
-    @Deprecated
-    protected boolean impl_computeIntersects(PickRay pickRay, PickResultChooser pickResult) {
+    private boolean doComputeIntersects(PickRay pickRay, PickResultChooser pickResult) {
         return MeshHelper.computeIntersects(getMesh(), pickRay, pickResult, this, getCullFace(), true);
     }
 
 }