JAL-1667 make transferSettings an API method

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

diff --git a/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java b/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
index bedbaf5..28eda82 100644 (file)
--- a/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
+++ b/src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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.AlignViewportI;
@@ -43,6 +63,7 @@ public abstract class FeatureRendererModel implements
 
   protected AlignmentViewport av;
 
+  @Override
   public AlignViewportI getViewport()
   {
     return av;
@@ -62,12 +83,7 @@ public abstract class FeatureRendererModel implements
     this.featureOrder = fr.featureOrder;
   }
 
-  /**
-   * update from another feature renderer
-   * 
-   * @param fr
-   *          settings to copy
-   */
+  @Override
   public void transferSettings(jalview.api.FeatureRenderer _fr)
   {
     FeatureRenderer fr = (FeatureRenderer) _fr;
@@ -517,6 +533,7 @@ public abstract class FeatureRendererModel implements
    * @param featureType
    * @return java.awt.Color or GraduatedColor
    */
+  @Override
   public Object getFeatureStyle(String featureType)
   {
     Object fc = featureColours.get(featureType);
@@ -597,6 +614,7 @@ public abstract class FeatureRendererModel implements
     return av.getFeaturesDisplayed().isVisible(type);
   }
 
+  @Override
   public void setColour(String featureType, Object col)
   {
     // overwrite
@@ -663,7 +681,7 @@ public abstract class FeatureRendererModel implements
   @Override
   public Map<String, Object> getFeatureColours()
   {
-    return new ConcurrentHashMap<String, Object>(featureColours);
+    return featureColours;
   }
 
   /**