mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-23 00:03:53 +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:10:31 +00:00
parent de5c528c09
commit 33186a3a28
5 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java
View file

@ -25,6 +25,7 @@ import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.DoubleClickEvent;
@ -80,7 +81,6 @@ import org.eclipse.ui.part.ResourceTransfer;
import org.eclipse.ui.part.ShowInContext; import org.eclipse.ui.part.ShowInContext;
import org.eclipse.ui.part.ViewPart; import org.eclipse.ui.part.ViewPart;
import org.eclipse.ui.views.framelist.FrameList; import org.eclipse.ui.views.framelist.FrameList;
import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.model.IArchive; import org.eclipse.cdt.core.model.IArchive;
@ -381,7 +381,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha
private void initDrag() { private void initDrag() {
int ops= DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK; int ops= DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
Transfer[] transfers= new Transfer[] { Transfer[] transfers= new Transfer[] {
LocalSelectionTransfer.getInstance(), LocalSelectionTransfer.getTransfer(),
ResourceTransfer.getInstance(), ResourceTransfer.getInstance(),
FileTransfer.getInstance(), FileTransfer.getInstance(),
}; };
@ -396,7 +396,7 @@ public class CView extends ViewPart implements ISetSelectionTarget, IPropertyCha
private void initDrop() { private void initDrop() {
int ops= DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK | DND.DROP_DEFAULT; int ops= DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK | DND.DROP_DEFAULT;
Transfer[] transfers= new Transfer[] { Transfer[] transfers= new Transfer[] {
LocalSelectionTransfer.getInstance(), LocalSelectionTransfer.getTransfer(),
ResourceTransfer.getInstance(), ResourceTransfer.getInstance(),
FileTransfer.getInstance(), FileTransfer.getInstance(),
PluginTransfer.getInstance() PluginTransfer.getInstance()

8
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/SelectionTransferDropAdapter.java
View file

@ -21,6 +21,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.dialogs.ProgressMonitorDialog;
import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.operation.IRunnableWithProgress;
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.StructuredViewer; import org.eclipse.jface.viewers.StructuredViewer;
@ -28,7 +29,6 @@ import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.DropTargetEvent; import org.eclipse.swt.dnd.DropTargetEvent;
import org.eclipse.swt.dnd.Transfer; import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.CoreModel;
@ -55,7 +55,7 @@ public class SelectionTransferDropAdapter extends CDTViewerDropAdapter implement
//---- TransferDropTargetListener interface --------------------------------------- //---- TransferDropTargetListener interface ---------------------------------------
public Transfer getTransfer() { public Transfer getTransfer() {
return LocalSelectionTransfer.getInstance(); return LocalSelectionTransfer.getTransfer();
} }
public boolean isEnabled(DropTargetEvent event) { public boolean isEnabled(DropTargetEvent event) {
@ -121,7 +121,7 @@ public class SelectionTransferDropAdapter extends CDTViewerDropAdapter implement
if (fElements != null) { if (fElements != null) {
return; return;
} }
ISelection s= LocalSelectionTransfer.getInstance().getSelection(); ISelection s= LocalSelectionTransfer.getTransfer().getSelection();
if (!(s instanceof IStructuredSelection)) { if (!(s instanceof IStructuredSelection)) {
return; return;
} }
@ -129,7 +129,7 @@ public class SelectionTransferDropAdapter extends CDTViewerDropAdapter implement
} }
private boolean tooFast(DropTargetEvent event) { private boolean tooFast(DropTargetEvent event) {
return Math.abs(LocalSelectionTransfer.getInstance().getSelectionSetTime() - (event.time & 0xFFFFFFFFL)) < DROP_TIME_DIFF_TRESHOLD; return Math.abs(LocalSelectionTransfer.getTransfer().getSelectionSetTime() - (event.time & 0xFFFFFFFFL)) < DROP_TIME_DIFF_TRESHOLD;
} }
@Override @Override

14
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/BasicSelectionTransferDragAdapter.java
View file

@ -13,13 +13,13 @@
package org.eclipse.cdt.internal.ui.dnd; package org.eclipse.cdt.internal.ui.dnd;
import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.Assert;
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.DND; import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.DragSourceAdapter; import org.eclipse.swt.dnd.DragSourceAdapter;
import org.eclipse.swt.dnd.DragSourceEvent; import org.eclipse.swt.dnd.DragSourceEvent;
import org.eclipse.swt.dnd.Transfer; import org.eclipse.swt.dnd.Transfer;
import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
public class BasicSelectionTransferDragAdapter extends DragSourceAdapter implements TransferDragSourceListener { public class BasicSelectionTransferDragAdapter extends DragSourceAdapter implements TransferDragSourceListener {
@ -34,7 +34,7 @@ public class BasicSelectionTransferDragAdapter extends DragSourceAdapter impleme
* @see TransferDragSourceListener#getTransfer * @see TransferDragSourceListener#getTransfer
*/ */
public Transfer getTransfer() { public Transfer getTransfer() {
return LocalSelectionTransfer.getInstance(); return LocalSelectionTransfer.getTransfer();
} }
/* non Java-doc /* non Java-doc
@ -43,8 +43,8 @@ public class BasicSelectionTransferDragAdapter extends DragSourceAdapter impleme
@Override @Override
public void dragStart(DragSourceEvent event) { public void dragStart(DragSourceEvent event) {
ISelection selection= fProvider.getSelection(); ISelection selection= fProvider.getSelection();
LocalSelectionTransfer.getInstance().setSelection(selection); LocalSelectionTransfer.getTransfer().setSelection(selection);
LocalSelectionTransfer.getInstance().setSelectionSetTime(event.time & 0xFFFFFFFFL); LocalSelectionTransfer.getTransfer().setSelectionSetTime(event.time & 0xFFFFFFFFL);
event.doit= isDragable(selection); event.doit= isDragable(selection);
} }
@ -69,7 +69,7 @@ public class BasicSelectionTransferDragAdapter extends DragSourceAdapter impleme
// For consistency set the data to the selection even though // For consistency set the data to the selection even though
// the selection is provided by the LocalSelectionTransfer // the selection is provided by the LocalSelectionTransfer
// to the drop target adapter. // to the drop target adapter.
event.data= LocalSelectionTransfer.getInstance().getSelection(); event.data= LocalSelectionTransfer.getTransfer().getSelection();
} }
@ -80,7 +80,7 @@ public class BasicSelectionTransferDragAdapter extends DragSourceAdapter impleme
public void dragFinished(DragSourceEvent event) { public void dragFinished(DragSourceEvent event) {
// Make sure we don't have to do any remaining work // Make sure we don't have to do any remaining work
Assert.isTrue(event.detail != DND.DROP_MOVE); Assert.isTrue(event.detail != DND.DROP_MOVE);
LocalSelectionTransfer.getInstance().setSelection(null); LocalSelectionTransfer.getTransfer().setSelection(null);
LocalSelectionTransfer.getInstance().setSelectionSetTime(0); LocalSelectionTransfer.getTransfer().setSelectionSetTime(0);
} }
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/dnd/ResourceTransferDropAdapter.java
View file

@ -18,6 +18,7 @@ import java.util.Iterator;
import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;
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.StructuredViewer; import org.eclipse.jface.viewers.StructuredViewer;
@ -29,7 +30,6 @@ import org.eclipse.ui.actions.CopyFilesAndFoldersOperation;
import org.eclipse.ui.actions.MoveFilesAndFoldersOperation; import org.eclipse.ui.actions.MoveFilesAndFoldersOperation;
import org.eclipse.ui.actions.ReadOnlyStateChecker; import org.eclipse.ui.actions.ReadOnlyStateChecker;
import org.eclipse.ui.part.ResourceTransfer; import org.eclipse.ui.part.ResourceTransfer;
import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICElement;
@ -133,7 +133,7 @@ public class ResourceTransferDropAdapter extends CDTViewerDropAdapter implements
private IResource[] getSelectedResources() { private IResource[] getSelectedResources() {
ArrayList<IResource> selectedResources = new ArrayList<IResource>(); ArrayList<IResource> selectedResources = new ArrayList<IResource>();
ISelection selection = LocalSelectionTransfer.getInstance() ISelection selection = LocalSelectionTransfer.getTransfer()
.getSelection(); .getSelection();
if (selection instanceof IStructuredSelection) { if (selection instanceof IStructuredSelection) {
IStructuredSelection ssel = (IStructuredSelection) selection; IStructuredSelection ssel = (IStructuredSelection) selection;

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AbstractCModelOutlinePage.java
View file

@ -22,6 +22,7 @@ import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator; import org.eclipse.jface.action.Separator;
import org.eclipse.jface.text.ITextSelection; import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.util.LocalSelectionTransfer;
import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.IDoubleClickListener;
@ -55,7 +56,6 @@ import org.eclipse.ui.part.ShowInContext;
import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.ITextEditor;
import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds; import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
import org.eclipse.ui.views.contentoutline.IContentOutlinePage; import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
import org.eclipse.ui.views.navigator.LocalSelectionTransfer;
import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CModelException;
import org.eclipse.cdt.core.model.ICElement; import org.eclipse.cdt.core.model.ICElement;
@ -688,7 +688,7 @@ public abstract class AbstractCModelOutlinePage extends Page implements IContent
private void initDragAndDrop() { private void initDragAndDrop() {
int ops= DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK; int ops= DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
Transfer[] transfers= new Transfer[] { Transfer[] transfers= new Transfer[] {
LocalSelectionTransfer.getInstance() LocalSelectionTransfer.getTransfer()
}; };
// Drop Adapter // Drop Adapter