Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorddunne2011-02-22 13:00:46 -0500
committerRyan D. Brooks2011-02-22 13:00:46 -0500
commit6087a905390eca5608bdc04940ab8da989be70ac (patch)
tree2d5fca65603c08f8996d4a6e6785705374d64e1f /plugins/org.eclipse.osee.coverage
parent2aad84c9bdba0dc91342c87e4bb99223eb880607 (diff)
downloadorg.eclipse.osee-6087a905390eca5608bdc04940ab8da989be70ac.tar.gz
org.eclipse.osee-6087a905390eca5608bdc04940ab8da989be70ac.tar.xz
org.eclipse.osee-6087a905390eca5608bdc04940ab8da989be70ac.zip
bug[ats_X0QYA]: Coverage "Work Product Task" search does not find matches
Diffstat (limited to 'plugins/org.eclipse.osee.coverage')
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/params/CoverageParameters.java21
1 files changed, 16 insertions, 5 deletions
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/params/CoverageParameters.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/params/CoverageParameters.java
index d45827531a..6a33158a1b 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/params/CoverageParameters.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/params/CoverageParameters.java
@@ -83,7 +83,13 @@ public class CoverageParameters {
}
} else if (coverage instanceof CoverageUnit) {
if (Strings.isValid(name) || Strings.isValid(namespace) || Strings.isValid(notes) || Strings.isValid(workProductTasks) || assignee != null) {
- if (!((CoverageUnit) coverage).isFolder() && isNameMatch(coverage) && isNamespaceMatch(coverage) && isNotesMatch(coverage) && isWorkProductTasksMatch(coverage) && isAssigneeMatch(coverage)) {
+ boolean folder = ((CoverageUnit) coverage).isFolder();
+ boolean nameMatch = isNameMatch(coverage);
+ boolean namespaceMatch = isNamespaceMatch(coverage);
+ boolean notesMatch = isNotesMatch(coverage);
+ boolean workProductTasksMatch = isWorkProductTasksMatch(coverage);
+ boolean assigneeMatch = isAssigneeMatch(coverage);
+ if (!folder && nameMatch && namespaceMatch && notesMatch && workProductTasksMatch && assigneeMatch) {
matchItems.add(coverage);
// If CoverageUnit matches, include all coverage items in match
for (CoverageItem coverageItem : ((CoverageUnit) coverage).getCoverageItems(true)) {
@@ -160,12 +166,17 @@ public class CoverageParameters {
if (!Strings.isValid(workProductTasks) || !(coverage instanceof IWorkProductRelatable)) {
return true;
}
- if (!Strings.isValid(((IWorkProductRelatable) coverage).getWorkProductTaskGuid())) {
- return false;
- }
- if (((IWorkProductRelatable) coverage).getWorkProductTask().getName().contains(workProductTasks)) {
+ boolean guidValid = Strings.isValid(((IWorkProductRelatable) coverage).getWorkProductTaskGuid());
+ if (guidValid && ((IWorkProductRelatable) coverage).getWorkProductTask().getName().contains(workProductTasks)) {
return true;
}
+ if (coverage instanceof CoverageUnit) {
+ for (CoverageItem childCoverageItem : ((CoverageUnit) coverage).getCoverageItems()) {
+ if (isWorkProductTasksMatch(childCoverageItem)) {
+ return true;
+ }
+ }
+ }
return false;
}

Back to the top