public class CutAndPasteTransfer extends GCutAndPasteTransfer\r
{\r
\r
+ AlignViewport viewport;\r
+\r
public CutAndPasteTransfer()\r
{\r
SwingUtilities.invokeLater(new Runnable()\r
/**\r
* DOCUMENT ME!\r
*/\r
- public void setForInput()\r
+ public void setForInput(AlignViewport viewport)\r
{\r
- getContentPane().add(inputButtonPanel, java.awt.BorderLayout.SOUTH);\r
+ this.viewport = viewport;\r
+ getContentPane().add(inputButtonPanel, java.awt.BorderLayout.SOUTH);\r
}\r
\r
/**\r
*/\r
public void ok_actionPerformed(ActionEvent e)\r
{\r
- String format = IdentifyFile.Identify(getText(), "Paste");\r
+ String format = new IdentifyFile().Identify(getText(), "Paste");\r
SequenceI[] sequences = null;\r
\r
if (FormatAdapter.formats.contains(format))\r
\r
if (sequences != null)\r
{\r
+ if(viewport!=null)\r
+ {\r
+ for(int i=0; i<sequences.length; i++)\r
+ viewport.getAlignment().addSequence(sequences[i]);\r
+\r
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
+ }\r
+ else\r
+ {\r
AlignFrame af = new AlignFrame(new Alignment(sequences));\r
af.currentFileFormat = format;\r
Desktop.addInternalFrame(af, "Cut & Paste input - " + format,\r
- AlignFrame.NEW_WINDOW_WIDTH, AlignFrame.NEW_WINDOW_HEIGHT);\r
+ AlignFrame.NEW_WINDOW_WIDTH,\r
+ AlignFrame.NEW_WINDOW_HEIGHT);\r
af.statusBar.setText("Successfully pasted alignment file");\r
\r
try\r
{\r
- af.setMaximum( jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false));\r
+ af.setMaximum(jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false));\r
}\r
catch (Exception ex)\r
{\r
}\r
\r
+ }\r
try\r
{\r
this.setClosed(true);\r
}\r
});\r
popup.add(item);\r
- popup.show(this, e.getX(), e.getY()+textarea.getY()+30);\r
+ popup.show(this, e.getX()+10, e.getY()+textarea.getY()+40);\r
\r
}\r
}\r