From af25ae28286873213c4260f2f2f02fb435d991eb Mon Sep 17 00:00:00 2001 From: David McKnight Date: Fri, 14 Mar 2008 17:33:07 +0000 Subject: [PATCH] [219792][importexport][ftp] RSE hangs on FTP import --- .../importexport/files/RemoteImportWizardPage1.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteImportWizardPage1.java b/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteImportWizardPage1.java index 0a155c59896..76367c61d22 100644 --- a/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteImportWizardPage1.java +++ b/rse/plugins/org.eclipse.rse.importexport/src/org/eclipse/rse/internal/importexport/files/RemoteImportWizardPage1.java @@ -128,9 +128,8 @@ class RemoteImportWizardPage1 extends WizardResourceImportPage implements Listen private Object _fileSystemObject; private IImportStructureProvider _provider; private MinimizedFileSystemElement _element; - private boolean _isActive = false; - private boolean _isCanceled = false; - + private volatile boolean _isActive = false; + public QueryAllJob(Object fileSystemObject, IImportStructureProvider provider, MinimizedFileSystemElement element){ super("Querying All"); //$NON-NLS-1$ _fileSystemObject = fileSystemObject; @@ -143,14 +142,12 @@ class RemoteImportWizardPage1 extends WizardResourceImportPage implements Listen _isActive = true; query(_fileSystemObject, _element, monitor); _isActive = false; - Display.getDefault().asyncExec(new Runnable(){ public void run(){ updateWidgetEnablements(); selectionGroup.setAllSelections(true); } }); - return Status.OK_STATUS; } @@ -159,14 +156,10 @@ class RemoteImportWizardPage1 extends WizardResourceImportPage implements Listen return _isActive; } - - protected void canceling() { - _isCanceled = true; - } private void query(Object parent, MinimizedFileSystemElement element, IProgressMonitor monitor){ - if (monitor.isCanceled() || _isCanceled){ + if (monitor.isCanceled()){ return; }