From: Jim Procter <jprocter@dundee.ac.uk>
Date: Fri, 13 Jun 2014 10:14:07 +0000 (+0100)
Subject: Merge branch 'Release_2_8_2_Branch' into JAL-1483_featureBasedTreeCalc
X-Git-Tag: Jalview_2_9~123^2~23
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e1cd94839128776e14e51ded3f3be2dcc7e72273;p=jalview.git

Merge branch 'Release_2_8_2_Branch' into JAL-1483_featureBasedTreeCalc
---

e1cd94839128776e14e51ded3f3be2dcc7e72273
diff --cc src/jalview/gui/FeatureRenderer.java
index 5c7f32a,eb64dee..d36105a
--- a/src/jalview/gui/FeatureRenderer.java
+++ b/src/jalview/gui/FeatureRenderer.java
@@@ -170,13 -172,15 +172,16 @@@ public class FeatureRenderer extends ja
      this.transparency = fr.transparency;
      this.featureOrder = fr.featureOrder;
    }
+ 
    /**
     * update from another feature renderer
-    * @param fr settings to copy
+    * 
+    * @param fr
+    *          settings to copy
     */
 -  public void transferSettings(FeatureRenderer fr)
 +  public void transferSettings(jalview.api.FeatureRenderer _fr)
    {
 +    FeatureRenderer fr = (FeatureRenderer) _fr;
      FeatureRendererSettings frs = new FeatureRendererSettings(fr);
      this.renderOrder = frs.renderOrder;
      this.featureGroups = frs.featureGroups;