From 525d45f5f987056787b82c11e554f1d3867775e4 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Wed, 30 May 2007 20:45:35 +0000 Subject: [PATCH] [189268] backing out the download on copy/drag changes --- .../rse/internal/ui/view/SystemView.java | 1 - .../actions/SystemCopyToClipboardAction.java | 23 +++++++++---------- .../eclipse/rse/ui/view/SystemTableView.java | 1 - 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java index 7fe927e3329..c165cdb1dbd 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java @@ -5485,7 +5485,6 @@ public class SystemView extends SafeTreeViewer int ops = DND.DROP_COPY | DND.DROP_MOVE; Transfer[] dragtransfers = new Transfer[] { PluginTransfer.getInstance(), - FileTransfer.getInstance(), EditorInputTransfer.getInstance() }; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java index 1b0c29b240e..312ca90f8fd 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemCopyToClipboardAction.java @@ -59,7 +59,7 @@ public class SystemCopyToClipboardAction extends SystemBaseAction implements IV { private IStructuredSelection _selection; private Clipboard _clipboard; - private boolean _doResourceTransfer = true; //experiment + private boolean _doResourceTransfer = false; // determines whether or not to download on copy /** * Constructor @@ -93,19 +93,18 @@ public class SystemCopyToClipboardAction extends SystemBaseAction implements IV if (remoteAdapter != null) { - if (remoteAdapter.canEdit(dragObject)) - { - ISystemEditableRemoteObject editable = remoteAdapter.getEditableRemoteObject(dragObject); - // corresponds to a file - IFile file = editable.getLocalResource(); - if (!file.exists()) - { - LazyDownloadJob job = new LazyDownloadJob(editable); - job.schedule(); + { + ISystemEditableRemoteObject editable = remoteAdapter.getEditableRemoteObject(dragObject); + // corresponds to a file + IFile file = editable.getLocalResource(); + if (!file.exists()) + { + LazyDownloadJob job = new LazyDownloadJob(editable); + job.schedule(); + } + resource = file; } - resource = file; - } else if (viewAdapter != null) { if (viewAdapter.hasChildren(dragObject)) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java index 771ad94f41c..6de863ee1b0 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java @@ -824,7 +824,6 @@ public class SystemTableView int ops = DND.DROP_COPY | DND.DROP_MOVE; Transfer[] dragtransfers = new Transfer[] { PluginTransfer.getInstance(), - FileTransfer.getInstance(), EditorInputTransfer.getInstance() };