Changeset 3040 for DataCleaner

Timestamp:

01/16/12 14:54:39 (4 months ago)

Author:

kasper

Message:

Ticket #747: Added solution, large refactoring AnalysisListener?

File:

• DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/util/AnalysisRunnerSwingWorker.java (modified) (6 diffs)

DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/util/AnalysisRunnerSwingWorker.java

@@ -34 +34 @@
 import org.eobjects.analyzer.job.FilterJob;
 import org.eobjects.analyzer.job.TransformerJob;
+import org.eobjects.analyzer.job.runner.AnalysisJobMetrics;
 import org.eobjects.analyzer.job.runner.AnalysisListener;
 import org.eobjects.analyzer.job.runner.AnalysisResultFuture;
 import org.eobjects.analyzer.job.runner.AnalysisRunner;
 import org.eobjects.analyzer.job.runner.AnalysisRunnerImpl;
+import org.eobjects.analyzer.job.runner.AnalyzerMetrics;
+import org.eobjects.analyzer.job.runner.ExplorerMetrics;
+import org.eobjects.analyzer.job.runner.RowProcessingMetrics;
 import org.eobjects.analyzer.result.AnalyzerResult;
 import org.eobjects.analyzer.util.SourceColumnFinder;
@@ -78 +82 @@
 
         @Override
-        public void jobBegin(AnalysisJob job) {
+        public void jobBegin(AnalysisJob job, AnalysisJobMetrics metrics) {
                 String now = new DateTime().toString(DateTimeFormat.fullTime());
                 _progressInformationPanel.addUserLog("Job begin (" + now + ")");
@@ -84 +88 @@
 
         @Override
-        public void jobSuccess(AnalysisJob job) {
+        public void jobSuccess(AnalysisJob job, AnalysisJobMetrics metrics) {
                 String now = new DateTime().toString(DateTimeFormat.fullTime());
                 _progressInformationPanel.addUserLog("Job success (" + now + ")");
@@ -91 +95 @@
 
         @Override
-        public void rowProcessingBegin(final AnalysisJob job, final Table table, final int expectedRows) {
+        public void rowProcessingBegin(final AnalysisJob job, final RowProcessingMetrics metrics) {
+                final int expectedRows = metrics.getExpectedRows();
+                final Table table = metrics.getTable();
                 if (expectedRows == -1) {
                         _progressInformationPanel.addUserLog("Starting row processing for " + table.getQualifiedLabel());
@@ -102 +108 @@
 
         @Override
-        public void rowProcessingProgress(AnalysisJob job, final Table table, final int currentRow) {
-                _progressInformationPanel.updateProgress(table, currentRow);
+        public void rowProcessingProgress(AnalysisJob job, final RowProcessingMetrics metrics, final int currentRow) {
+                _progressInformationPanel.updateProgress(metrics.getTable(), currentRow);
         }
 
         @Override
-        public void rowProcessingSuccess(AnalysisJob job, final Table table) {
+        public void rowProcessingSuccess(AnalysisJob job, final RowProcessingMetrics metrics) {
                 String now = new DateTime().toString(DateTimeFormat.fullTime());
-                _progressInformationPanel.addUserLog("Row processing for " + table.getQualifiedLabel() + " finished (" + now
-                                + "). Generating results ...");
+                _progressInformationPanel.addUserLog("Row processing for " + metrics.getTable().getQualifiedLabel() + " finished ("
+                                + now + "). Generating results ...");
         }
 
         @Override
-        public void analyzerBegin(AnalysisJob job, final AnalyzerJob analyzerJob) {
+        public void analyzerBegin(AnalysisJob job, final AnalyzerJob analyzerJob, AnalyzerMetrics metrics) {
                 _progressInformationPanel.addUserLog("Starting analyzer '" + LabelUtils.getLabel(analyzerJob) + "'");
         }
@@ -174 +180 @@
 
         @Override
-        public void explorerBegin(AnalysisJob job, ExplorerJob explorerJob) {
+        public void explorerBegin(AnalysisJob job, ExplorerJob explorerJob, ExplorerMetrics metrics) {
                 _progressInformationPanel.addUserLog("Starting explorer '" + LabelUtils.getLabel(explorerJob) + "'");
         }