fix #6799: add totalCount of ticks as totalwork and start the progress monitor when...

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 f9aa5a18b17b9ac08d25ea3808a8fa9ebc572b5f..73235b58ed0e8add51eac53fe004bd0b80cd4640 100644 (file)
--- 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
@@ -216,6 +216,7 @@ public class CdmApplicationAwareDefaultExport<T extends IExportConfigurator>
 \r
                List<Integer> stepCounts = countSteps(state, ioList);\r
                Integer totalCount = stepCounts.get(stepCounts.size()-1);\r
+               config.getProgressMonitor().beginTask("Start Export", totalCount);\r
                config.getProgressMonitor().worked(1);\r
                IProgressMonitor parentMonitor = SubProgressMonitor\r
                        .NewStarted(config.getProgressMonitor(), 99, "Process data", totalCount);\r
@@ -228,7 +229,7 @@ public class CdmApplicationAwareDefaultExport<T extends IExportConfigurator>
                            String ioName = export.getClass().getSimpleName();\r
                            SubProgressMonitor ioMonitor = SubProgressMonitor\r
                                    .NewStarted(parentMonitor, counts, ioName, counts );\r
-                           state.getConfig().setProgressMonitor(ioMonitor);\r
+//                         state.getConfig().setProgressMonitor(ioMonitor);\r
                            state.setCurrentIO(export);\r
                                export.invoke(state);\r
                                ioMonitor.done();\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/TaxonNodeOutStreamPartitioner.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/TaxonNodeOutStreamPartitioner.java
index fdaecd9717efa75c6a8418328bd6984f97f2ab40..144f91d0fb503977409ae8897f1434f010bd80c8 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/TaxonNodeOutStreamPartitioner.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/TaxonNodeOutStreamPartitioner.java
@@ -96,7 +96,6 @@ public class TaxonNodeOutStreamPartitioner<STATE extends XmlExportState> {
                this.partitionSize = partitionSize;
                this.state = state;
                this.parentMonitor = parentMonitor;
-               this.parentMonitor.beginTask("Start", totalCount);
                this.parentTicks = parentTicks;
 
 

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 91476b0ebd8fb7c626d6d584d5bff185c48b482c..567794764611991818924fe80a852db60d3e2368 100644 (file)
--- 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,7 +101,7 @@ public class IOServiceImpl implements IIOService {
             public Serializable doRun(IRemotingProgressMonitor monitor) {
 
                 configurator.setProgressMonitor(monitor);
-                monitor.beginTask("Start Export", 100);
+//                monitor.beginTask("Start Export", 3);
                 ExportResult result = export(configurator);
 //                for(byte[] report : result.getReports()) {
 //                    monitor.addReport(new String(report));