From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 1 Jun 2017 14:36:41 +0000 (+0100)
Subject: Merge branch 'develop' into features/JAL-2446NCList
X-Git-Tag: Release_2_10_3b1~217^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e4f893546d61b043b3381c9548f0cfbf7084fd78;p=jalview.git

Merge branch 'develop' into features/JAL-2446NCList

Conflicts:
	test/jalview/ext/jmol/JmolParserTest.java
---

e4f893546d61b043b3381c9548f0cfbf7084fd78
diff --cc test/jalview/ext/jmol/JmolParserTest.java
index 4514c60,36e9b20..f5e637c
--- a/test/jalview/ext/jmol/JmolParserTest.java
+++ b/test/jalview/ext/jmol/JmolParserTest.java
@@@ -277,10 -277,10 +277,9 @@@ public class JmolParserTes
      /*
       * the ID is also the group for features derived from structure data 
       */
 -    assertNotNull(structureData.getSeqs().get(0).getSequenceFeatures()[0].featureGroup);
 -    assertEquals(
 -            structureData.getSeqs().get(0).getSequenceFeatures()[0].featureGroup,
 -            "localstruct");
 -
 +    String featureGroup = structureData.getSeqs().get(0)
 +            .getSequenceFeatures().get(0).featureGroup;
 +    assertNotNull(featureGroup);
-     assertEquals(featureGroup, "localstruct.pdb");
- 
++    assertEquals(featureGroup, "localstruct");
    }
  }