mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-11 18:25:40 +02:00
Code Issues Wiki Activity

bug 285746: Replace deprecated class org.eclipse.ui.views.navigator.LocalSelectionTransfer

Browse source
This commit is contained in:
Andrew Gvozdev 2009-08-05 18:01:03 +00:00
parent 6b97b8dcf5
commit de5c528c09
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/LocalTransferDragSourceListener.java
View file

@ -11,10 +11,10 @@
package org.eclipse.cdt.make.internal.ui.dnd; 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.ISelection;
import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.swt.dnd.Transfer; import org.eclipse.swt.dnd.Transfer;
import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
/** /**
* {@code LocalTransferDragSourceListener} supports dragging of selected objects from * {@code LocalTransferDragSourceListener} supports dragging of selected objects from
@ -39,7 +39,7 @@ public class LocalTransferDragSourceListener extends AbstractSelectionDragAdapte
* drop operation for. * drop operation for.
*/ */
public Transfer getTransfer() { public Transfer getTransfer() {
return LocalSelectionTransfer.getInstance(); return LocalSelectionTransfer.getTransfer();
} }
/** /**
@ -60,7 +60,7 @@ public class LocalTransferDragSourceListener extends AbstractSelectionDragAdapte
*/ */
@Override @Override
public void dragInit(ISelection selection) { public void dragInit(ISelection selection) {
LocalSelectionTransfer.getInstance().setSelection(selection); LocalSelectionTransfer.getTransfer().setSelection(selection);
} }
/** /**
@ -71,7 +71,7 @@ public class LocalTransferDragSourceListener extends AbstractSelectionDragAdapte
*/ */
@Override @Override
public Object prepareDataForTransfer(ISelection selection) { public Object prepareDataForTransfer(ISelection selection) {
return LocalSelectionTransfer.getInstance().getSelection(); return LocalSelectionTransfer.getTransfer().getSelection();
} }
/** /**
@ -79,7 +79,7 @@ public class LocalTransferDragSourceListener extends AbstractSelectionDragAdapte
*/ */
@Override @Override
public void dragDone() { public void dragDone() {
LocalSelectionTransfer.getInstance().setSelection(null); LocalSelectionTransfer.getTransfer().setSelection(null);
LocalSelectionTransfer.getInstance().setSelectionSetTime(0); LocalSelectionTransfer.getTransfer().setSelectionSetTime(0);
} }
} }

6
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/LocalTransferDropTargetListener.java
View file

@ -20,12 +20,12 @@ import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.Transfer; import org.eclipse.swt.dnd.Transfer;
import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
/** /**
* {@code LocalTransferDropTargetListener} supports dropping of dragged selection to * {@code LocalTransferDropTargetListener} supports dropping of dragged selection to
@ -53,7 +53,7 @@ public class LocalTransferDropTargetListener extends AbstractContainerAreaDropAd
* drop operation for. * drop operation for.
*/ */
public Transfer getTransfer() { public Transfer getTransfer() {
return LocalSelectionTransfer.getInstance(); return LocalSelectionTransfer.getTransfer();
} }
/** /**
@ -62,7 +62,7 @@ public class LocalTransferDropTargetListener extends AbstractContainerAreaDropAd
* @return selection as {@link IStructuredSelection}. * @return selection as {@link IStructuredSelection}.
*/ */
private IStructuredSelection getSelection() { private IStructuredSelection getSelection() {
ISelection selection = LocalSelectionTransfer.getInstance().getSelection(); ISelection selection = LocalSelectionTransfer.getTransfer().getSelection();
if (selection instanceof IStructuredSelection) { if (selection instanceof IStructuredSelection) {
return (IStructuredSelection) selection; return (IStructuredSelection) selection;
} }

6
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/views/MakeView.java
View file

@ -44,6 +44,7 @@ import org.eclipse.jface.action.Separator;
import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.util.DelegatingDragAdapter; import org.eclipse.jface.util.DelegatingDragAdapter;
import org.eclipse.jface.util.DelegatingDropAdapter; import org.eclipse.jface.util.DelegatingDropAdapter;
import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.ISelectionChangedListener; 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.actions.TextActionHandler;
import org.eclipse.ui.part.DrillDownAdapter; import org.eclipse.ui.part.DrillDownAdapter;
import org.eclipse.ui.part.ViewPart; import org.eclipse.ui.part.ViewPart;
import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
public class MakeView extends ViewPart { public class MakeView extends ViewPart {
@ -152,7 +152,7 @@ public class MakeView extends ViewPart {
// LocalSelectionTransfer is used inside Make Target View // LocalSelectionTransfer is used inside Make Target View
// TextTransfer is used to drag outside the View or eclipse // TextTransfer is used to drag outside the View or eclipse
Transfer[] dragTransfers= { Transfer[] dragTransfers= {
LocalSelectionTransfer.getInstance(), LocalSelectionTransfer.getTransfer(),
MakeTargetTransfer.getInstance(), MakeTargetTransfer.getInstance(),
TextTransfer.getInstance(), TextTransfer.getInstance(),
}; };
@ -169,7 +169,7 @@ public class MakeView extends ViewPart {
fViewer.addDragSupport(opers, dragTransfers, delegatingDragAdapter); fViewer.addDragSupport(opers, dragTransfers, delegatingDragAdapter);
Transfer[] dropTransfers= { Transfer[] dropTransfers= {
LocalSelectionTransfer.getInstance(), LocalSelectionTransfer.getTransfer(),
MakeTargetTransfer.getInstance(), MakeTargetTransfer.getInstance(),
FileTransfer.getInstance(), FileTransfer.getInstance(),
TextTransfer.getInstance(), TextTransfer.getInstance(),