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
Remove unnecessary ints
[jalview.git]
/
src
/
jalview
/
gui
/
CutAndPasteTransfer.java
diff --git
a/src/jalview/gui/CutAndPasteTransfer.java
b/src/jalview/gui/CutAndPasteTransfer.java
index
12f9e28
..
ba1e85e
100755
(executable)
--- a/
src/jalview/gui/CutAndPasteTransfer.java
+++ b/
src/jalview/gui/CutAndPasteTransfer.java
@@
-40,6
+40,8
@@
import javax.swing.*;
public class CutAndPasteTransfer extends GCutAndPasteTransfer
\r
{
\r
\r
public class CutAndPasteTransfer extends GCutAndPasteTransfer
\r
{
\r
\r
+ AlignViewport viewport;
\r
+
\r
public CutAndPasteTransfer()
\r
{
\r
SwingUtilities.invokeLater(new Runnable()
\r
public CutAndPasteTransfer()
\r
{
\r
SwingUtilities.invokeLater(new Runnable()
\r
@@
-55,9
+57,10
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
/**
\r
* DOCUMENT ME!
\r
*/
\r
/**
\r
* DOCUMENT ME!
\r
*/
\r
- public void setForInput()
\r
+ public void setForInput(AlignViewport viewport)
\r
{
\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
\r
/**
\r
@@
-147,20
+150,31
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
\r
if (sequences != null)
\r
{
\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 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.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
catch (Exception ex)
\r
{
\r
}
\r
\r
+ }
\r
try
\r
{
\r
this.setClosed(true);
\r
try
\r
{
\r
this.setClosed(true);
\r
@@
-208,7
+222,7
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
}
\r
});
\r
popup.add(item);
\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
\r
}
\r
}
\r