From: jprocter <Jim Procter>
Date: Mon, 14 Feb 2011 10:53:59 +0000 (+0000)
Subject: JAL-621 and JAL-564
X-Git-Tag: Release_2_7~260
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e10e5081745e4505b1b34b511312b05e562f8530;p=jalview.git

JAL-621 and JAL-564
---

diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java
index 2e9b7ea..1997264 100755
--- a/src/jalview/appletgui/AlignFrame.java
+++ b/src/jalview/appletgui/AlignFrame.java
@@ -30,6 +30,7 @@ import jalview.commands.*;
 import jalview.datamodel.*;
 import jalview.io.*;
 import jalview.schemes.*;
+import jalview.structure.StructureSelectionManager;
 
 public class AlignFrame extends EmbmenuFrame implements ActionListener,
         ItemListener, KeyListener
@@ -139,6 +140,9 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,
     alignPanel.idPanel.idCanvas.addKeyListener(this);
     alignPanel.scalePanel.addKeyListener(this);
     alignPanel.annotationPanel.addKeyListener(this);
+    alignPanel.annotationPanelHolder.addKeyListener(this);
+    alignPanel.annotationSpaceFillerHolder.addKeyListener(this);
+    alignPanel.alabels.addKeyListener(this);
     createAlignFrameWindow(embedded, title);
     alignPanel.validate();
     alignPanel.paintAlignment(true);
@@ -3489,6 +3493,12 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,
         return;
       }
     }
+    if (applet.useXtrnalSviewer)
+    {
+      // register the association(s) and quit, don't create any windows.
+      StructureSelectionManager.getStructureSelectionManager().setMapping(seqs, chains, pdb.getFile(), protocol);
+      return;
+    }
     if (applet.isAlignPdbStructures() && applet.jmolAvailable)
     {
       // can only do alignments with Jmol