From: Jim Procter <jprocter@issues.jalview.org>
Date: Wed, 8 Nov 2017 15:21:13 +0000 (+0000)
Subject: Merge branch 'develop' into bug/JAL-2225mapMultipleChains
X-Git-Tag: Release_2_10_3b1~47^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=0efc6021e63ff62bb2e275501586c1900561b303;p=jalview.git

Merge branch 'develop' into bug/JAL-2225mapMultipleChains
---

0efc6021e63ff62bb2e275501586c1900561b303
diff --cc src/jalview/gui/StructureChooser.java
index cf8c190,20f4a49..37632ef
--- a/src/jalview/gui/StructureChooser.java
+++ b/src/jalview/gui/StructureChooser.java
@@@ -923,10 -927,16 +927,10 @@@ public class StructureChooser extends G
      }
      if (pdbEntriesToView.length > 1)
      {
-       ssm.setProgressBar(null);
-       ssm.setProgressBar(MessageManager.getString(
-               "status.fetching_3d_structures_for_selected_entries"));
 -      ArrayList<SequenceI[]> seqsMap = new ArrayList<>();
 -      for (SequenceI seq : sequences)
 -      {
 -        seqsMap.add(new SequenceI[] { seq });
 -      }
 -      SequenceI[][] collatedSeqs = seqsMap.toArray(new SequenceI[0][0]);
 -
 -      setProgressBar(MessageManager
 -		     .getString("status.fetching_3d_structures_for_selected_entries"), progressId);
 -      sViewer.viewStructures(pdbEntriesToView, collatedSeqs, alignPanel);
++      setProgressBar(MessageManager.getString(
++              "status.fetching_3d_structures_for_selected_entries"),
++              progressId);
 +      sViewer.viewStructures(pdbEntriesToView, sequences, alignPanel);
      }
      else
      {