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-3011 include annotation scores in sequence id tooltip and sequence details report
[jalview.git]
/
src
/
jalview
/
gui
/
CutAndPasteHtmlTransfer.java
diff --git
a/src/jalview/gui/CutAndPasteHtmlTransfer.java
b/src/jalview/gui/CutAndPasteHtmlTransfer.java
index
596f0b6
..
1d7d1c9
100644
(file)
--- a/
src/jalview/gui/CutAndPasteHtmlTransfer.java
+++ b/
src/jalview/gui/CutAndPasteHtmlTransfer.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-100,6
+100,7
@@
public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
});
SwingUtilities.invokeLater(new Runnable()
{
});
SwingUtilities.invokeLater(new Runnable()
{
+ @Override
public void run()
{
textarea.requestFocus();
public void run()
{
textarea.requestFocus();
@@
-140,9
+141,12
@@
public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
*/
public void setText(String text)
{
*/
public void setText(String text)
{
+ textarea.setDocument(textarea.getEditorKit().createDefaultDocument());
textarea.setText(text);
textarea.setText(text);
+ textarea.setCaretPosition(0);
}
}
+ @Override
public void save_actionPerformed(ActionEvent e)
{
JalviewFileChooser chooser = new JalviewFileChooser(
public void save_actionPerformed(ActionEvent e)
{
JalviewFileChooser chooser = new JalviewFileChooser(
@@
-150,8
+154,8
@@
public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
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);
@@
-173,11
+177,12
@@
public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
}
}
}
}
+ @Override
public void toggleHtml_actionPerformed(ActionEvent e)
{
String txt = textarea.getText();
public void toggleHtml_actionPerformed(ActionEvent e)
{
String txt = textarea.getText();
- textarea.setContentType(displaySource.isSelected() ? "text/text"
- : "text/html");
+ textarea.setContentType(
+ displaySource.isSelected() ? "text/text" : "text/html");
textarea.setText(txt);
}
textarea.setText(txt);
}
@@
-187,6
+192,7
@@
public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
* @param e
* DOCUMENT ME!
*/
* @param e
* DOCUMENT ME!
*/
+ @Override
public void copyItem_actionPerformed(ActionEvent e)
{
Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard();
public void copyItem_actionPerformed(ActionEvent e)
{
Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard();
@@
-210,6
+216,7
@@
public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
* @param e
* DOCUMENT ME!
*/
* @param e
* DOCUMENT ME!
*/
+ @Override
public void cancel_actionPerformed(ActionEvent e)
{
try
public void cancel_actionPerformed(ActionEvent e)
{
try
@@
-220,9
+227,11
@@
public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
}
}
}
}
+ @Override
public void textarea_mousePressed(MouseEvent e)
{
public void textarea_mousePressed(MouseEvent e)
{
- if (SwingUtilities.isRightMouseButton(e))
+ // isPopupTrigger is on mousePressed (Mac) or mouseReleased (Windows)
+ if (e.isPopupTrigger())
{
JPopupMenu popup = new JPopupMenu(
MessageManager.getString("action.edit"));
{
JPopupMenu popup = new JPopupMenu(
MessageManager.getString("action.edit"));
@@
-230,6
+239,7
@@
public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
MessageManager.getString("action.copy"));
item.addActionListener(new ActionListener()
{
MessageManager.getString("action.copy"));
item.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
copyItem_actionPerformed(e);
public void actionPerformed(ActionEvent e)
{
copyItem_actionPerformed(e);