From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 19 Sep 2016 10:45:09 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~39^2~30^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=740098c5145249456457f69efa3df8b4c081fd36;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
---

740098c5145249456457f69efa3df8b4c081fd36
diff --cc test/jalview/ws/PDBSequenceFetcherTest.java
index 4cdb621,c1d1144..1401f6a
--- a/test/jalview/ws/PDBSequenceFetcherTest.java
+++ b/test/jalview/ws/PDBSequenceFetcherTest.java
@@@ -83,7 -85,11 +84,9 @@@ public class PDBSequenceFetcherTes
    @Test(groups = { "Network" }, enabled = true)
    public void testPdbSeqRetrieve() throws Exception
    {
 -    Cache.applicationProperties.setProperty("STRUCT_FROM_PDB",
 -            Boolean.TRUE.toString());
      StructureImportSettings.setDefaultStructureFileFormat("PDB");
+     StructureImportSettings
+             .setDefaultPDBFileParser(StructureParser.JALVIEW_PARSER);
  
      testRetrieveProteinSeqFromPDB();
    }