Applet remembers PDBEntries, can launch multiple structures from popupmenu

[jalview.git] / src / jalview / appletgui / APopupMenu.java

diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index ede493e..b281fcd 100755 (executable)
--- a/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@ -28,6 +28,7 @@ import jalview.analysis.*;
 import jalview.commands.*;\r
 import jalview.datamodel.*;\r
 import jalview.schemes.*;\r
+import jalview.io.AppletFormatAdapter;\r
 \r
 public class APopupMenu\r
     extends java.awt.PopupMenu implements ActionListener, ItemListener\r
@@ -474,12 +475,34 @@ public class APopupMenu
 \r
   void addPDB()\r
   {\r
-    CutAndPasteTransfer cap = new CutAndPasteTransfer(true, ap.alignFrame);\r
-    cap.setText("Paste your PDB file here.");\r
-    cap.setPDBImport(seq);\r
-    Frame frame = new Frame();\r
-    frame.add(cap);\r
-    jalview.bin.JalviewLite.addFrame(frame, "Paste PDB file ", 400, 300);\r
+    if(seq.getPDBId()!=null)\r
+    {\r
+      PDBEntry entry = (PDBEntry)seq.getPDBId().firstElement();\r
+\r
+      if ( ap.av.applet.jmolAvailable )\r
+       new jalview.appletgui.AppletJmol(entry,\r
+                                        new Sequence[]\r
+                                        {seq},\r
+                                        ap,\r
+                                        AppletFormatAdapter.URL);\r
+     else\r
+\r
+       new MCview.AppletPDBViewer(entry,\r
+                                  new Sequence[]\r
+                                  {seq},\r
+                                  ap,\r
+                                  AppletFormatAdapter.URL);\r
+\r
+    }\r
+    else\r
+    {\r
+      CutAndPasteTransfer cap = new CutAndPasteTransfer(true, ap.alignFrame);\r
+      cap.setText("Paste your PDB file here.");\r
+      cap.setPDBImport(seq);\r
+      Frame frame = new Frame();\r
+      frame.add(cap);\r
+      jalview.bin.JalviewLite.addFrame(frame, "Paste PDB file ", 400, 300);\r
+    }\r
   }\r
 \r
   private void jbInit()\r