[cdt-patch] Drag&Drop fixes.

["Alain Magloire" <alain@xxxxxxx>]

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/ChangeLog,v
retrieving revision 1.85
diff -u -r1.85 ChangeLog
--- ChangeLog	7 Apr 2003 19:06:27 -0000	1.85
+++ ChangeLog	8 Apr 2003 14:28:52 -0000
@@ -1,3 +1,9 @@
+2003-04-08 Alain Magloire
+
+	Fix the drag & drop.
+
+	* src/org/eclipse/cdt/internal/ui/cview/CViewDragAdapter.java:
+
 2003-04-07 Alain Magloire
 
 	Enable contribution to the outliner ContentProvider, in the future
Index: src/org/eclipse/cdt/internal/ui/cview/CViewDragAdapter.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CViewDragAdapter.java,v
retrieving revision 1.3
diff -u -r1.3 CViewDragAdapter.java
--- src/org/eclipse/cdt/internal/ui/cview/CViewDragAdapter.java	27 Mar 2003 17:40:15 -0000	1.3
+++ src/org/eclipse/cdt/internal/ui/cview/CViewDragAdapter.java	8 Apr 2003 14:28:53 -0000
@@ -9,10 +9,9 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.cdt.core.model.CModelException;
-import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -100,9 +99,10 @@
 		for (Iterator i = selection.iterator(); i.hasNext();) {
 			Object next = i.next();
 			IResource res = null;
-			if (next instanceof ICElement) {
-				ICElement celement = (ICElement)next;
-				res = celement.getResource();
+			if (next instanceof IResource) {
+				res = (IResource)next;
+			} else if (next instanceof IAdaptable) {
+				res = (IResource)((IAdaptable)next).getAdapter(IResource.class);
 			}
 			if (res == null) {
 				event.doit = false;
@@ -128,15 +128,15 @@
 		Iterator enum = structuredSelection.iterator();
 		while (enum.hasNext()) {
 			Object obj = enum.next();
-			if (obj instanceof ICElement) {
-				try {
-					IResource res = ((ICElement)obj).getUnderlyingResource();
-					if (res != null) {
-						if ((res.getType() & resourceTypes) == res.getType()) {
-							resources.add(res);
-						}
-					}
-				} catch (CModelException e) {
+			IResource res = null;
+			if (obj instanceof IResource) {
+				res = (IResource)obj;
+			} else if (obj instanceof IAdaptable) {
+				res = (IResource)((IAdaptable)obj).getAdapter(IResource.class);
+			}
+			if (res != null) {
+				if ((res.getType() & resourceTypes) == res.getType()) {
+					resources.add(res);
 				}
 			}
 		}