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-1884 add the JNLP template to jalview_jnlp_vm.jar
[jalview.git]
/
src
/
jalview
/
gui
/
CutAndPasteTransfer.java
diff --git
a/src/jalview/gui/CutAndPasteTransfer.java
b/src/jalview/gui/CutAndPasteTransfer.java
index
cd5c792
..
9c5651a
100644
(file)
--- a/
src/jalview/gui/CutAndPasteTransfer.java
+++ b/
src/jalview/gui/CutAndPasteTransfer.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-66,6
+66,7
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
AlignViewportI viewport;
FileParse source = null;
AlignViewportI viewport;
FileParse source = null;
+
public CutAndPasteTransfer()
{
SwingUtilities.invokeLater(new Runnable()
public CutAndPasteTransfer()
{
SwingUtilities.invokeLater(new Runnable()
@@
-129,7
+130,8
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
chooser.setAcceptAllFileFilterUsed(false);
chooser.setFileView(new JalviewFileView());
chooser.setAcceptAllFileFilterUsed(false);
chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle(MessageManager.getString("label.save_text_to_file"));
+ chooser.setDialogTitle(MessageManager
+ .getString("label.save_text_to_file"));
chooser.setToolTipText(MessageManager.getString("action.save"));
int value = chooser.showSaveDialog(this);
chooser.setToolTipText(MessageManager.getString("action.save"));
int value = chooser.showSaveDialog(this);
@@
-233,8
+235,8
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
{
JOptionPane.showInternalMessageDialog(Desktop.desktop,
MessageManager.formatMessage(
{
JOptionPane.showInternalMessageDialog(Desktop.desktop,
MessageManager.formatMessage(
- "label.couldnt_read_pasted_text", new String[]
- { ex.toString() }), MessageManager
+ "label.couldnt_read_pasted_text",
+ new String[] { ex.toString() }), MessageManager
.getString("label.error_parsing_text"),
JOptionPane.WARNING_MESSAGE);
}
.getString("label.error_parsing_text"),
JOptionPane.WARNING_MESSAGE);
}
@@
-243,8
+245,7
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
if (al != null && al.hasValidSequence())
{
String title = MessageManager.formatMessage(
if (al != null && al.hasValidSequence())
{
String title = MessageManager.formatMessage(
- "label.input_cut_paste_params", new String[]
- { format });
+ "label.input_cut_paste_params", new String[] { format });
if (viewport != null)
{
((AlignViewport) viewport).addAlignment(al, title);
if (viewport != null)
{
((AlignViewport) viewport).addAlignment(al, title);
@@
-265,8
+266,7
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
FeaturesDisplayedI fd = ((ComplexAlignFile) source)
.getDisplayedFeatures();
af = new AlignFrame(al, hiddenSeqs, colSel,
FeaturesDisplayedI fd = ((ComplexAlignFile) source)
.getDisplayedFeatures();
af = new AlignFrame(al, hiddenSeqs, colSel,
- AlignFrame.DEFAULT_WIDTH,
- AlignFrame.DEFAULT_HEIGHT);
+ AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT);
af.getViewport().setShowSequenceFeatures(showSeqFeatures);
af.getViewport().setFeaturesDisplayed(fd);
af.changeColour(cs);
af.getViewport().setShowSequenceFeatures(showSeqFeatures);
af.getViewport().setFeaturesDisplayed(fd);
af.changeColour(cs);
@@
-306,7
+306,6
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
}
}
}
}
-
/**
* DOCUMENT ME!
*
/**
* DOCUMENT ME!
*