src/macosx/classes/sun/lwawt/macosx/CClipboard.java

*** 23,45 ****
   * questions.
   */
  
  package sun.lwawt.macosx;
  
  import java.awt.*;
  import java.awt.datatransfer.*;
  import java.io.IOException;
  import java.io.NotSerializableException;
  import java.util.*;
  
- import sun.awt.datatransfer.*;
- 
  
  /**
  * A class which interfaces with Cocoa's pasteboard in order to support
   * data transfer via Clipboard operations. Most of the work is provided by
!  * sun.awt.datatransfer.DataTransferer.
   */
  
  final class CClipboard extends SunClipboard {
  
      public CClipboard(String name) {
--- 23,46 ----
   * questions.
   */
  
  package sun.lwawt.macosx;
  
+ import sun.awt.datatransfer.desktop.DataTransferer;
+ import sun.awt.datatransfer.desktop.SunClipboard;
+ 
  import java.awt.*;
  import java.awt.datatransfer.*;
  import java.io.IOException;
  import java.io.NotSerializableException;
  import java.util.*;
  
  
  /**
  * A class which interfaces with Cocoa's pasteboard in order to support
   * data transfer via Clipboard operations. Most of the work is provided by
!  * {@link sun.awt.datatransfer.desktop.DataTransferer}.
   */
  
  final class CClipboard extends SunClipboard {
  
      public CClipboard(String name) {
*** 74,84 ****
          for (Map.Entry<Long, DataFlavor> entry : formatMap.entrySet()) {
              long format = entry.getKey();
              DataFlavor flavor = entry.getValue();
  
              try {
!                 byte[] bytes = DataTransferer.getInstance().translateTransferable(contents, flavor, format);
                  setData(bytes, format);
              } catch (IOException e) {
                  // Fix 4696186: don't print exception if data with
                  // javaJVMLocalObjectMimeType failed to serialize.
                  // May remove this if-check when 5078787 is fixed.
--- 75,85 ----
          for (Map.Entry<Long, DataFlavor> entry : formatMap.entrySet()) {
              long format = entry.getKey();
              DataFlavor flavor = entry.getValue();
  
              try {
!                 byte[] bytes = dataTransferer.translateTransferable(contents, flavor, format);
                  setData(bytes, format);
              } catch (IOException e) {
                  // Fix 4696186: don't print exception if data with
                  // javaJVMLocalObjectMimeType failed to serialize.
                  // May remove this if-check when 5078787 is fixed.