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
DasRegistry moved again
[jalview.git]
/
src
/
jalview
/
gui
/
CutAndPasteTransfer.java
diff --git
a/src/jalview/gui/CutAndPasteTransfer.java
b/src/jalview/gui/CutAndPasteTransfer.java
index
3da42fc
..
b857405
100755
(executable)
--- a/
src/jalview/gui/CutAndPasteTransfer.java
+++ b/
src/jalview/gui/CutAndPasteTransfer.java
@@
-1,6
+1,6
@@
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer
\r
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer
\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
\r
*
\r
* This program is free software; you can redistribute it and/or
\r
* modify it under the terms of the GNU General Public License
\r
*
\r
* This program is free software; you can redistribute it and/or
\r
* modify it under the terms of the GNU General Public License
\r
@@
-169,7
+169,7
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
String format = new IdentifyFile().Identify(getText(), "Paste");
\r
SequenceI[] sequences = null;
\r
\r
String format = new IdentifyFile().Identify(getText(), "Paste");
\r
SequenceI[] sequences = null;
\r
\r
- if (FormatAdapter.formats.contains(format))
\r
+ if (FormatAdapter.isValidFormat(format))
\r
{
\r
try{
\r
sequences = new FormatAdapter().readFile(getText(), "Paste", format);
\r
{
\r
try{
\r
sequences = new FormatAdapter().readFile(getText(), "Paste", format);
\r
@@
-193,18
+193,15
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
}
\r
else
\r
{
\r
}
\r
else
\r
{
\r
- AlignFrame af = new AlignFrame(new Alignment(sequences));
\r
+ AlignFrame af = new AlignFrame(new Alignment(sequences),
\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
af.statusBar.setText("Successfully pasted alignment file");
\r
\r
- if(jalview.bin.Cache.getDefault("WRAP_ALIGNMENT", false))
\r
- {
\r
- af.wrapMenuItem.setSelected(true);
\r
- af.wrapMenuItem_actionPerformed(null);
\r
- }
\r
try
\r
{
\r
af.setMaximum(jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false));
\r
try
\r
{
\r
af.setMaximum(jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false));
\r