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

@@ -131,10 +131,26 @@
             public void doMarkDirty(Node node, DirtyBits dirtyBit) {
                 ((Shape) node).doMarkDirty(dirtyBit);
             }
 
             @Override
+            public BaseBounds doComputeGeomBounds(Node node,
+            BaseBounds bounds, BaseTransform tx) {
+                return ((Shape) node).doComputeGeomBounds(bounds, tx);
+            }
+
+            @Override
+            public boolean doComputeContains(Node node, double localX, double localY) {
+                return ((Shape) node).doComputeContains(localX, localY);
+            }
+
+            @Override
+            public Object doProcessMXNode(Node node, MXNodeAlgorithm alg, MXNodeAlgorithmContext ctx) {
+                return ((Shape) node).doProcessMXNode(alg, ctx);
+            }
+
+            @Override
             public Paint doCssGetFillInitialValue(Shape shape) {
                 return shape.doCssGetFillInitialValue();
             }
 
             @Override

@@ -389,11 +405,11 @@
         NGShape.Mode newMode = computeMode();
         if (mode != newMode) {
             mode = newMode;
 
             NodeHelper.markDirty(this, DirtyBits.SHAPE_MODE);
-            impl_geomChanged();
+            NodeHelper.geomChanged(this);
         }
     }
 
     /**
      * Defines parameters to fill the interior of an {@code Shape}

@@ -478,11 +494,11 @@
             new AbstractNotifyListener() {
         @Override
         public void invalidated(Observable valueModel) {
             NodeHelper.markDirty(Shape.this, DirtyBits.SHAPE_FILL);
             NodeHelper.markDirty(Shape.this, DirtyBits.SHAPE_STROKE);
-            impl_geomChanged();
+            NodeHelper.geomChanged(Shape.this);
             checkModeChanged();
         }
     };
 
     public final Paint getStroke() {

@@ -888,28 +904,22 @@
     @Override
     public List<CssMetaData<? extends Styleable, ?>> getCssMetaData() {
         return getClassCssMetaData();
     }
 
-    /**
-     * @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,
+    private BaseBounds doComputeGeomBounds(BaseBounds bounds,
                                              BaseTransform tx) {
         return computeShapeBounds(bounds, tx, ShapeHelper.configShape(this));
     }
 
-    /**
-     * @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) {
         return computeShapeContains(localX, localY, ShapeHelper.configShape(this));
     }
 
     private static final double MIN_STROKE_WIDTH = 0.0f;
     private static final double MIN_STROKE_MITER_LIMIT = 1.0f;

@@ -1513,22 +1523,19 @@
             NodeHelper.markDirty(Shape.this, DirtyBits.SHAPE_STROKEATTRS);
             strokeAttributesDirty = true;
             if (propertyCssKey != StyleableProperties.STROKE_DASH_OFFSET) {
                 // all stroke attributes change geometry except for the
                 // stroke dash offset
-                impl_geomChanged();
+                NodeHelper.geomChanged(Shape.this);
             }
         }
     }
 
-    /**
-     * @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 Object impl_processMXNode(MXNodeAlgorithm alg, MXNodeAlgorithmContext ctx) {
+    private Object doProcessMXNode(MXNodeAlgorithm alg, MXNodeAlgorithmContext ctx) {
         return alg.processLeafNode(this, ctx);
     }
 
     // PENDING_DOC_REVIEW
     /**

@@ -1714,11 +1721,11 @@
     private static BaseTransform calculateNodeToSceneTransform(Node node) {
         final Affine3D cumulativeTransformation = new Affine3D();
 
         do {
             cumulativeTransformation.preConcatenate(
-                    node.impl_getLeafTransform());
+                    NodeHelper.getLeafTransform(node));
             node = node.getParent();
         } while (node != null);
 
         return cumulativeTransformation;
     }