From 172e5a8b90cea25b60f1ee14d249659e6a0aabec Mon Sep 17 00:00:00 2001
From: tcarver <tjc>
Date: Wed, 12 Sep 2012 12:39:46 +0100
Subject: [PATCH] use /pseudogene as well as /pseudo qualifier

---
 uk/ac/sanger/artemis/components/ViewMenu.java | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/uk/ac/sanger/artemis/components/ViewMenu.java b/uk/ac/sanger/artemis/components/ViewMenu.java
index fe2574f74..24e934b54 100644
--- a/uk/ac/sanger/artemis/components/ViewMenu.java
+++ b/uk/ac/sanger/artemis/components/ViewMenu.java
@@ -729,7 +729,10 @@ public class ViewMenu extends SelectionMenu
       cds_predicate = new FeatureKeyPredicate(new Key(DatabaseDocument.EXONMODEL));
     else
       cds_predicate =
-        new FeatureKeyQualifierPredicate (Key.CDS, "pseudo", false);
+          new FeaturePredicateConjunction(
+              new FeatureKeyQualifierPredicate(Key.CDS, "pseudo", false),
+              new FeatureKeyQualifierPredicate(Key.CDS, "pseudogene", false),
+              FeaturePredicateConjunction.AND);
 
     final FeaturePredicate feature_predicate = new FeaturePredicate ()
     {
@@ -790,7 +793,10 @@ public class ViewMenu extends SelectionMenu
       cds_predicate = new FeatureKeyPredicate(new Key(DatabaseDocument.EXONMODEL));
     else
       cds_predicate =
-        new FeatureKeyQualifierPredicate (Key.CDS, "pseudo", false);
+          new FeaturePredicateConjunction(
+              new FeatureKeyQualifierPredicate(Key.CDS, "pseudo", false),
+              new FeatureKeyQualifierPredicate(Key.CDS, "pseudogene", false),
+              FeaturePredicateConjunction.AND);
 
     final FeaturePredicate feature_predicate =  new FeaturePredicate () 
     {
@@ -851,7 +857,10 @@ public class ViewMenu extends SelectionMenu
       cds_predicate = new FeatureKeyPredicate(new Key(DatabaseDocument.EXONMODEL));
     else
       cds_predicate =
-        new FeatureKeyQualifierPredicate(Key.CDS, "pseudo", false);
+          new FeaturePredicateConjunction(
+              new FeatureKeyQualifierPredicate(Key.CDS, "pseudo", false),
+              new FeatureKeyQualifierPredicate(Key.CDS, "pseudogene", false),
+              FeaturePredicateConjunction.AND);
 
     final FeaturePredicate feature_predicate = new FeaturePredicate () 
     {
-- 
GitLab