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-1996 added link for viewing example source codes, changed release history outline...
[jalview.git]
/
src
/
jalview
/
gui
/
CutAndPasteTransfer.java
diff --git
a/src/jalview/gui/CutAndPasteTransfer.java
b/src/jalview/gui/CutAndPasteTransfer.java
index
8665320
..
1161340
100644
(file)
--- a/
src/jalview/gui/CutAndPasteTransfer.java
+++ b/
src/jalview/gui/CutAndPasteTransfer.java
@@
-23,7
+23,9
@@
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.FeatureSettingsModelI;
import jalview.api.FeaturesDisplayedI;
import jalview.api.FeaturesDisplayedI;
+import jalview.api.FeaturesSourceI;
import jalview.bin.Jalview;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.ColumnSelection;
import jalview.bin.Jalview;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.ColumnSelection;
@@
-252,12
+254,19
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
{
String title = MessageManager.formatMessage(
"label.input_cut_paste_params", new String[] { format });
{
String title = MessageManager.formatMessage(
"label.input_cut_paste_params", new String[] { format });
+ FeatureSettingsModelI proxyColourScheme = source
+ .getFeatureColourScheme();
+
/*
* if the view panel was closed its alignment is nulled
* and this is an orphaned cut and paste window
*/
if (viewport != null && viewport.getAlignment() != null)
{
/*
* if the view panel was closed its alignment is nulled
* and this is an orphaned cut and paste window
*/
if (viewport != null && viewport.getAlignment() != null)
{
+ if (proxyColourScheme != null)
+ {
+ viewport.applyFeaturesStyle(proxyColourScheme);
+ }
((AlignViewport) viewport).addAlignment(al, title);
}
else
((AlignViewport) viewport).addAlignment(al, title);
}
else
@@
-291,8
+300,15
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
{
af = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH,
AlignFrame.DEFAULT_HEIGHT);
{
af = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH,
AlignFrame.DEFAULT_HEIGHT);
+ if (source instanceof FeaturesSourceI)
+ {
+ af.getViewport().setShowSequenceFeatures(true);
+ }
+ }
+ if (proxyColourScheme != null)
+ {
+ af.getViewport().applyFeaturesStyle(proxyColourScheme);
}
}
-
af.currentFileFormat = format;
Desktop.addInternalFrame(af, title, AlignFrame.DEFAULT_WIDTH,
AlignFrame.DEFAULT_HEIGHT);
af.currentFileFormat = format;
Desktop.addInternalFrame(af, title, AlignFrame.DEFAULT_WIDTH,
AlignFrame.DEFAULT_HEIGHT);
@@
-342,7
+358,7
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
@Override
public void textarea_mousePressed(MouseEvent e)
{
@Override
public void textarea_mousePressed(MouseEvent e)
{
- if (SwingUtilities.isRightMouseButton(e))
+ if (e.isPopupTrigger())
{
JPopupMenu popup = new JPopupMenu(
MessageManager.getString("action.edit"));
{
JPopupMenu popup = new JPopupMenu(
MessageManager.getString("action.edit"));