From 7de8dccc5e2db1ef95d534253fc4fc9a44035991 Mon Sep 17 00:00:00 2001
From: Katja Luther <k.luther@bgbm.org>
Date: Fri, 1 Sep 2017 08:34:06 +0200
Subject: [PATCH] ref #6799: use the progress monitor of the configurator

---
 .../cdm/io/common/CdmApplicationAwareDefaultExport.java      | 2 +-
 .../src/main/java/eu/etaxonomy/cdm/io/common/CdmIoBase.java  | 2 +-
 .../java/eu/etaxonomy/cdm/io/dwca/out/DwcaTaxExport.java     | 5 ++++-
 .../java/eu/etaxonomy/cdm/io/dwca/out/DwcaTaxonExport.java   | 1 +
 .../main/java/eu/etaxonomy/cdm/io/service/IOServiceImpl.java | 1 +
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultExport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultExport.java
index cb888b26b9..f9aa5a18b1 100644
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultExport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultExport.java
@@ -228,7 +228,7 @@ public class CdmApplicationAwareDefaultExport<T extends IExportConfigurator>
 			    String ioName = export.getClass().getSimpleName();
 			    SubProgressMonitor ioMonitor = SubProgressMonitor
 			            .NewStarted(parentMonitor, counts, ioName, counts );
-			    state.setCurrentMonitor(ioMonitor);
+			    state.getConfig().setProgressMonitor(ioMonitor);
 			    state.setCurrentIO(export);
 				export.invoke(state);
 				ioMonitor.done();
diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmIoBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmIoBase.java
index 96d2c0b16b..6306c271a0 100644
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmIoBase.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmIoBase.java
@@ -243,7 +243,7 @@ public abstract class CdmIoBase<STATE extends IoStateBase, RESULT extends IoResu
 
     @Override
     public void updateProgress(STATE state, String message, int worked) {
-        if (state.getCurrentMonitor() == null){
+        if (state.getConfig().getProgressMonitor() == null){
             IProgressMonitor progressMonitor = state.getConfig().getProgressMonitor();
             if(progressMonitor != null){
                 progressMonitor.worked(worked);
diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaTaxExport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaTaxExport.java
index cabf510223..fe8ee79844 100644
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaTaxExport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaTaxExport.java
@@ -66,7 +66,7 @@ public class DwcaTaxExport extends DwcaExportBase {
 	@Override
 	protected void doInvoke(DwcaTaxExportState state){
 
-	    IProgressMonitor monitor = state.getCurrentMonitor();
+	    IProgressMonitor monitor = state.getConfig().getProgressMonitor();
 
 		List<DwcaDataExportBase> exports =  Arrays.asList(new DwcaDataExportBase[]{
 	        new DwcaTaxonExport(state),
@@ -79,13 +79,16 @@ public class DwcaTaxExport extends DwcaExportBase {
 	        new DwcaImageExport(state)
 		});
 
+
 		@SuppressWarnings("unchecked")
 	    TaxonNodeOutStreamPartitioner<XmlExportState> partitioner
 	      = TaxonNodeOutStreamPartitioner.NewInstance(
                 this, state, state.getConfig().getTaxonNodeFilter(),
                 100, monitor, null);
 		try {
+
 		    monitor.subTask("Start partitioning");
+
 		    TaxonNode node = partitioner.next();
 			while (node != null){
 			    for (DwcaDataExportBase export : exports){
diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaTaxonExport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaTaxonExport.java
index 262e329680..20bf0f474d 100644
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaTaxonExport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/DwcaTaxonExport.java
@@ -100,6 +100,7 @@ public class DwcaTaxonExport extends DwcaDataExportBase {
             state.getResult().addException(e, message);
         }finally{
             flushWriter(state, file);
+
         }
     }
 
diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/service/IOServiceImpl.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/service/IOServiceImpl.java
index 8ea58a8a9d..91476b0ebd 100644
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/service/IOServiceImpl.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/service/IOServiceImpl.java
@@ -101,6 +101,7 @@ public class IOServiceImpl implements IIOService {
             public Serializable doRun(IRemotingProgressMonitor monitor) {
 
                 configurator.setProgressMonitor(monitor);
+                monitor.beginTask("Start Export", 100);
                 ExportResult result = export(configurator);
 //                for(byte[] report : result.getReports()) {
 //                    monitor.addReport(new String(report));
-- 
2.34.1