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-1759 formatting

[jalview.git]
/
src
/
jalview
/
gui
/
CutAndPasteTransfer.java
diff --git
a/src/jalview/gui/CutAndPasteTransfer.java
b/src/jalview/gui/CutAndPasteTransfer.java
index
b492ddf
..
979d1aa
100644
(file)
--- a/
src/jalview/gui/CutAndPasteTransfer.java
+++ b/
src/jalview/gui/CutAndPasteTransfer.java
@@
-23,6
+23,7
@@
package jalview.gui;
import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
import jalview.api.ComplexAlignFile;
import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
import jalview.api.ComplexAlignFile;
+import jalview.api.FeaturesDisplayedI;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.ColumnSelection;
import jalview.datamodel.SequenceI;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.ColumnSelection;
import jalview.datamodel.SequenceI;
@@
-83,9
+84,8
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
this.alignpanel = viewpanel;
if (alignpanel != null)
{
this.alignpanel = viewpanel;
if (alignpanel != null)
{
-
+ this.viewport = alignpanel.getAlignViewport();
}
}
- this.viewport = alignpanel.getAlignViewport();
if (viewport != null)
{
ok.setText(MessageManager.getString("action.add"));
if (viewport != null)
{
ok.setText(MessageManager.getString("action.add"));
@@
-195,7
+195,13
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
*/
public void ok_actionPerformed(ActionEvent e)
{
*/
public void ok_actionPerformed(ActionEvent e)
{
- String format = new IdentifyFile().Identify(getText(), "Paste");
+ String text = getText();
+ if (text.trim().length() < 1)
+ {
+ return;
+ }
+
+ String format = new IdentifyFile().Identify(text, "Paste");
// TODO: identify feature, annotation or tree file and parse appropriately.
AlignmentI al = null;
// TODO: identify feature, annotation or tree file and parse appropriately.
AlignmentI al = null;
@@
-240,11
+246,13
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
boolean showSeqFeatures = ((ComplexAlignFile) source)
.isShowSeqFeatures();
ColourSchemeI cs = ((ComplexAlignFile) source).getColourScheme();
boolean showSeqFeatures = ((ComplexAlignFile) source)
.isShowSeqFeatures();
ColourSchemeI cs = ((ComplexAlignFile) source).getColourScheme();
+ FeaturesDisplayedI fd = ((ComplexAlignFile) source)
+ .getDisplayedFeatures();
af = new AlignFrame(al, hiddenSeqs, colSel,
AlignFrame.DEFAULT_WIDTH,
AlignFrame.DEFAULT_HEIGHT);
af = new AlignFrame(al, hiddenSeqs, colSel,
AlignFrame.DEFAULT_WIDTH,
AlignFrame.DEFAULT_HEIGHT);
-
af.getViewport().setShowSequenceFeatures(showSeqFeatures);
af.getViewport().setShowSequenceFeatures(showSeqFeatures);
+ af.getViewport().setFeaturesDisplayed(fd);
af.changeColour(cs);
}
else
af.changeColour(cs);
}
else