From 7b31ccbb6694856217c2c62334f91647c7be3014 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Thu, 7 Dec 2006 18:01:56 +0000 Subject: [PATCH] [142478] fix for upload conflict scenario such that all uploads and downloads are in background --- .../servicesubsystem/FileServiceSubSystem.java | 14 +------------- .../eclipse/rse/core/subsystems/SubSystem.java | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java index 649195d4b44..2eef340dfe0 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java @@ -66,19 +66,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I protected IRemoteFile _userHome; - public class SystemMessageDialogRunnable implements Runnable - { - private SystemMessageDialog _dlg; - public SystemMessageDialogRunnable(SystemMessageDialog dlg) - { - _dlg = dlg; - } - - public void run() - { - _dlg.open(); - } - } + public FileServiceSubSystem(IHost host, IConnectorService connectorService, IFileService hostFileService, IHostFileToRemoteFileAdapter fileAdapter, ISearchService searchService) { diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java index dd4cb2baf87..61ef98f875b 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java @@ -152,6 +152,21 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS */ protected ISystemFilterPoolReferenceManager filterPoolReferenceManager = null; + public class SystemMessageDialogRunnable implements Runnable + { + private SystemMessageDialog _dlg; + public SystemMessageDialogRunnable(SystemMessageDialog dlg) + { + _dlg = dlg; + } + + public void run() + { + _dlg.open(); + } + } + + private class NullRunnableContext implements IRunnableContext { public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable) throws InvocationTargetException, InterruptedException { IProgressMonitor monitor = new NullProgressMonitor();