Mercurial > projects > dwt-mac
diff dwt/dnd/HTMLTransfer.d @ 45:d8635bb48c7c
Merge with SWT 3.5
author | Jacob Carlborg <doob@me.com> |
---|---|
date | Mon, 01 Dec 2008 17:07:00 +0100 |
parents | e76aa0b07480 |
children | 6a1ed74f02e8 |
line wrap: on
line diff
--- a/dwt/dnd/HTMLTransfer.d Tue Oct 21 15:20:04 2008 +0200 +++ b/dwt/dnd/HTMLTransfer.d Mon Dec 01 17:07:00 2008 +0100 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 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,15 +8,17 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -module dwt.dnd; +module dwt.dnd.HTMLTransfer; + +import dwt.dwthelper.utils; -import dwt.internal.carbon.OS; +import dwt.internal.cocoa.NSString; +import dwt.internal.cocoa.OS; /** * The class <code>HTMLTransfer</code> provides a platform specific mechanism * for converting text in HTML 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 HTML text is shown * below:</p> @@ -24,14 +26,16 @@ * <code><pre> * String htmlData = "<p>This is a paragraph of text.</p>"; * </code></pre> + * + * @see Transfer */ -public class HTMLTransfer : ByteArrayTransfer { +public class HTMLTransfer extends ByteArrayTransfer { static HTMLTransfer _instance = new HTMLTransfer(); - static final String HTML = "HTML"; //$NON-NLS-1$ + static final String HTML = OS.NSHTMLPboardType.getString(); static final int HTMLID = registerType(HTML); -this() {} +HTMLTransfer() {} /** * Returns the singleton instance of the HTMLTransfer class. @@ -45,44 +49,34 @@ /** * This implementation of <code>javaToNative</code> converts HTML-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 HTML 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 (!checkHTML(object) || !isSupportedType(transferData)) { DND.error(DND.ERROR_INVALID_DATA); } - String String = cast(String)object; - int count = String.length(); - char[] chars = new char[count]; - String.getChars(0, count, chars, 0); - byte[] buffer = new byte[chars.length * 2]; - OS.memmove(buffer, chars, buffer.length); - transferData.data = new byte[1][]; - transferData.data[0] = buffer; - transferData.result = OS.noErr; + transferData.data = NSString.stringWith((String) object); } /** * This implementation of <code>nativeToJava</code> converts a platform specific * representation of HTML 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 HTML 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 HTML 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]; - char[] chars = new char[(buffer.length + 1) / 2]; - OS.memmove(chars, buffer, buffer.length); - return new String(chars); + NSString string = (NSString) transferData.data; + return string.getString(); } protected int[] getTypeIds() { @@ -94,7 +88,7 @@ } bool checkHTML(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) {