git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
random ';'
[jalview.git]
/
src
/
jalview
/
gui
/
CutAndPasteTransfer.java
diff --git
a/src/jalview/gui/CutAndPasteTransfer.java
b/src/jalview/gui/CutAndPasteTransfer.java
index
508e51f
..
4773c26
100755
(executable)
--- a/
src/jalview/gui/CutAndPasteTransfer.java
+++ b/
src/jalview/gui/CutAndPasteTransfer.java
@@
-60,6
+60,9
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
public void setForInput(AlignViewport viewport)
\r
{
\r
this.viewport = viewport;
\r
public void setForInput(AlignViewport viewport)
\r
{
\r
this.viewport = viewport;
\r
+ if(viewport!=null)
\r
+ ok.setText("Add");
\r
+
\r
getContentPane().add(inputButtonPanel, java.awt.BorderLayout.SOUTH);
\r
}
\r
\r
getContentPane().add(inputButtonPanel, java.awt.BorderLayout.SOUTH);
\r
}
\r
\r
@@
-167,12
+170,12
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
public void ok_actionPerformed(ActionEvent e)
\r
{
\r
String format = new IdentifyFile().Identify(getText(), "Paste");
\r
public void ok_actionPerformed(ActionEvent e)
\r
{
\r
String format = new IdentifyFile().Identify(getText(), "Paste");
\r
- SequenceI[] sequences = null;
\r
+ Alignment al = null;
\r
\r
if (FormatAdapter.isValidFormat(format))
\r
{
\r
try{
\r
\r
if (FormatAdapter.isValidFormat(format))
\r
{
\r
try{
\r
- sequences = new FormatAdapter().readFile(getText(), "Paste", format);
\r
+ al = new FormatAdapter().readFile(getText(), "Paste", format);
\r
}catch(java.io.IOException ex)
\r
{
\r
JOptionPane.showInternalMessageDialog(Desktop.desktop,
\r
}catch(java.io.IOException ex)
\r
{
\r
JOptionPane.showInternalMessageDialog(Desktop.desktop,
\r
@@
-182,22
+185,24
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
}
\r
}
\r
\r
}
\r
}
\r
\r
- if (sequences != null)
\r
+ if (al != null)
\r
{
\r
if(viewport!=null)
\r
{
\r
{
\r
if(viewport!=null)
\r
{
\r
- for(int i=0; i<sequences.length; i++)
\r
- viewport.getAlignment().addSequence(sequences[i]);
\r
+ for(int i=0; i<al.getHeight(); i++)
\r
+ viewport.getAlignment().addSequence(al.getSequenceAt(i));
\r
\r
viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
\r
}
\r
else
\r
{
\r
\r
viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
\r
}
\r
else
\r
{
\r
- AlignFrame af = new AlignFrame(new Alignment(sequences));
\r
+ AlignFrame af = new AlignFrame(al,
\r
+ AlignFrame.DEFAULT_WIDTH,
\r
+ AlignFrame.DEFAULT_HEIGHT);
\r
af.currentFileFormat = format;
\r
Desktop.addInternalFrame(af, "Cut & Paste input - " + format,
\r
af.currentFileFormat = format;
\r
Desktop.addInternalFrame(af, "Cut & Paste input - " + format,
\r
- AlignFrame.NEW_WINDOW_WIDTH,
\r
- AlignFrame.NEW_WINDOW_HEIGHT);
\r
+ AlignFrame.DEFAULT_WIDTH,
\r
+ AlignFrame.DEFAULT_HEIGHT);
\r
af.statusBar.setText("Successfully pasted alignment file");
\r
\r
try
\r
af.statusBar.setText("Successfully pasted alignment file");
\r
\r
try
\r