X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FCutAndPasteTransfer.java;h=b492ddfb51ce34a60a066b6d9410d615ab9e246c;hb=6dd554fdbf34db6b79595d5027159d20225f4894;hp=15e681837fa1c1cb9c8dea51cc9c5adb762a7fb9;hpb=15a454d6de78056c057ab64c5932dda788da979a;p=jalview.git diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java index 15e6818..b492ddf 100644 --- a/src/jalview/gui/CutAndPasteTransfer.java +++ b/src/jalview/gui/CutAndPasteTransfer.java @@ -58,7 +58,9 @@ import javax.swing.SwingUtilities; public class CutAndPasteTransfer extends GCutAndPasteTransfer { - AlignViewport viewport; + AlignmentViewPanel alignpanel; + + AlignViewportI viewport; FileParse source = null; public CutAndPasteTransfer() @@ -76,9 +78,14 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer /** * DOCUMENT ME! */ - public void setForInput(AlignViewport viewport) + public void setForInput(AlignmentViewPanel viewpanel) { - this.viewport = viewport; + this.alignpanel = viewpanel; + if (alignpanel != null) + { + + } + this.viewport = alignpanel.getAlignViewport(); if (viewport != null) { ok.setText(MessageManager.getString("action.add")); @@ -190,13 +197,13 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer { String format = new IdentifyFile().Identify(getText(), "Paste"); // TODO: identify feature, annotation or tree file and parse appropriately. - Alignment al = null; + AlignmentI al = null; if (FormatAdapter.isValidFormat(format)) { try { - FormatAdapter fa = new FormatAdapter(viewport); + FormatAdapter fa = new FormatAdapter(alignpanel); al = fa.readFile(getText(), "Paste", format); source = fa.getAlignFile(); @@ -218,7 +225,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer { format }); if (viewport != null) { - viewport.addAlignment(al, title); + ((AlignViewport) viewport).addAlignment(al, title); } else {