mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-03 15:15:25 +02:00
Code Issues Wiki Activity

[205297] Editor upload should not be on main thread

Browse source
This commit is contained in:
David McKnight 2007-10-05 18:39:36 +00:00
parent d7e821bf68
commit 25c61fbaaf
2 changed files with 66 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemTempFileListener.java
View file

@ -18,6 +18,7 @@
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
* Martin Oberhuber (Wind River) - [189130] Move SystemIFileProperties from UI to Core
* Martin Oberhuber (Wind River) - [199573] Fix potential threading issues in SystemTempFileListener
* David McKnight (IBM) - [205297] Editor upload should not be on main thread
********************************************************************************/
package org.eclipse.rse.files.ui.resources;
@ -136,7 +137,7 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
if (_changedResources.size() > 0 && !_isSynching)
{
refreshRemoteResourcesOnUIThread();
synchRemoteResourcesOnThread();
}
}
else
@ -173,9 +174,14 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
}
monitor.done();
return Status.OK_STATUS;
}
}
}
/***
* @deprecated don't use this class, it's only here because to remove it would be
* an API change, and we can't do that until 3.0. Instead of using this,
* SynchResourcesJob should be used.
*/
public class RefreshResourcesUIJob extends WorkbenchJob
{
public RefreshResourcesUIJob()
@ -207,6 +213,42 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
}
}
/**
* Used for doing the upload from a job
* @author dmcknigh
*
*/
private class SynchResourcesJob extends Job
{
public SynchResourcesJob()
{
super(FileResources.RSEOperation_message);
}
public IStatus run(IProgressMonitor monitor)
{
_isSynching = true;
try {
IFile[] filesToSync;
synchronized(_changedResources) {
filesToSync = (IFile[])_changedResources.toArray(new IFile[_changedResources.size()]);
_changedResources.clear();
}
SystemMessage msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_SYNCHRONIZE_PROGRESS);
monitor.beginTask(msg.getLevelOneText(), IProgressMonitor.UNKNOWN);
setName(msg.getLevelOneText());
for (int i = 0; i < filesToSync.length; i++)
{
synchronizeTempWithRemote(filesToSync[i], monitor);
}
} finally {
_isSynching = false;
monitor.done();
}
return Status.OK_STATUS;
}
}
private void refreshRemoteResourcesOnMainThread(List resources)
{
RefreshResourcesJob job = new RefreshResourcesJob(resources);
@ -214,9 +256,9 @@ public abstract class SystemTempFileListener implements IResourceChangeListener
job.schedule();
}
private void refreshRemoteResourcesOnUIThread()
private void synchRemoteResourcesOnThread()
{
RefreshResourcesUIJob job = new RefreshResourcesUIJob();
SynchResourcesJob job = new SynchResourcesJob();
job.setPriority(Job.INTERACTIVE);
job.schedule();
}

25
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java
View file

@ -17,6 +17,7 @@
* Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
* Martin Oberhuber (Wind River) - [186773] split ISystemRegistryUI from ISystemRegistry
* Martin Oberhuber (Wind River) - [189130] Move SystemIFileProperties from UI to Core
* David McKnight (IBM) - [205297] Editor upload should not be on main thread
********************************************************************************/
package org.eclipse.rse.files.ui.resources;
@ -297,7 +298,7 @@ public class SystemUniversalTempFileListener extends SystemTempFileListener
{
// conflict
// determine which file has a newer timestamp
boolean remoteNewer = remoteModifiedStamp > storedModifiedStamp;
final boolean remoteNewer = remoteModifiedStamp > storedModifiedStamp;
// case 1: the remote file has changed since our last download
// it's new timestamp is newer than our stored timestamp (file got
@ -312,11 +313,25 @@ public class SystemUniversalTempFileListener extends SystemTempFileListener
// 2) Overwrite remote
// 3) Save as...
// 4) Cancel
Shell shell = RSEUIPlugin.getTheSystemRegistryUI().getShell();
final SystemEditableRemoteFile remoteEdit = editable;
final IFile tFile = tempFile;
final IRemoteFile rFile = remoteFile;
// upload is run in a job, so the conflict action/dialog needs to run in UI thread
Display.getDefault().asyncExec(new Runnable()
{
public void run()
{
Shell shell = RSEUIPlugin.getTheSystemRegistryUI().getShell();
SystemUploadConflictAction conflictAction = new SystemUploadConflictAction(shell, tempFile, remoteFile, remoteNewer);
conflictAction.run();
editable.updateDirtyIndicator();
SystemUploadConflictAction conflictAction = new SystemUploadConflictAction(shell, tFile, rFile, remoteNewer);
conflictAction.run();
remoteEdit.updateDirtyIndicator();
}
});
}