Progress monitor and logging updates

This commit is contained in:
Eugene Livis 2017-11-02 15:38:12 -04:00
parent bd32abf036
commit cb3ebedf9c
2 changed files with 3 additions and 2 deletions

View File

@ -111,7 +111,8 @@ class AddArchiveTask implements Runnable {
return; return;
} }
// extract contents of ZIP archive into destination folder // extract contents of ZIP archive into destination folder
progressMonitor.setProgressText(String.format("Extracting archive contents to: %s", destinationFolder.toString()));
List<String> extractedFiles = ArchiveUtil.unpackArchiveFile(archivePath, destinationFolder.toString()); List<String> extractedFiles = ArchiveUtil.unpackArchiveFile(archivePath, destinationFolder.toString());
// do processing // do processing

View File

@ -175,7 +175,7 @@ public class ArchiveExtractorDSProcessor implements DataSourceProcessor, AutoIng
public void cancel() { public void cancel() {
if (null != jobProcessingTaskFuture) { if (null != jobProcessingTaskFuture) {
jobProcessingTaskFuture.cancel(true); jobProcessingTaskFuture.cancel(true);
jobProcessingExecutor.shutdownNow(); jobProcessingExecutor.shutdown();
// ELTBD - do we want to wait for the cancellation to complete? I think not, // ELTBD - do we want to wait for the cancellation to complete? I think not,
// given that the cancelation is of "best effort" variety // given that the cancelation is of "best effort" variety
} }