CandP takes AlignFrame, not applet

diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index a9a0e35..b85c7d2 100755 (executable)
--- a/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@ -181,9 +181,9 @@ public class APopupMenu
 \r
   void addPDB(Sequence seq)\r
   {\r
-    CutAndPasteTransfer cap = new CutAndPasteTransfer(true, ap.alignFrame.applet);\r
+    CutAndPasteTransfer cap = new CutAndPasteTransfer(true, ap.alignFrame);\r
     cap.setText("Paste your PDB file here.");\r
-    cap.setPDBImport(seq, ap.seqPanel.seqCanvas);\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

diff --git a/src/jalview/appletgui/AnnotationLabels.java b/src/jalview/appletgui/AnnotationLabels.java
index 3ef61e6..ae47b72 100755 (executable)
--- a/src/jalview/appletgui/AnnotationLabels.java
+++ b/src/jalview/appletgui/AnnotationLabels.java
@@ -83,7 +83,7 @@ public class AnnotationLabels
     }\r
     else if (evt.getActionCommand().equals(OUTPUT_TEXT))\r
     {\r
-      CutAndPasteTransfer cap = new CutAndPasteTransfer(false, ap.alignFrame.applet);\r
+      CutAndPasteTransfer cap = new CutAndPasteTransfer(false, ap.alignFrame);\r
       Frame frame = new Frame();\r
       frame.add(cap);\r
       jalview.bin.JalviewLite.addFrame(frame,\r