--- a/dwt/dnd/RTFTransfer.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/dnd/RTFTransfer.d	Mon Dec 01 17:07:00 2008 +0100
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,16 +8,17 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-module dwt.dnd;
+module dwt.dnd.RTFTransfer;
+
+import dwt.dwthelper.utils;
  
-import dwt.internal.carbon.OS;
-import dwt.internal.carbon.CFRange;
+import dwt.internal.cocoa.NSString;
+import dwt.internal.cocoa.OS;
 
 /**
  * The class <code>RTFTransfer</code> provides a platform specific mechanism 
  * for converting text in RTF format represented as a java <code>String</code> 
- * to a platform specific representation of the data and vice versa.  See 
- * <code>Transfer</code> for additional information.
+ * to a platform specific representation of the data and vice versa.
  * 
  * <p>An example of a java <code>String</code> containing RTF text is shown 
  * below:</p>
@@ -25,14 +26,16 @@
  * <code><pre>
  *     String rtfData = "{\\rtf1{\\colortbl;\\red255\\green0\\blue0;}\\uc1\\b\\i Hello World}";
  * </code></pre>
+ *
+ * @see Transfer
  */
-public class RTFTransfer : ByteArrayTransfer {
+public class RTFTransfer extends ByteArrayTransfer {
 
     static RTFTransfer _instance = new RTFTransfer();
-    static final String RTF = "RTF "; //$NON-NLS-1$
+    static final String RTF = OS.NSRTFPboardType.getString();
     static final int RTFID = registerType(RTF);
 
-this() {}
+RTFTransfer() {}
 
 /**
  * Returns the singleton instance of the RTFTransfer class.
@@ -46,69 +49,34 @@
 /**
  * This implementation of <code>javaToNative</code> converts RTF-formatted text
  * represented by a java <code>String</code> to a platform specific representation.
- * For additional information see <code>Transfer#javaToNative</code>.
  * 
  * @param object a java <code>String</code> containing RTF text
- * @param transferData an empty <code>TransferData</code> object; this
- *  object will be filled in on return with the platform specific format of the data
+ * @param transferData an empty <code>TransferData</code> object that will
+ *      be filled in on return with the platform specific format of the data
+ * 
+ * @see Transfer#nativeToJava
  */
 public void javaToNative (Object object, TransferData transferData){
     if (!checkRTF(object) || !isSupportedType(transferData)) {
         DND.error(DND.ERROR_INVALID_DATA);
     }
-    transferData.result = -1;
-    String String = cast(String)object;
-    int count = String.length();
-    char[] chars = new char[count];
-    String.getChars(0, count, chars, 0);
-    int cfString = OS.CFStringCreateWithCharacters(OS.kCFAllocatorDefault, chars, count);
-    if (cfString is 0) return;
-    try {
-        CFRange range = new CFRange();
-        range.length = chars.length;
-        int encoding = OS.CFStringGetSystemEncoding();
-        int[] size = new int[1];
-        int numChars = OS.CFStringGetBytes(cfString, range, encoding, cast(byte)'?', true, null, 0, size);
-        if (numChars is 0 || size[0] is 0) return;
-        byte[] buffer = new byte[size[0]];
-        numChars = OS.CFStringGetBytes(cfString, range, encoding, cast(byte)'?', true, buffer, size [0], size);
-        if (numChars is 0) return;
-        transferData.data = new byte[1][];
-        transferData.data[0] = buffer;
-        transferData.result = 0;
-    } finally {
-        OS.CFRelease(cfString);
-    }
+    transferData.data = NSString.stringWith((String) object);
 }
 
 /**
  * This implementation of <code>nativeToJava</code> converts a platform specific 
  * representation of RTF text to a java <code>String</code>.
- * For additional information see <code>Transfer#nativeToJava</code>.
  * 
- * @param transferData the platform specific representation of the data to be 
- * been converted
- * @return a java <code>String</code> containing RTF text if the 
- * conversion was successful; otherwise null
+ * @param transferData the platform specific representation of the data to be converted
+ * @return a java <code>String</code> containing RTF text if the conversion was successful;
+ *      otherwise null
+ * 
+ * @see Transfer#javaToNative
  */
 public Object nativeToJava(TransferData transferData){
     if (!isSupportedType(transferData) || transferData.data is null) return null;
-    if (transferData.data.length is 0 || transferData.data[0].length is 0) return null;
-    byte[] buffer = transferData.data[0];
-    int encoding = OS.CFStringGetSystemEncoding();
-    int cfString = OS.CFStringCreateWithBytes(OS.kCFAllocatorDefault, buffer, buffer.length, encoding, true);
-    if (cfString is 0) return null;
-    try {
-        int length = OS.CFStringGetLength(cfString);
-        if (length is 0) return null;
-        char[] chars = new char[length];
-        CFRange range = new CFRange();
-        range.length = length;
-        OS.CFStringGetCharacters(cfString, range, chars);
-        return new String(chars);
-    } finally {
-        OS.CFRelease(cfString);
-    }
+    NSString string = (NSString) transferData.data;
+    return string.getString();
 }
 
 protected int[] getTypeIds() {
@@ -120,7 +88,7 @@
 }
 
 bool checkRTF(Object object) {
-    return (object !is null && null !is cast(String)object && (cast(String)object).length() > 0);
+    return (object !is null && object instanceof String && ((String)object).length() > 0);
 }
 
 protected bool validate(Object object) {