mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-13 11:15:38 +02:00
Code Issues Wiki Activity

no need for Display dependency now that always using worker job for downloads and uploads

Browse source
This commit is contained in:
David McKnight 2006-06-01 14:56:52 +00:00
parent 303d707e63
commit bf7b93fa87
1 changed files with 7 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreFileService.java
View file

@ -52,7 +52,7 @@ import org.eclipse.rse.services.dstore.util.DownloadListener;
import org.eclipse.rse.services.dstore.util.FileSystemMessageUtil; import org.eclipse.rse.services.dstore.util.FileSystemMessageUtil;
import org.eclipse.rse.services.files.IFileService; import org.eclipse.rse.services.files.IFileService;
import org.eclipse.rse.services.files.IHostFile; import org.eclipse.rse.services.files.IHostFile;
import org.eclipse.swt.widgets.Display;
@ -183,7 +183,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
boolean isCancelled = false; boolean isCancelled = false;
Display display = Display.getCurrent();
try try
@ -210,10 +210,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
// upload bytes while available // upload bytes while available
while (available > 0 && !isCancelled) while (available > 0 && !isCancelled)
{ {
if (display != null && !display.isDisposed())
{
while (display.readAndDispatch()) {}
}
numToRead = (available < buffer_size) ? available : buffer_size; numToRead = (available < buffer_size) ? available : buffer_size;
@ -263,16 +260,11 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
} }
if (display != null && monitor != null) if (monitor != null)
{ {
isCancelled = monitor.isCanceled(); isCancelled = monitor.isCanceled();
if (isCancelled)
{
while (display.readAndDispatch())
{
}
}
} }
available = bufInputStream.available(); available = bufInputStream.available();
@ -335,12 +327,6 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
} }
if (display != null && monitor != null)
{
// monitor.done();
while (display.readAndDispatch()) {
}
}
return true; return true;
} }
@ -353,8 +339,7 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
boolean isCancelled = false; boolean isCancelled = false;
boolean transferSuccessful = false; boolean transferSuccessful = false;
Display display = Display.getCurrent();
long totalBytes = file.length(); long totalBytes = file.length();
try try
@ -395,10 +380,6 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
// upload bytes while available // upload bytes while available
while (available > 0 && !isCancelled) while (available > 0 && !isCancelled)
{ {
if (display != null && !display.isDisposed())
{
while (display.readAndDispatch()) {}
}
numToRead = (available < buffer_size) ? available : buffer_size; numToRead = (available < buffer_size) ? available : buffer_size;
@ -469,22 +450,11 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
String str = MessageFormat.format(_percentMsg, new Object[] {totalSentBuf, totalBuf, percentBuf}); String str = MessageFormat.format(_percentMsg, new Object[] {totalSentBuf, totalBuf, percentBuf});
monitor.subTask(str); monitor.subTask(str);
if (display != null)
{
while (display.readAndDispatch())
{
}
}
isCancelled = monitor.isCanceled(); isCancelled = monitor.isCanceled();
if (isCancelled && display != null)
{
while (display.readAndDispatch())
{
}
}
} }
available = bufInputStream.available(); available = bufInputStream.available();
@ -572,12 +542,6 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
} }
} }
if (display != null && monitor != null)
{
// monitor.done();
while (display.readAndDispatch()) {
}
}
return true; return true;
} }