diff options
author | Markus Keller | 2015-11-02 18:10:50 +0000 |
---|---|---|
committer | Markus Keller | 2015-11-02 18:10:50 +0000 |
commit | 74d0b2897d95b95c894c6d09eed10a5319495058 (patch) | |
tree | 4ab14ea2f4f76db52750190eba4f38718b8889e8 /bundles/org.eclipse.swt/Eclipse SWT Drag and Drop | |
parent | 7082dd9c9ab28760ad0148f50b8dd66bdb6622f7 (diff) | |
download | eclipse.platform.swt-74d0b2897d95b95c894c6d09eed10a5319495058.tar.gz eclipse.platform.swt-74d0b2897d95b95c894c6d09eed10a5319495058.tar.xz eclipse.platform.swt-74d0b2897d95b95c894c6d09eed10a5319495058.zip |
Bug 462633: Enable save actions for annotations
Added missing @Override/@Deprecated in win32
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Drag and Drop')
15 files changed, 80 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java index bca02a7ba1..faccfe8b0c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java @@ -120,6 +120,7 @@ import org.eclipse.swt.internal.win32.*; */ public abstract class ByteArrayTransfer extends Transfer { +@Override public TransferData[] getSupportedTypes() { int[] types = getTypeIds(); TransferData[] data = new TransferData[types.length]; @@ -135,6 +136,7 @@ public TransferData[] getSupportedTypes() { return data; } +@Override public boolean isSupportedType(TransferData transferData){ if (transferData == null) return false; int[] types = getTypeIds(); @@ -158,6 +160,7 @@ public boolean isSupportedType(TransferData transferData){ * * @see Transfer#nativeToJava */ +@Override protected void javaToNative (Object object, TransferData transferData) { if (!checkByteArray(object) || !isSupportedType(transferData)) { DND.error(DND.ERROR_INVALID_DATA); @@ -185,6 +188,7 @@ protected void javaToNative (Object object, TransferData transferData) { * * @see Transfer#javaToNative */ +@Override protected Object nativeToJava(TransferData transferData) { if (!isSupportedType(transferData) || transferData.pIDataObject == 0) return null; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java index 42e52e03e6..b0d20dc6e8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java @@ -517,14 +517,20 @@ private int AddRef() { private void createCOMInterfaces() { // register each of the interfaces that this object implements iDataObject = new COMObject(new int[]{2, 0, 0, 2, 2, 1, 2, 3, 2, 4, 1, 1}){ + @Override public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + @Override public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + @Override public long /*int*/ method2(long /*int*/[] args) {return Release();} + @Override public long /*int*/ method3(long /*int*/[] args) {return GetData(args[0], args[1]);} // method4 GetDataHere - not implemented + @Override public long /*int*/ method5(long /*int*/[] args) {return QueryGetData(args[0]);} // method6 GetCanonicalFormatEtc - not implemented // method7 SetData - not implemented + @Override public long /*int*/ method8(long /*int*/[] args) {return EnumFormatEtc((int)/*64*/args[0], args[1]);} // method9 DAdvise - not implemented // method10 DUnadvise - not implemented diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java index fbbc93a1b2..638f187dac 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java @@ -245,22 +245,34 @@ private int AddRef() { private void createCOMInterfaces() { // register each of the interfaces that this object implements iDropSource = new COMObject(new int[]{2, 0, 0, 2, 1}){ + @Override public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + @Override public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + @Override public long /*int*/ method2(long /*int*/[] args) {return Release();} + @Override public long /*int*/ method3(long /*int*/[] args) {return QueryContinueDrag((int)/*64*/args[0], (int)/*64*/args[1]);} + @Override public long /*int*/ method4(long /*int*/[] args) {return GiveFeedback((int)/*64*/args[0]);} }; iDataObject = new COMObject(new int[]{2, 0, 0, 2, 2, 1, 2, 3, 2, 4, 1, 1}){ + @Override public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + @Override public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + @Override public long /*int*/ method2(long /*int*/[] args) {return Release();} + @Override public long /*int*/ method3(long /*int*/[] args) {return GetData(args[0], args[1]);} // method4 GetDataHere - not implemented + @Override public long /*int*/ method5(long /*int*/[] args) {return QueryGetData(args[0]);} // method6 GetCanonicalFormatEtc - not implemented + @Override public long /*int*/ method7(long /*int*/[] args) {return SetData(args[0], args[1], (int)/*64*/args[2]);} + @Override public long /*int*/ method8(long /*int*/[] args) {return EnumFormatEtc((int)/*64*/args[0], args[1]);} // method9 DAdvise - not implemented // method10 DUnadvise - not implemented @@ -268,6 +280,7 @@ private void createCOMInterfaces() { }; } +@Override protected void checkSubclass() { String name = getClass().getName(); String validName = DragSource.class.getName(); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java index 88138fa604..29926e4729 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java @@ -223,6 +223,7 @@ int AddRef() { return refCount; } +@Override protected void checkSubclass () { String name = getClass().getName (); String validName = DropTarget.class.getName(); @@ -235,9 +236,13 @@ void createCOMInterfaces() { // register each of the interfaces that this object implements boolean is32 = C.PTR_SIZEOF == 4; iDropTarget = new COMObject(new int[]{2, 0, 0, is32 ? 5 : 4, is32 ? 4 : 3, 0, is32 ? 5 : 4}){ + @Override public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + @Override public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + @Override public long /*int*/ method2(long /*int*/[] args) {return Release();} + @Override public long /*int*/ method3(long /*int*/[] args) { if (args.length == 5) { return DragEnter(args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4]); @@ -245,6 +250,7 @@ void createCOMInterfaces() { return DragEnter_64(args[0], (int)/*64*/args[1], args[2], args[3]); } } + @Override public long /*int*/ method4(long /*int*/[] args) { if (args.length == 4) { return DragOver((int)/*64*/args[0], (int)/*64*/args[1], (int)/*64*/args[2], args[3]); @@ -252,7 +258,9 @@ void createCOMInterfaces() { return DragOver_64((int)/*64*/args[0], args[1], args[2]); } } + @Override public long /*int*/ method5(long /*int*/[] args) {return DragLeave();} + @Override public long /*int*/ method6(long /*int*/[] args) { if (args.length == 5) { return Drop(args[0], (int)/*64*/args[1], (int)/*64*/args[2], (int)/*64*/args[3], args[4]); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java index 330ee039f8..f9cb3cb641 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java @@ -63,6 +63,7 @@ public static FileTransfer getInstance () { * * @see Transfer#nativeToJava */ +@Override public void javaToNative(Object object, TransferData transferData) { if (!checkFile(object) || !isSupportedType(transferData)) { DND.error(DND.ERROR_INVALID_DATA); @@ -103,6 +104,7 @@ public void javaToNative(Object object, TransferData transferData) { * * @see Transfer#javaToNative */ +@Override public Object nativeToJava(TransferData transferData) { if (!isSupportedType(transferData) || transferData.pIDataObject == 0) return null; @@ -135,10 +137,12 @@ public Object nativeToJava(TransferData transferData) { return fileNames; } +@Override protected int[] getTypeIds(){ return new int[] {CF_HDROPID}; } +@Override protected String[] getTypeNames(){ return new String[] {CF_HDROP}; } @@ -151,6 +155,7 @@ boolean checkFile(Object object) { return true; } +@Override protected boolean validate(Object object) { return checkFile(object); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java index 2f07aae185..76c9c702ab 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/HTMLTransfer.java @@ -60,6 +60,7 @@ public static HTMLTransfer getInstance () { * * @see Transfer#nativeToJava */ +@Override public void javaToNative (Object object, TransferData transferData){ if (!checkHTML(object) || !isSupportedType(transferData)) { DND.error(DND.ERROR_INVALID_DATA); @@ -127,6 +128,7 @@ public void javaToNative (Object object, TransferData transferData){ * * @see Transfer#javaToNative */ +@Override public Object nativeToJava(TransferData transferData){ if (!isSupportedType(transferData) || transferData.pIDataObject == 0) return null; IDataObject data = new IDataObject(transferData.pIDataObject); @@ -195,15 +197,18 @@ public Object nativeToJava(TransferData transferData){ OS.GlobalFree(hMem); } } +@Override protected int[] getTypeIds(){ return new int[] {HTML_FORMATID}; } +@Override protected String[] getTypeNames(){ return new String[] {HTML_FORMAT}; } boolean checkHTML(Object object) { return (object != null && object instanceof String && ((String)object).length() > 0); } +@Override protected boolean validate(Object object) { return checkHTML(object); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ImageTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ImageTransfer.java index 3ec5eeb79b..2d58c47368 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ImageTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ImageTransfer.java @@ -58,6 +58,7 @@ public static ImageTransfer getInstance () { * * @see Transfer#nativeToJava */ +@Override public void javaToNative(Object object, TransferData transferData) { if (!checkImage(object) || !isSupportedType(transferData)) { DND.error(DND.ERROR_INVALID_DATA); @@ -131,6 +132,7 @@ public void javaToNative(Object object, TransferData transferData) { * * @see Transfer#javaToNative */ +@Override public Object nativeToJava(TransferData transferData) { if (!isSupportedType(transferData) || transferData.pIDataObject == 0) return null; IDataObject dataObject = new IDataObject(transferData.pIDataObject); @@ -191,10 +193,12 @@ public Object nativeToJava(TransferData transferData) { } } +@Override protected int[] getTypeIds(){ return new int[] {CF_DIBID}; } +@Override protected String[] getTypeNames(){ return new String[] {CF_DIB}; } @@ -203,6 +207,7 @@ boolean checkImage(Object object) { return true; } +@Override protected boolean validate(Object object) { return checkImage(object); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java index 7315f20713..342a69bd73 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java @@ -35,16 +35,25 @@ int AddRef() { private void createCOMInterfaces() { // register each of the interfaces that this object implements iUnknown = new COMObject(new int[] {2, 0, 0}){ + @Override public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + @Override public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + @Override public long /*int*/ method2(long /*int*/[] args) {return Release();} }; iEnumFORMATETC = new COMObject(new int[] {2, 0, 0, 3, 1, 0, 1}){ + @Override public long /*int*/ method0(long /*int*/[] args) {return QueryInterface(args[0], args[1]);} + @Override public long /*int*/ method1(long /*int*/[] args) {return AddRef();} + @Override public long /*int*/ method2(long /*int*/[] args) {return Release();} + @Override public long /*int*/ method3(long /*int*/[] args) {return Next((int)/*64*/args[0], args[1], args[2]);} + @Override public long /*int*/ method4(long /*int*/[] args) {return Skip((int)/*64*/args[0]);} + @Override public long /*int*/ method5(long /*int*/[] args) {return Reset();} // method6 Clone - not implemented }; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java index c6c85aa74b..0036b5103c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java @@ -54,6 +54,7 @@ public static RTFTransfer getInstance () { * * @see Transfer#nativeToJava */ +@Override public void javaToNative (Object object, TransferData transferData){ if (!checkRTF(object) || !isSupportedType(transferData)) { DND.error(DND.ERROR_INVALID_DATA); @@ -90,6 +91,7 @@ public void javaToNative (Object object, TransferData transferData){ * * @see Transfer#javaToNative */ +@Override public Object nativeToJava(TransferData transferData){ if (!isSupportedType(transferData) || transferData.pIDataObject == 0) return null; IDataObject data = new IDataObject(transferData.pIDataObject); @@ -119,10 +121,12 @@ public Object nativeToJava(TransferData transferData){ } } +@Override protected int[] getTypeIds(){ return new int[] {CF_RTFID}; } +@Override protected String[] getTypeNames(){ return new String[] {CF_RTF}; } @@ -131,6 +135,7 @@ boolean checkRTF(Object object) { return (object != null && object instanceof String && ((String)object).length() > 0); } +@Override protected boolean validate(Object object) { return checkRTF(object); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java index 99fa0673e6..062d01a7e8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDragSourceEffect.java @@ -55,6 +55,7 @@ public class TableDragSourceEffect extends DragSourceEffect { * * @param event the information associated with the drag finished event */ + @Override public void dragFinished(DragSourceEvent event) { if (dragSourceImage != null) dragSourceImage.dispose(); dragSourceImage = null; @@ -71,6 +72,7 @@ public class TableDragSourceEffect extends DragSourceEffect { * * @param event the information associated with the drag start event */ + @Override public void dragStart(DragSourceEvent event) { event.image = getDragSourceImage(event); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java index 94b4f5a28e..ca60609453 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TableDropTargetEffect.java @@ -83,6 +83,7 @@ public class TableDropTargetEffect extends DropTargetEffect { * @see DropTargetAdapter * @see DropTargetEvent */ + @Override public void dragEnter(DropTargetEvent event) { scrollBeginTime = 0; scrollIndex = -1; @@ -104,6 +105,7 @@ public class TableDropTargetEffect extends DropTargetEffect { * @see DropTargetAdapter * @see DropTargetEvent */ + @Override public void dragLeave(DropTargetEvent event) { Table table = (Table) control; long /*int*/ handle = table.handle; @@ -143,6 +145,7 @@ public class TableDropTargetEffect extends DropTargetEffect { * @see DND#FEEDBACK_SELECT * @see DND#FEEDBACK_SCROLL */ + @Override public void dragOver(DropTargetEvent event) { Table table = (Table) getControl(); int effect = checkEffect(event.feedback); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java index 1fbb765a9c..fc41b45d06 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java @@ -62,6 +62,7 @@ public static TextTransfer getInstance () { * * @see Transfer#nativeToJava */ +@Override public void javaToNative (Object object, TransferData transferData){ if (!checkText(object) || !isSupportedType(transferData)) { DND.error(DND.ERROR_INVALID_DATA); @@ -116,6 +117,7 @@ public void javaToNative (Object object, TransferData transferData){ * * @see Transfer#javaToNative */ +@Override public Object nativeToJava(TransferData transferData){ if (!isSupportedType(transferData) || transferData.pIDataObject == 0) return null; @@ -172,10 +174,12 @@ public Object nativeToJava(TransferData transferData){ return null; } +@Override protected int[] getTypeIds(){ return new int[] {CF_UNICODETEXTID, CF_TEXTID}; } +@Override protected String[] getTypeNames(){ return new String[] {CF_UNICODETEXT, CF_TEXT}; } @@ -184,6 +188,7 @@ boolean checkText(Object object) { return (object != null && object instanceof String && ((String)object).length() > 0); } +@Override protected boolean validate(Object object) { return checkText(object); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java index 7d207e76b9..bf5db80d00 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDragSourceEffect.java @@ -54,6 +54,7 @@ public class TreeDragSourceEffect extends DragSourceEffect { * * @param event the information associated with the drag finished event */ + @Override public void dragFinished(DragSourceEvent event) { if (dragSourceImage != null) dragSourceImage.dispose(); dragSourceImage = null; @@ -70,6 +71,7 @@ public class TreeDragSourceEffect extends DragSourceEffect { * * @param event the information associated with the drag start event */ + @Override public void dragStart(DragSourceEvent event) { event.image = getDragSourceImage(event); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java index 526e203730..e46223d1ac 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TreeDropTargetEffect.java @@ -91,6 +91,7 @@ public class TreeDropTargetEffect extends DropTargetEffect { * @see DropTargetAdapter * @see DropTargetEvent */ + @Override public void dragEnter(DropTargetEvent event) { dropIndex = -1; insertItem = null; @@ -114,6 +115,7 @@ public class TreeDropTargetEffect extends DropTargetEffect { * @see DropTargetAdapter * @see DropTargetEvent */ + @Override public void dragLeave(DropTargetEvent event) { Tree tree = (Tree) control; long /*int*/ handle = tree.handle; @@ -154,6 +156,7 @@ public class TreeDropTargetEffect extends DropTargetEffect { * @see DND#FEEDBACK_INSERT_AFTER * @see DND#FEEDBACK_SCROLL */ + @Override public void dragOver(DropTargetEvent event) { Tree tree = (Tree) getControl(); int effect = checkEffect(event.feedback); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java index ea2631cb5d..9d47b9e767 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/URLTransfer.java @@ -57,6 +57,7 @@ public static URLTransfer getInstance () { * * @see Transfer#nativeToJava */ +@Override public void javaToNative (Object object, TransferData transferData){ if (!checkURL(object) || !isSupportedType(transferData)) { DND.error(DND.ERROR_INVALID_DATA); @@ -107,6 +108,7 @@ public void javaToNative (Object object, TransferData transferData){ * * @see Transfer#javaToNative */ +@Override public Object nativeToJava(TransferData transferData){ if (!isSupportedType(transferData) || transferData.pIDataObject == 0) return null; IDataObject data = new IDataObject(transferData.pIDataObject); @@ -159,10 +161,12 @@ public Object nativeToJava(TransferData transferData){ return null; } +@Override protected int[] getTypeIds(){ return new int[] {CFSTR_INETURLIDW, CFSTR_INETURLID}; } +@Override protected String[] getTypeNames(){ return new String[] {CFSTR_INETURLW, CFSTR_INETURL}; } @@ -171,6 +175,7 @@ boolean checkURL(Object object) { return object != null && (object instanceof String) && ((String)object).length() > 0; } +@Override protected boolean validate(Object object) { return checkURL(object); } |