Merge branch 'releases/Release_2_10_0_Branch'

[jalview.git] / src / jalview / viewmodel / seqfeatures / FeaturesDisplayed.java

diff --git a/src/jalview/viewmodel/seqfeatures/FeaturesDisplayed.java b/src/jalview/viewmodel/seqfeatures/FeaturesDisplayed.java
index fccdee3..5203ef7 100644 (file)
--- a/src/jalview/viewmodel/seqfeatures/FeaturesDisplayed.java
+++ b/src/jalview/viewmodel/seqfeatures/FeaturesDisplayed.java
@@ -1,13 +1,30 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.viewmodel.seqfeatures;
 
 import jalview.api.FeaturesDisplayedI;
 
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
 
 public class FeaturesDisplayed implements FeaturesDisplayedI
 {
@@ -45,7 +62,7 @@ public class FeaturesDisplayed implements FeaturesDisplayedI
   }
 
   @Override
-  public boolean areVisible(Collection featureTypes)
+  public boolean areVisible(Collection<String> featureTypes)
   {
     return featuresDisplayed.containsAll(featureTypes);
   }
@@ -58,9 +75,10 @@ public class FeaturesDisplayed implements FeaturesDisplayedI
   }
 
   @Override
-  public void setAllVisible(Collection makeVisible)
+  public void setAllVisible(Collection<String> makeVisible)
   {
     featuresDisplayed.addAll(makeVisible);
+    featuresRegistered.addAll(makeVisible);
   }
 
   @Override
@@ -73,6 +91,7 @@ public class FeaturesDisplayed implements FeaturesDisplayedI
   public void setVisible(String featureType)
   {
     featuresDisplayed.add(featureType);
+    featuresRegistered.add(featureType);
   }
 
   @Override
@@ -88,7 +107,7 @@ public class FeaturesDisplayed implements FeaturesDisplayedI
   }
 
   @Override
-  public int getRegisterdFeaturesCount()
+  public int getRegisteredFeaturesCount()
   {
     return featuresRegistered.size();
   }