From de5c528c095292b39a9ed70e9b7793072694b8ea Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Wed, 5 Aug 2009 18:01:03 +0000 Subject: [PATCH] bug 285746: Replace deprecated class org.eclipse.ui.views.navigator.LocalSelectionTransfer --- .../ui/dnd/LocalTransferDragSourceListener.java | 12 ++++++------ .../ui/dnd/LocalTransferDropTargetListener.java | 6 +++--- .../src/org/eclipse/cdt/make/ui/views/MakeView.java | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/LocalTransferDragSourceListener.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/LocalTransferDragSourceListener.java index 95dce6a8283..3803e1d60b1 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/LocalTransferDragSourceListener.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/LocalTransferDragSourceListener.java @@ -11,10 +11,10 @@ package org.eclipse.cdt.make.internal.ui.dnd; +import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.swt.dnd.Transfer; -import org.eclipse.ui.views.navigator.LocalSelectionTransfer; /** * {@code LocalTransferDragSourceListener} supports dragging of selected objects from @@ -39,7 +39,7 @@ public class LocalTransferDragSourceListener extends AbstractSelectionDragAdapte * drop operation for. */ public Transfer getTransfer() { - return LocalSelectionTransfer.getInstance(); + return LocalSelectionTransfer.getTransfer(); } /** @@ -60,7 +60,7 @@ public class LocalTransferDragSourceListener extends AbstractSelectionDragAdapte */ @Override public void dragInit(ISelection selection) { - LocalSelectionTransfer.getInstance().setSelection(selection); + LocalSelectionTransfer.getTransfer().setSelection(selection); } /** @@ -71,7 +71,7 @@ public class LocalTransferDragSourceListener extends AbstractSelectionDragAdapte */ @Override public Object prepareDataForTransfer(ISelection selection) { - return LocalSelectionTransfer.getInstance().getSelection(); + return LocalSelectionTransfer.getTransfer().getSelection(); } /** @@ -79,7 +79,7 @@ public class LocalTransferDragSourceListener extends AbstractSelectionDragAdapte */ @Override public void dragDone() { - LocalSelectionTransfer.getInstance().setSelection(null); - LocalSelectionTransfer.getInstance().setSelectionSetTime(0); + LocalSelectionTransfer.getTransfer().setSelection(null); + LocalSelectionTransfer.getTransfer().setSelectionSetTime(0); } } diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/LocalTransferDropTargetListener.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/LocalTransferDropTargetListener.java index 33851105e26..c47b39cabbc 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/LocalTransferDropTargetListener.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/LocalTransferDropTargetListener.java @@ -20,12 +20,12 @@ import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.Transfer; -import org.eclipse.ui.views.navigator.LocalSelectionTransfer; /** * {@code LocalTransferDropTargetListener} supports dropping of dragged selection to @@ -53,7 +53,7 @@ public class LocalTransferDropTargetListener extends AbstractContainerAreaDropAd * drop operation for. */ public Transfer getTransfer() { - return LocalSelectionTransfer.getInstance(); + return LocalSelectionTransfer.getTransfer(); } /** @@ -62,7 +62,7 @@ public class LocalTransferDropTargetListener extends AbstractContainerAreaDropAd * @return selection as {@link IStructuredSelection}. */ private IStructuredSelection getSelection() { - ISelection selection = LocalSelectionTransfer.getInstance().getSelection(); + ISelection selection = LocalSelectionTransfer.getTransfer().getSelection(); if (selection instanceof IStructuredSelection) { return (IStructuredSelection) selection; } diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java index b8b3ab771ea..a44e695e88c 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java @@ -44,6 +44,7 @@ import org.eclipse.jface.action.Separator; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.util.DelegatingDragAdapter; import org.eclipse.jface.util.DelegatingDropAdapter; +import org.eclipse.jface.util.LocalSelectionTransfer; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.ISelectionChangedListener; @@ -66,7 +67,6 @@ import org.eclipse.ui.IActionBars; import org.eclipse.ui.actions.TextActionHandler; import org.eclipse.ui.part.DrillDownAdapter; import org.eclipse.ui.part.ViewPart; -import org.eclipse.ui.views.navigator.LocalSelectionTransfer; public class MakeView extends ViewPart { @@ -152,7 +152,7 @@ public class MakeView extends ViewPart { // LocalSelectionTransfer is used inside Make Target View // TextTransfer is used to drag outside the View or eclipse Transfer[] dragTransfers= { - LocalSelectionTransfer.getInstance(), + LocalSelectionTransfer.getTransfer(), MakeTargetTransfer.getInstance(), TextTransfer.getInstance(), }; @@ -169,7 +169,7 @@ public class MakeView extends ViewPart { fViewer.addDragSupport(opers, dragTransfers, delegatingDragAdapter); Transfer[] dropTransfers= { - LocalSelectionTransfer.getInstance(), + LocalSelectionTransfer.getTransfer(), MakeTargetTransfer.getInstance(), FileTransfer.getInstance(), TextTransfer.getInstance(),