X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FCutAndPasteTransfer.java;h=b85740576ccc4ac91643dd402260bff9f64bd187;hb=0fc704a18faa7d11b6d02876bb6c1e8bc19f343c;hp=3da42fc6af8ebf686796afe44489459865039827;hpb=2140ff9720fb75b29d13bd48350eda2808cb05f9;p=jalview.git diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java index 3da42fc..b857405 100755 --- a/src/jalview/gui/CutAndPasteTransfer.java +++ b/src/jalview/gui/CutAndPasteTransfer.java @@ -1,6 +1,6 @@ /* * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -169,7 +169,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer String format = new IdentifyFile().Identify(getText(), "Paste"); SequenceI[] sequences = null; - if (FormatAdapter.formats.contains(format)) + if (FormatAdapter.isValidFormat(format)) { try{ sequences = new FormatAdapter().readFile(getText(), "Paste", format); @@ -193,18 +193,15 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer } else { - AlignFrame af = new AlignFrame(new Alignment(sequences)); + AlignFrame af = new AlignFrame(new Alignment(sequences), + AlignFrame.DEFAULT_WIDTH, + AlignFrame.DEFAULT_HEIGHT); af.currentFileFormat = format; Desktop.addInternalFrame(af, "Cut & Paste input - " + format, - AlignFrame.NEW_WINDOW_WIDTH, - AlignFrame.NEW_WINDOW_HEIGHT); + AlignFrame.DEFAULT_WIDTH, + AlignFrame.DEFAULT_HEIGHT); af.statusBar.setText("Successfully pasted alignment file"); - if(jalview.bin.Cache.getDefault("WRAP_ALIGNMENT", false)) - { - af.wrapMenuItem.setSelected(true); - af.wrapMenuItem_actionPerformed(null); - } try { af.setMaximum(jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false));