featuresAdded call for transferred PDB features
authorjprocter <Jim Procter>
Mon, 2 Apr 2007 13:09:32 +0000 (13:09 +0000)
committerjprocter <Jim Procter>
Mon, 2 Apr 2007 13:09:32 +0000 (13:09 +0000)
src/jalview/gui/AppJMol.java

index 3d24bc8..14acb14 100644 (file)
@@ -124,8 +124,10 @@ public synchronized void addSequence(SequenceI [] seq)
       {
         StructureSelectionManager.getStructureSelectionManager()
             .setMapping(seq, alreadyMapped, AppletFormatAdapter.FILE);
-        ap.seqPanel.seqCanvas.fr.featuresAdded();
-        ap.paintAlignment(true);
+        if (ap.seqPanel.seqCanvas.fr!=null) {
+          ap.seqPanel.seqCanvas.fr.featuresAdded();
+          ap.paintAlignment(true);
+        }
         return;
       }
     }
@@ -587,7 +589,7 @@ public synchronized void addSequence(SequenceI [] seq)
 //End StructureListener
 ////////////////////////////
 
-  FeatureRenderer fr;
+  FeatureRenderer fr=null;
   public void colourBySequence(AlignmentPanel ap)
   {
     if(!colourBySequence)
@@ -729,7 +731,6 @@ public synchronized void addSequence(SequenceI [] seq)
       ssm = StructureSelectionManager.getStructureSelectionManager();
       MCview.PDBfile pdbFile = ssm.setMapping(sequence, pdbentry.getFile(), AppletFormatAdapter.FILE);
       ssm.addStructureViewerListener(this);
-
       Vector chains = new Vector();
       for(int i=0; i<pdbFile.chains.size(); i++)
       {
@@ -746,6 +747,8 @@ public synchronized void addSequence(SequenceI [] seq)
 
         colourBySequence(ap);
       }
+      if (fr!=null)
+        fr.featuresAdded();
 
       loadingFromArchive = false;
     }