Changeset 3051

Timestamp:

01/17/12 21:43:08 (4 months ago)

Author:

kasper

Message:

Ticket #442: Improved selection of filter requirements to disable cyclic dependencies

Files:

• AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/job/builder/AbstractBeanWithInputColumnsBuilder.java (modified) (1 diff)
• DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/widgets/ChangeRequirementButton.java (modified) (2 diffs)

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/job/builder/AbstractBeanWithInputColumnsBuilder.java

@@ -191 +191 @@
         }
 
+        public boolean validateRequirementSource(OutcomeSourceJob outcomeSourceJob) {
+                if (outcomeSourceJob == null) {
+                        return true;
+                }
+
+                Outcome[] outcomes = outcomeSourceJob.getOutcomes();
+                if (outcomes == null || outcomes.length == 0) {
+                        return true;
+                }
+                
+                return validateRequirementCandidate(outcomes[0]);
+        }
+
         public boolean validateRequirementCandidate(Outcome requirement) {
                 if (requirement == null) {

DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/widgets/ChangeRequirementButton.java

@@ -105 +105 @@
                                 filterMenuItem.setEnabled(false);
                                 filterMenuItem.setToolTipText("Filter is not correctly configured");
+                        } else if (!_jobBuilder.validateRequirementSource(fjb)) {
+                                filterMenuItem.setEnabled(false);
+                                filterMenuItem.setToolTipText("Requirement not possible");
                         } else {
                                 FilterBeanDescriptor<?, ?> fjbDescriptor = fjb.getDescriptor();
@@ -110 +113 @@
                                 for (final String category : categoryNames) {
                                         JMenuItem categoryMenuItem = new JMenuItem(category);
-
+                                        
                                         if (currentRequirement != null && currentRequirement instanceof FilterOutcome) {
                                                 FilterOutcome filterOutcome = (FilterOutcome) currentRequirement;