modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/CachingTransferable.java

*** 1,7 ****
  /*
!  * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 21,54 ****
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
! package javafx.embed.swing;
  
- import com.sun.javafx.embed.EmbeddedSceneDSInterface;
- import com.sun.javafx.tk.Toolkit;
  import java.awt.datatransfer.DataFlavor;
  import java.awt.datatransfer.Transferable;
- import java.awt.dnd.DropTargetDragEvent;
- import java.awt.dnd.DropTargetDropEvent;
  import java.util.Arrays;
  import java.util.Collections;
  import java.util.Map;
  import java.util.HashMap;
- import java.util.Set;
- import javafx.scene.input.TransferMode;
  import java.io.UnsupportedEncodingException;
  import javafx.scene.input.Clipboard;
  import javafx.scene.input.DataFormat;
  
  /**
   * A Transferable implementation backed by a Map.
   * The data can be populated either from AWT Transferable
   * or from FX Clipboard.
   */
! class CachingTransferable implements Transferable {
  
      @Override
      public Object getTransferData(final DataFlavor flavor) throws UnsupportedEncodingException
      {
          String mimeType = DataFlavorUtils.getFxMimeType(flavor);
--- 21,48 ----
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
! package com.sun.javafx.embed.swing;
  
  import java.awt.datatransfer.DataFlavor;
  import java.awt.datatransfer.Transferable;
  import java.util.Arrays;
  import java.util.Collections;
  import java.util.Map;
  import java.util.HashMap;
  import java.io.UnsupportedEncodingException;
  import javafx.scene.input.Clipboard;
  import javafx.scene.input.DataFormat;
  
  /**
   * A Transferable implementation backed by a Map.
   * The data can be populated either from AWT Transferable
   * or from FX Clipboard.
   */
! public class CachingTransferable implements Transferable {
  
      @Override
      public Object getTransferData(final DataFlavor flavor) throws UnsupportedEncodingException
      {
          String mimeType = DataFlavorUtils.getFxMimeType(flavor);
*** 68,78 ****
                  DataFlavorUtils.getFxMimeType(flavor));
      }
  
      private Map<String, Object> mimeType2Data = Collections.EMPTY_MAP;
  
!     void updateData(Transferable t, boolean fetchData) {
          final Map<String, DataFlavor> mimeType2DataFlavor =
                  DataFlavorUtils.adjustSwingDataFlavors(
                  t.getTransferDataFlavors());
  
          // If we keep reference to source Transferable in SwingDragSource and
--- 62,72 ----
                  DataFlavorUtils.getFxMimeType(flavor));
      }
  
      private Map<String, Object> mimeType2Data = Collections.EMPTY_MAP;
  
!     public void updateData(Transferable t, boolean fetchData) {
          final Map<String, DataFlavor> mimeType2DataFlavor =
                  DataFlavorUtils.adjustSwingDataFlavors(
                  t.getTransferDataFlavors());
  
          // If we keep reference to source Transferable in SwingDragSource and
*** 104,114 ****
          } catch (Exception e) {
              mimeType2Data = Collections.EMPTY_MAP;
          }
      }
  
!     void updateData(Clipboard cb, boolean fetchData) {
          mimeType2Data = new HashMap<>();
          for (DataFormat f : cb.getContentTypes()) {
              mimeType2Data.put(DataFlavorUtils.getMimeType(f),
                      fetchData ? cb.getContent(f) : null);
          }
--- 98,108 ----
          } catch (Exception e) {
              mimeType2Data = Collections.EMPTY_MAP;
          }
      }
  
!     public void updateData(Clipboard cb, boolean fetchData) {
          mimeType2Data = new HashMap<>();
          for (DataFormat f : cb.getContentTypes()) {
              mimeType2Data.put(DataFlavorUtils.getMimeType(f),
                      fetchData ? cb.getContent(f) : null);
          }