modules/graphics/src/main/java/javafx/scene/paint/PhongMaterial.java

*** 24,33 ****
--- 24,34 ----
   */
  
  package javafx.scene.paint;
  
  import com.sun.javafx.beans.event.AbstractNotifyListener;
+ import com.sun.javafx.scene.paint.MaterialHelper;
  import com.sun.javafx.sg.prism.NGPhongMaterial;
  import com.sun.javafx.tk.Toolkit;
  import javafx.beans.Observable;
  import javafx.beans.property.DoubleProperty;
  import javafx.beans.property.ObjectProperty;
*** 442,476 ****
      }
  
      /** The peer node created by the graphics Toolkit/Pipeline implementation */
      private NGPhongMaterial peer;
  
-     /**
-      * @treatAsPrivate implementation detail
-      * @deprecated This is an internal API that is not intended for use and will be removed in the next version
-      */
-     @Deprecated
      @Override
!     public NGPhongMaterial impl_getNGMaterial() {
          if (peer == null) {
              peer = new NGPhongMaterial();
          }
          return peer;
      }
  
-     /**
-      * @treatAsPrivate implementation detail
-      * @deprecated This is an internal API that is not intended for use and will be removed in the next version
-      */
-     @Deprecated
      @Override
!     public void impl_updatePG(){
          if (!isDirty()) {
              return;
          }
  
!         final NGPhongMaterial pMaterial = impl_getNGMaterial();
          if (diffuseColorDirty) {
              pMaterial.setDiffuseColor(getDiffuseColor() == null ? null
                      : Toolkit.getPaintAccessor().getPlatformPaint(getDiffuseColor()));
          }
          if (specularColorDirty) {
--- 443,467 ----
      }
  
      /** The peer node created by the graphics Toolkit/Pipeline implementation */
      private NGPhongMaterial peer;
  
      @Override
!     NGPhongMaterial getNGMaterial() {
          if (peer == null) {
              peer = new NGPhongMaterial();
          }
          return peer;
      }
  
      @Override
!     void updatePG(){
          if (!isDirty()) {
              return;
          }
  
!         final NGPhongMaterial pMaterial = MaterialHelper.getNGMaterial(this);
          if (diffuseColorDirty) {
              pMaterial.setDiffuseColor(getDiffuseColor() == null ? null
                      : Toolkit.getPaintAccessor().getPlatformPaint(getDiffuseColor()));
          }
          if (specularColorDirty) {
*** 480,502 ****
          if (specularPowerDirty) {
              pMaterial.setSpecularPower((float)getSpecularPower());
          }
          if (diffuseMapDirty) {
              pMaterial.setDiffuseMap(getDiffuseMap()
!                     == null ? null : getDiffuseMap().impl_getPlatformImage());
          }
          if (specularMapDirty) {
              pMaterial.setSpecularMap(getSpecularMap()
!                     == null ? null : getSpecularMap().impl_getPlatformImage());
          }
          if (bumpMapDirty) {
              pMaterial.setBumpMap(getBumpMap()
!                     == null ? null : getBumpMap().impl_getPlatformImage());
          }
          if (selfIlluminationMapDirty) {
              pMaterial.setSelfIllumMap(getSelfIlluminationMap()
!                     == null ? null : getSelfIlluminationMap().impl_getPlatformImage());
          }
  
          setDirty(false);
      }
  
--- 471,493 ----
          if (specularPowerDirty) {
              pMaterial.setSpecularPower((float)getSpecularPower());
          }
          if (diffuseMapDirty) {
              pMaterial.setDiffuseMap(getDiffuseMap()
!                     == null ? null : Toolkit.getImageAccessor().getPlatformImage(getDiffuseMap()));
          }
          if (specularMapDirty) {
              pMaterial.setSpecularMap(getSpecularMap()
!                     == null ? null : Toolkit.getImageAccessor().getPlatformImage(getSpecularMap()));
          }
          if (bumpMapDirty) {
              pMaterial.setBumpMap(getBumpMap()
!                     == null ? null : Toolkit.getImageAccessor().getPlatformImage(getBumpMap()));
          }
          if (selfIlluminationMapDirty) {
              pMaterial.setSelfIllumMap(getSelfIlluminationMap()
!                     == null ? null : Toolkit.getImageAccessor().getPlatformImage(getSelfIlluminationMap()));
          }
  
          setDirty(false);
      }