From b293e4fedbfac29547a9af2b46028ac85a7376c1 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Mon, 10 Apr 2017 15:40:59 +0100 Subject: [PATCH] JAL-2446 SequenceFeatures.hasFeatures() added --- src/jalview/datamodel/features/SequenceFeatures.java | 17 +++++++++++++++++ .../datamodel/features/SequenceFeaturesTest.java | 13 +++++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/jalview/datamodel/features/SequenceFeatures.java b/src/jalview/datamodel/features/SequenceFeatures.java index 64aa63e..227d8fd 100644 --- a/src/jalview/datamodel/features/SequenceFeatures.java +++ b/src/jalview/datamodel/features/SequenceFeatures.java @@ -190,4 +190,21 @@ public class SequenceFeatures } return false; } + + /** + * Answers true if this store contains at least one feature, else false + * + * @return + */ + public boolean hasFeatures() + { + for (FeatureStore featureSet : featureStore.values()) + { + if (!featureSet.isEmpty()) + { + return true; + } + } + return false; + } } diff --git a/test/jalview/datamodel/features/SequenceFeaturesTest.java b/test/jalview/datamodel/features/SequenceFeaturesTest.java index d340490..1ee21f3 100644 --- a/test/jalview/datamodel/features/SequenceFeaturesTest.java +++ b/test/jalview/datamodel/features/SequenceFeaturesTest.java @@ -297,4 +297,17 @@ public class SequenceFeaturesTest assertTrue(sf.delete(sf1)); assertTrue(sf.getFeatures().isEmpty()); } + + @Test(groups = "Functional") + public void testHasFeatures() + { + SequenceFeatures sf = new SequenceFeatures(); + assertFalse(sf.hasFeatures()); + + SequenceFeature sf1 = addFeature(sf, "Pfam", 10, 50); + assertTrue(sf.hasFeatures()); + + sf.delete(sf1); + assertFalse(sf.hasFeatures()); + } } -- 1.7.10.2