Merge branch 'develop' into bug/JAL-2225mapMultipleChains
authorJim Procter <jprocter@issues.jalview.org>
Wed, 8 Nov 2017 15:21:13 +0000 (15:21 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 8 Nov 2017 15:21:13 +0000 (15:21 +0000)
1  2 
src/jalview/gui/AlignViewport.java
src/jalview/gui/StructureChooser.java

Simple merge
@@@ -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
      {