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
temp push
[jalview.git]
/
src
/
jalview
/
gui
/
CutAndPasteTransfer.java
diff --git
a/src/jalview/gui/CutAndPasteTransfer.java
b/src/jalview/gui/CutAndPasteTransfer.java
index
2a96daf
..
4badcba
100644
(file)
--- a/
src/jalview/gui/CutAndPasteTransfer.java
+++ b/
src/jalview/gui/CutAndPasteTransfer.java
@@
-135,6
+135,8
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
@Override
public void save_actionPerformed(ActionEvent e)
{
@Override
public void save_actionPerformed(ActionEvent e)
{
+ // TODO: JAL-3048 JalviewFileChooser - Save option
+
JalviewFileChooser chooser = new JalviewFileChooser(
jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
JalviewFileChooser chooser = new JalviewFileChooser(
jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
@@
-232,7
+234,7
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
.println(MessageManager.getString("label.couldnt_read_data"));
if (!Jalview.isHeadlessMode())
{
.println(MessageManager.getString("label.couldnt_read_data"));
if (!Jalview.isHeadlessMode())
{
- JvOptionPane.showInternalMessageDialog(Desktop.desktop,
+ JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(),
AppletFormatAdapter.getSupportedFormats(),
MessageManager.getString("label.couldnt_read_data"),
JvOptionPane.WARNING_MESSAGE);
AppletFormatAdapter.getSupportedFormats(),
MessageManager.getString("label.couldnt_read_data"),
JvOptionPane.WARNING_MESSAGE);
@@
-251,7
+253,7
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
} catch (IOException ex)
{
} catch (IOException ex)
{
- JvOptionPane.showInternalMessageDialog(Desktop.desktop, MessageManager
+ JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(), MessageManager
.formatMessage("label.couldnt_read_pasted_text", new String[]
{ ex.toString() }),
MessageManager.getString("label.error_parsing_text"),
.formatMessage("label.couldnt_read_pasted_text", new String[]
{ ex.toString() }),
MessageManager.getString("label.error_parsing_text"),
@@
-322,7
+324,7
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
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);
- af.statusBar.setText(MessageManager
+ af.setStatus(MessageManager
.getString("label.successfully_pasted_alignment_file"));
try
.getString("label.successfully_pasted_alignment_file"));
try
@@
-340,7
+342,7
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
.println(MessageManager.getString("label.couldnt_read_data"));
if (!Jalview.isHeadlessMode())
{
.println(MessageManager.getString("label.couldnt_read_data"));
if (!Jalview.isHeadlessMode())
{
- JvOptionPane.showInternalMessageDialog(Desktop.desktop,
+ JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(),
AppletFormatAdapter.getSupportedFormats(),
MessageManager.getString("label.couldnt_read_data"),
JvOptionPane.WARNING_MESSAGE);
AppletFormatAdapter.getSupportedFormats(),
MessageManager.getString("label.couldnt_read_data"),
JvOptionPane.WARNING_MESSAGE);