Changeset 3033

Timestamp:

01/15/12 20:47:02 (4 months ago)

Author:

kasper

Message:

Ticket #749: Prepared ResultWindow? to handle already processed (deserialized) results.

Location:

DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner

Files:

• util/AnalysisRunnerSwingWorker.java (modified) (2 diffs)
• util/IconUtils.java (modified) (6 diffs)
• windows/ResultListPanel.java (modified) (2 diffs)
• windows/ResultWindow.java (modified) (9 diffs)

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

@@ -148 +148 @@
 
         @Override
-        public void errorInTransformer(AnalysisJob job, final TransformerJob transformerJob, InputRow row, final Throwable throwable) {
+        public void errorInTransformer(AnalysisJob job, final TransformerJob transformerJob, InputRow row,
+                        final Throwable throwable) {
                 _progressInformationPanel.addUserLog("An error occurred in the transformer: " + LabelUtils.getLabel(transformerJob),
                                 throwable, true);
@@ -180 +181 @@
         public void explorerSuccess(AnalysisJob job, ExplorerJob explorerJob, AnalyzerResult result) {
                 _progressInformationPanel.addUserLog("Explorer '" + LabelUtils.getLabel(explorerJob) + "' finished");
+                _resultWindow.addResult(explorerJob, result);
         }
 

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

@@ -43 +43 @@
 import org.eobjects.analyzer.connection.XmlDatastore;
 import org.eobjects.analyzer.descriptors.BeanDescriptor;
+import org.eobjects.analyzer.descriptors.ComponentDescriptor;
 import org.eobjects.analyzer.descriptors.FilterBeanDescriptor;
 import org.eobjects.analyzer.descriptors.TransformerBeanDescriptor;
@@ -108 +109 @@
         }
 
-        public static Icon getDescriptorIcon(BeanDescriptor<?> descriptor, int newWidth) {
+        public static Icon getDescriptorIcon(ComponentDescriptor<?> descriptor, int newWidth) {
                 final ClassLoader classLoader = descriptor.getComponentClass().getClassLoader();
                 String imagePath = getDescriptorImagePath(descriptor, classLoader);
@@ -114 +115 @@
         }
 
-        public static Icon getDescriptorIcon(BeanDescriptor<?> descriptor) {
+        public static Icon getDescriptorIcon(ComponentDescriptor<?> descriptor) {
                 return getDescriptorIcon(descriptor, ICON_SIZE_MEDIUM);
         }
@@ -155 +156 @@
         }
 
-        protected static String getDescriptorImagePath(BeanDescriptor<?> descriptor, ClassLoader classLoader) {
+        protected static String getDescriptorImagePath(ComponentDescriptor<?> descriptor, ClassLoader classLoader) {
                 final Class<?> componentClass = descriptor.getComponentClass();
                 final String bundledIconPath = componentClass.getName().replaceAll("\\.", "/") + ".png";
@@ -168 +169 @@
                 }
 
-                Set<ComponentCategory> categories = descriptor.getComponentCategories();
-                if (categories.contains(new WriteDataCategory())) {
-                        return "images/component-types/type_output_writer.png";
+                final String displayName;
+
+                if (descriptor instanceof BeanDescriptor) {
+                        BeanDescriptor<?> beanDescriptor = (BeanDescriptor<?>) descriptor;
+                        Set<ComponentCategory> categories = beanDescriptor.getComponentCategories();
+                        displayName = beanDescriptor.getDisplayName().toLowerCase();
+                        if (categories.contains(new WriteDataCategory())) {
+                                return "images/component-types/type_output_writer.png";
+                        }
+                } else {
+                        displayName = "";
                 }
 
@@ -182 +191 @@
                 }
 
-                String displayName = descriptor.getDisplayName().toLowerCase();
                 if (displayName.indexOf("boolean") != -1) {
                         imagePath = "images/component-types/type_boolean.png";

DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/windows/ResultListPanel.java

@@ -29 +29 @@
 
 import org.eobjects.analyzer.beans.api.Renderer;
-import org.eobjects.analyzer.descriptors.AnalyzerBeanDescriptor;
-import org.eobjects.analyzer.job.AnalyzerJob;
+import org.eobjects.analyzer.descriptors.ComponentDescriptor;
+import org.eobjects.analyzer.job.ComponentJob;
 import org.eobjects.analyzer.result.AnalyzerResult;
 import org.eobjects.analyzer.result.renderer.RendererFactory;
@@ -70 +70 @@
         }
 
-        public void addResult(final AnalyzerJob analyzerJob, final AnalyzerResult result) {
-                final AnalyzerBeanDescriptor<?> descriptor = analyzerJob.getDescriptor();
+        public void addResult(final ComponentJob componentJob, final AnalyzerResult result) {
+                final ComponentDescriptor<?> descriptor = componentJob.getDescriptor();
                 final Icon icon = IconUtils.getDescriptorIcon(descriptor, IconUtils.ICON_SIZE_LARGE);
 
-                final String resultLabel = LabelUtils.getLabel(analyzerJob);
+                final String resultLabel = LabelUtils.getLabel(componentJob);
 
                 final JXTaskPane taskPane = WidgetFactory.createTaskPane(resultLabel, icon);

DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/windows/ResultWindow.java

@@ -28 +28 @@
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
+import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import javax.swing.JComponent;
@@ -37 +39 @@
 import org.eobjects.analyzer.configuration.AnalyzerBeansConfiguration;
 import org.eobjects.analyzer.connection.Datastore;
+import org.eobjects.analyzer.descriptors.ComponentDescriptor;
 import org.eobjects.analyzer.job.AnalysisJob;
-import org.eobjects.analyzer.job.AnalyzerJob;
+import org.eobjects.analyzer.job.ComponentJob;
+import org.eobjects.analyzer.result.AnalysisResult;
 import org.eobjects.analyzer.result.AnalyzerResult;
 import org.eobjects.analyzer.result.renderer.RendererFactory;
@@ -49 +53 @@
 import org.eobjects.datacleaner.panels.ProgressInformationPanel;
 import org.eobjects.datacleaner.util.AnalysisRunnerSwingWorker;
+import org.eobjects.datacleaner.util.IconUtils;
 import org.eobjects.datacleaner.util.ImageManager;
 import org.eobjects.datacleaner.util.WidgetUtils;
 import org.eobjects.datacleaner.widgets.result.DCRendererInitializer;
 import org.eobjects.datacleaner.widgets.tabs.CloseableTabbedPane;
-
 import org.eobjects.metamodel.schema.Table;
 
@@ -63 +67 @@
 
         private final CloseableTabbedPane _tabbedPane = new CloseableTabbedPane();
-        private final Map<Table, ResultListPanel> _resultPanels = new HashMap<Table, ResultListPanel>();
+        private final Map<Object, ResultListPanel> _resultPanels = new HashMap<Object, ResultListPanel>();
         private final AnalysisJob _job;
         private final AnalyzerBeansConfiguration _configuration;
@@ -71 +75 @@
         private final AnalysisRunnerSwingWorker _worker;
 
+        /**
+         * 
+         * @param configuration
+         * @param job
+         *            either this or result must be available
+         * @param result
+         *            either this or job must be available
+         * @param jobFilename
+         * @param windowContext
+         * @param rendererInitializerProvider
+         */
         @Inject
-        protected ResultWindow(AnalyzerBeansConfiguration configuration, AnalysisJob job,
-                        @Nullable @JobFilename String jobFilename, WindowContext windowContext,
+        protected ResultWindow(AnalyzerBeansConfiguration configuration, @Nullable AnalysisJob job,
+                        @Nullable AnalysisResult result, @Nullable @JobFilename String jobFilename, WindowContext windowContext,
                         Provider<DCRendererInitializer> rendererInitializerProvider) {
                 super(windowContext);
@@ -81 +96 @@
                 _rendererFactory = new RendererFactory(configuration.getDescriptorProvider(), rendererInitializerProvider.get());
 
-                _progressInformationPanel = new ProgressInformationPanel();
-                _tabbedPane.addTab("Progress information", imageManager.getImageIcon("images/model/progress_information.png"),
-                                _progressInformationPanel);
-                _tabbedPane.setUnclosableTab(0);
-
-                _worker = new AnalysisRunnerSwingWorker(_configuration, _job, this, _progressInformationPanel);
-
-                _progressInformationPanel.addStopActionListener(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent e) {
-                                _worker.cancelIfRunning();
-                        }
-                });
+                if (result == null) {
+                        // set up a progress information panel, and run the job in a swing
+                        // worker
+                        _progressInformationPanel = new ProgressInformationPanel();
+                        _tabbedPane.addTab("Progress information", imageManager.getImageIcon("images/model/progress_information.png"),
+                                        _progressInformationPanel);
+                        _tabbedPane.setUnclosableTab(0);
+
+                        _worker = new AnalysisRunnerSwingWorker(_configuration, _job, this, _progressInformationPanel);
+
+                        _progressInformationPanel.addStopActionListener(new ActionListener() {
+                                @Override
+                                public void actionPerformed(ActionEvent e) {
+                                        _worker.cancelIfRunning();
+                                }
+                        });
+                } else {
+                        // don't add the progress information, simply render the job asap
+                        _progressInformationPanel = null;
+                        _worker = null;
+
+                        Map<ComponentJob, AnalyzerResult> map = result.getResultMap();
+                        for (Entry<ComponentJob, AnalyzerResult> entry : map.entrySet()) {
+                                ComponentJob componentJob = entry.getKey();
+                                AnalyzerResult analyzerResult = entry.getValue();
+                                
+                                addResult(componentJob, analyzerResult);
+                        }
+                }
         }
 
@@ -101 +132 @@
 
         private void addTableResultPanel(final Table table) {
-                final String tableName = table.getName();
+                final String name = table.getName();
                 final ResultListPanel panel = new ResultListPanel(_rendererFactory, _progressInformationPanel);
-                final ImageIcon tableIcon = imageManager.getImageIcon("images/model/table.png");
+                final ImageIcon icon = imageManager.getImageIcon("images/model/table.png");
                 _resultPanels.put(table, panel);
                 SwingUtilities.invokeLater(new Runnable() {
                         @Override
                         public void run() {
-                                _tabbedPane.addTab(tableName, tableIcon, panel);
+                                _tabbedPane.addTab(name, icon, panel);
                                 if (_tabbedPane.getTabCount() == 2) {
                                         // switch to the first available result panel
@@ -115 +146 @@
                         }
                 });
+        }
+
+        private void addDescriptorResultPanel(ComponentDescriptor<?> descriptor) {
+                final ResultListPanel panel = new ResultListPanel(_rendererFactory, _progressInformationPanel);
+                final String name = descriptor.getDisplayName();
+                final Icon icon = IconUtils.getDescriptorIcon(descriptor);
+                _resultPanels.put(descriptor, panel);
+                SwingUtilities.invokeLater(new Runnable() {
+                        @Override
+                        public void run() {
+                                _tabbedPane.addTab(name, icon, panel);
+                                if (_tabbedPane.getTabCount() == 2) {
+                                        // switch to the first available result panel
+                                        _tabbedPane.setSelectedIndex(1);
+                                }
+                        }
+                });
+        }
+
+        private ResultListPanel getDescriptorResultPanel(ComponentDescriptor<?> descriptor) {
+                synchronized (_resultPanels) {
+                        if (!_resultPanels.containsKey(descriptor)) {
+                                addDescriptorResultPanel(descriptor);
+                        }
+                        return _resultPanels.get(descriptor);
+                }
         }
 
@@ -126 +183 @@
         }
 
-        public void addResult(Table table, AnalyzerJob analyzerJob, AnalyzerResult result) {
+        public void addResult(ComponentJob componentJob, AnalyzerResult result) {
+                ComponentDescriptor<?> descriptor = componentJob.getDescriptor();
+                ResultListPanel resultListPanel = getDescriptorResultPanel(descriptor);
+                resultListPanel.addResult(componentJob, result);
+        }
+
+        public void addResult(Table table, ComponentJob componentJob, AnalyzerResult result) {
                 ResultListPanel resultListPanel = getTableResultPanel(table);
-                resultListPanel.addResult(analyzerJob, result);
+                resultListPanel.addResult(componentJob, result);
         }