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
JAL-1753 statusPanel added (for ProgressBar); 'Fit to Window' menu
[jalview.git]
/
src
/
jalview
/
gui
/
CutAndPasteTransfer.java
diff --git
a/src/jalview/gui/CutAndPasteTransfer.java
b/src/jalview/gui/CutAndPasteTransfer.java
index
22f0a59
..
1981488
100644
(file)
--- a/
src/jalview/gui/CutAndPasteTransfer.java
+++ b/
src/jalview/gui/CutAndPasteTransfer.java
@@
-21,8
+21,11
@@
package jalview.gui;
import jalview.datamodel.Alignment;
package jalview.gui;
import jalview.datamodel.Alignment;
+import jalview.io.FileParse;
import jalview.io.FormatAdapter;
import jalview.io.FormatAdapter;
+import jalview.io.HtmlFile;
import jalview.io.IdentifyFile;
import jalview.io.IdentifyFile;
+import jalview.io.JSONFile;
import jalview.io.JalviewFileChooser;
import jalview.io.JalviewFileView;
import jalview.jbgui.GCutAndPasteTransfer;
import jalview.io.JalviewFileChooser;
import jalview.io.JalviewFileView;
import jalview.jbgui.GCutAndPasteTransfer;
@@
-53,6
+56,7
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
AlignViewport viewport;
AlignViewport viewport;
+ FileParse source = null;
public CutAndPasteTransfer()
{
SwingUtilities.invokeLater(new Runnable()
public CutAndPasteTransfer()
{
SwingUtilities.invokeLater(new Runnable()
@@
-188,7
+192,10
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
{
try
{
{
try
{
- al = new FormatAdapter().readFile(getText(), "Paste", format);
+ FormatAdapter fa = new FormatAdapter(viewport);
+ al = fa.readFile(getText(), "Paste", format);
+ source = fa.getAlignFile();
+
} catch (java.io.IOException ex)
{
JOptionPane.showInternalMessageDialog(Desktop.desktop,
} catch (java.io.IOException ex)
{
JOptionPane.showInternalMessageDialog(Desktop.desktop,
@@
-219,6
+226,16
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
af.statusBar.setText(MessageManager
.getString("label.successfully_pasted_alignment_file"));
af.statusBar.setText(MessageManager
.getString("label.successfully_pasted_alignment_file"));
+ if (source instanceof HtmlFile)
+ {
+ ((HtmlFile) source).applySettingsToAlignFrame(af);
+ }
+ else if (source instanceof JSONFile)
+ {
+ ((JSONFile) source).applySettingsToAlignFrame(af);
+ }
+
+
try
{
af.setMaximum(jalview.bin.Cache.getDefault("SHOW_FULLSCREEN",
try
{
af.setMaximum(jalview.bin.Cache.getDefault("SHOW_FULLSCREEN",
@@
-230,6
+247,7
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
}
}
}
}
+
/**
* DOCUMENT ME!
*
/**
* DOCUMENT ME!
*