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
Merge branch 'develop' into bug/JAL-4059_update_swingJS_for_JalviewJS_2_11_2_and_2_11_3
[jalview.git]
/
src
/
jalview
/
gui
/
CutAndPasteHtmlTransfer.java
diff --git
a/src/jalview/gui/CutAndPasteHtmlTransfer.java
b/src/jalview/gui/CutAndPasteHtmlTransfer.java
index
71a1520
..
4469ceb
100644
(file)
--- a/
src/jalview/gui/CutAndPasteHtmlTransfer.java
+++ b/
src/jalview/gui/CutAndPasteHtmlTransfer.java
@@
-20,12
+20,6
@@
*/
package jalview.gui;
*/
package jalview.gui;
-import jalview.io.JalviewFileChooser;
-import jalview.io.JalviewFileView;
-import jalview.jbgui.GCutAndPasteHtmlTransfer;
-import jalview.util.MessageManager;
-import jalview.viewmodel.AlignmentViewport;
-
import java.awt.Toolkit;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.StringSelection;
import java.awt.Toolkit;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.StringSelection;
@@
-43,6
+37,13
@@
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkEvent.EventType;
import javax.swing.event.HyperlinkListener;
import javax.swing.event.HyperlinkEvent.EventType;
import javax.swing.event.HyperlinkListener;
+import jalview.bin.Cache;
+import jalview.io.JalviewFileChooser;
+import jalview.io.JalviewFileView;
+import jalview.jbgui.GCutAndPasteHtmlTransfer;
+import jalview.util.MessageManager;
+import jalview.viewmodel.AlignmentViewport;
+
/**
* Cut'n'paste files into the desktop See JAL-1105
*
/**
* Cut'n'paste files into the desktop See JAL-1105
*
@@
-57,6
+58,7
@@
public class CutAndPasteHtmlTransfer extends GCutAndPasteHtmlTransfer
public CutAndPasteHtmlTransfer()
{
super();
public CutAndPasteHtmlTransfer()
{
super();
+ this.setFrameIcon(null);
displaySource.setSelected(false);
textarea.addKeyListener(new KeyListener()
{
displaySource.setSelected(false);
textarea.addKeyListener(new KeyListener()
{
@@
-141,14
+143,18
@@
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)
{
}
@Override
public void save_actionPerformed(ActionEvent e)
{
+ // TODO: JAL-3048 JalviewFileChooser - Save option
+
JalviewFileChooser chooser = new JalviewFileChooser(
JalviewFileChooser chooser = new JalviewFileChooser(
- jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
+ Cache.getProperty("LAST_DIRECTORY"));
chooser.setAcceptAllFileFilterUsed(false);
chooser.setFileView(new JalviewFileView());
chooser.setAcceptAllFileFilterUsed(false);
chooser.setFileView(new JalviewFileView());