From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 14 Nov 2016 12:30:17 +0000 (+0000)
Subject: JAL-2295 don't copy 'Chimera' features back to Chimera
X-Git-Tag: Release_2_11_0~62^2~49
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c4fe688726e88a223c483736e10009b8ac7c6545;p=jalview.git

JAL-2295 don't copy 'Chimera' features back to Chimera
---

diff --git a/src/jalview/ext/rbvi/chimera/ChimeraCommands.java b/src/jalview/ext/rbvi/chimera/ChimeraCommands.java
index 7020f90..533b441 100644
--- a/src/jalview/ext/rbvi/chimera/ChimeraCommands.java
+++ b/src/jalview/ext/rbvi/chimera/ChimeraCommands.java
@@ -400,7 +400,15 @@ public class ChimeraCommands
     for (SequenceFeature sf : sfs)
     {
       String type = sf.getType();
-      if (!visibleFeatures.contains(type) || suppressFeature(type))
+
+      /*
+       * Only copy visible features, don't copy any which originated
+       * from Chimera, and suppress uninteresting ones (e.g. RESNUM)
+       */
+      boolean isFromViewer = JalviewChimeraBinding.CHIMERA_FEATURE_GROUP
+              .equals(sf.getFeatureGroup());
+      if (isFromViewer || !visibleFeatures.contains(type)
+              || suppressFeature(type))
       {
         continue;
       }