X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FStructureChooser.java;h=11979217b8dad5797ee64370a11d96ec750839d9;hb=a49a5c83b2616e58475c57a37b9a5127d1551a64;hp=3a54cc1916265598a30f2daa966783c4c8b9074c;hpb=2b0142bf85bf5b3d20612c01433e7ce29b633ec4;p=jalview.git

diff --git a/src/jalview/gui/StructureChooser.java b/src/jalview/gui/StructureChooser.java
index 3a54cc1..1197921 100644
--- a/src/jalview/gui/StructureChooser.java
+++ b/src/jalview/gui/StructureChooser.java
@@ -40,7 +40,6 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Vector;
 
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
@@ -205,7 +204,7 @@ public class StructureChooser extends GStructureChooser
 
     if (seq.getPDBId() != null)
     {
-      for (PDBEntry entry : (Vector<PDBEntry>) seq.getPDBId())
+      for (PDBEntry entry : seq.getPDBId())
       {
         queryBuilder.append("text:").append(entry.getId()).append(" OR ");
       }
@@ -513,14 +512,29 @@ public class StructureChooser extends GStructureChooser
         pdbEntry.setType("PDB");
         pdbEntriesToView[count++] = pdbEntry;
       }
-      new StructureViewer(ap.getStructureSelectionManager())
-              .viewStructures(ap, pdbEntriesToView,
-                      ap.av.collateForPDB(pdbEntriesToView));
+
+      StructureViewer sViewer = new StructureViewer(
+              ap.getStructureSelectionManager());
+      if (pdbEntriesToView.length > 1)
+      {
+        sViewer.viewStructures(ap, pdbEntriesToView,
+                ap.av.collateForPDB(pdbEntriesToView));
+      }
+      else
+      {
+        sViewer.viewStructures(pdbEntriesToView[0], selectedSequences,
+                null, ap);
+      }
+
     }
     else if (currentView == VIEWS_ENTER_ID)
     {
-      selectedSequence = ((AssociateSeqOptions) idInputAssSeqPanel
+      SequenceI userSelectedSeq = ((AssociateSeqOptions) idInputAssSeqPanel
               .getCmb_assSeq().getSelectedItem()).getSequence();
+      if (userSelectedSeq != null)
+      {
+        selectedSequence = userSelectedSeq;
+      }
       PDBEntry pdbEntry = new PDBEntry();
       pdbEntry.setId(txt_search.getText());
       pdbEntry.setType("PDB");
@@ -533,8 +547,14 @@ public class StructureChooser extends GStructureChooser
     }
     else if (currentView == VIEWS_FROM_FILE)
     {
-      selectedSequence = ((AssociateSeqOptions) fileChooserAssSeqPanel
+      SequenceI userSelectedSeq = ((AssociateSeqOptions) fileChooserAssSeqPanel
               .getCmb_assSeq().getSelectedItem()).getSequence();
+      if (userSelectedSeq != null)
+      {
+        selectedSequence = userSelectedSeq;
+      }
+      System.out.println(">>>>>>>>>>>>> Selected file >>>>>>>>>>>>>>> "
+              + selectedPdbFileName);
       new AssociatePdbFileWithSeq().associatePdbWithSeq(
               selectedPdbFileName, jalview.io.AppletFormatAdapter.FILE,
               selectedSequence, true, Desktop.instance);