modules/graphics/src/main/java/javafx/scene/Scene.java

*** 92,101 ****
--- 92,103 ----
  import java.util.concurrent.CopyOnWriteArrayList;
  
  import com.sun.javafx.logging.PulseLogger;
  
  import static com.sun.javafx.logging.PulseLogger.PULSE_LOGGING_ENABLED;
+ import com.sun.javafx.scene.input.ClipboardHelper;
+ import com.sun.javafx.scene.input.TouchPointHelper;
  
  /**
   * The JavaFX {@code Scene} class is the container for all content in a scene graph.
   * The background of the scene is filled as specified by the {@code fill} property.
   * <p>
*** 375,385 ****
                  }
                  public ObservableList<Node> getChildren(Parent parent) {
                      return parent.getChildren(); //was impl_getChildren
                  }
                  public Object renderToImage(Scene scene, Object platformImage) {
!                     return scene.snapshot(null).impl_getPlatformImage();
                  }
              });
              SceneHelper.setSceneAccessor(
                      new SceneHelper.SceneAccessor() {
                          @Override
--- 377,387 ----
                  }
                  public ObservableList<Node> getChildren(Parent parent) {
                      return parent.getChildren(); //was impl_getChildren
                  }
                  public Object renderToImage(Scene scene, Object platformImage) {
!                     return Toolkit.getImageAccessor().getPlatformImage(scene.snapshot(null));
                  }
              });
              SceneHelper.setSceneAccessor(
                      new SceneHelper.SceneAccessor() {
                          @Override
*** 1988,1998 ****
                          type = TouchEvent.TOUCH_STATIONARY;
                          break;
                  }
  
                  for (TouchPoint t : touchPoints) {
!                     t.impl_reset();
                  }
  
                  TouchEvent te = new TouchEvent(type, tp, touchList,
                          touchEventSetId, e.isShiftDown(), e.isControlDown(),
                          e.isAltDown(), e.isMetaDown());
--- 1990,2000 ----
                          type = TouchEvent.TOUCH_STATIONARY;
                          break;
                  }
  
                  for (TouchPoint t : touchPoints) {
!                     TouchPointHelper.reset(t);
                  }
  
                  TouchEvent te = new TouchEvent(type, tp, touchList,
                          touchEventSetId, e.isShiftDown(), e.isControlDown(),
                          e.isAltDown(), e.isMetaDown());
*** 2936,2946 ****
                                        TransferMode transferMode, TKClipboard dragboard)
          {
              if (dndGesture == null) {
                  dndGesture = new DnDGesture();
              }
!             Dragboard db = Dragboard.impl_createDragboard(dragboard);
              dndGesture.dragboard = db;
              DragEvent dragEvent =
                      new DragEvent(DragEvent.ANY, dndGesture.dragboard, x, y, screenX, screenY,
                              transferMode, null, null, pick(x, y));
              return dndGesture.processTargetEnterOver(dragEvent);
--- 2938,2948 ----
                                        TransferMode transferMode, TKClipboard dragboard)
          {
              if (dndGesture == null) {
                  dndGesture = new DnDGesture();
              }
!             Dragboard db = DragboardHelper.createDragboard(dragboard);
              dndGesture.dragboard = db;
              DragEvent dragEvent =
                      new DragEvent(DragEvent.ANY, dndGesture.dragboard, x, y, screenX, screenY,
                              transferMode, null, null, pick(x, y));
              return dndGesture.processTargetEnterOver(dragEvent);
*** 3022,3032 ****
  
         @Override
         public void dragGestureRecognized(double x, double y, double screenX, double screenY,
                                           int button, TKClipboard dragboard)
         {
!            Dragboard db = Dragboard.impl_createDragboard(dragboard);
             dndGesture = new DnDGesture();
             dndGesture.dragboard = db;
             // TODO: support mouse buttons in DragEvent
             DragEvent dragEvent = new DragEvent(DragEvent.ANY, db, x, y, screenX, screenY,
                     null, null, null, pick(x, y));
--- 3024,3034 ----
  
         @Override
         public void dragGestureRecognized(double x, double y, double screenX, double screenY,
                                           int button, TKClipboard dragboard)
         {
!            Dragboard db = DragboardHelper.createDragboard(dragboard);
             dndGesture = new DnDGesture();
             dndGesture.dragboard = db;
             // TODO: support mouse buttons in DragEvent
             DragEvent dragEvent = new DragEvent(DragEvent.ANY, db, x, y, screenX, screenY,
                     null, null, null, pick(x, y));
*** 3078,3088 ****
          /**
           * Called after DRAG_DETECTED event has been processed by application
           */
          private void dragDetectedProcessed() {
              dragDetected = DragDetectedState.DONE;
!             final boolean hasContent = (dragboard != null) && (dragboard.impl_contentPut());
              if (hasContent) {
                  /* start DnD */
                  Toolkit.getToolkit().startDrag(Scene.this.peer,
                                                  sourceTransferModes,
                                                  new DragSourceListener(),
--- 3080,3090 ----
          /**
           * Called after DRAG_DETECTED event has been processed by application
           */
          private void dragDetectedProcessed() {
              dragDetected = DragDetectedState.DONE;
!             final boolean hasContent = (dragboard != null) && (ClipboardHelper.contentPut(dragboard));
              if (hasContent) {
                  /* start DnD */
                  Toolkit.getToolkit().startDrag(Scene.this.peer,
                                                  sourceTransferModes,
                                                  new DragSourceListener(),
*** 3417,3427 ****
                  if (dragboard != null) {
                      return dragboard;
                  }
              }
              TKClipboard dragboardPeer = peer.createDragboard(isDragSource);
!             return Dragboard.impl_createDragboard(dragboardPeer);
          }
      }
  
      /**
       * State of a drag gesture with regards to DRAG_DETECTED event.
--- 3419,3429 ----
                  if (dragboard != null) {
                      return dragboard;
                  }
              }
              TKClipboard dragboardPeer = peer.createDragboard(isDragSource);
!             return DragboardHelper.createDragboard(dragboardPeer);
          }
      }
  
      /**
       * State of a drag gesture with regards to DRAG_DETECTED event.