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
Jalview-JS/JAL-3253-applet adds AlignFrameI empty interface to allow
[jalview.git]
/
src
/
jalview
/
gui
/
CutAndPasteTransfer.java
diff --git
a/src/jalview/gui/CutAndPasteTransfer.java
b/src/jalview/gui/CutAndPasteTransfer.java
index
3eced2f
..
3514b75
100644
(file)
--- a/
src/jalview/gui/CutAndPasteTransfer.java
+++ b/
src/jalview/gui/CutAndPasteTransfer.java
@@
-135,13
+135,15
@@
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"));
chooser.setAcceptAllFileFilterUsed(false);
chooser.setFileView(new JalviewFileView());
JalviewFileChooser chooser = new JalviewFileChooser(
jalview.bin.Cache.getProperty("LAST_DIRECTORY"));
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);
@@
-150,8
+152,8
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
{
try
{
{
try
{
- PrintWriter out = new PrintWriter(new FileWriter(
- chooser.getSelectedFile()));
+ PrintWriter out = new PrintWriter(
+ new FileWriter(chooser.getSelectedFile()));
out.print(getText());
out.close();
out.print(getText());
out.close();
@@
-196,8
+198,8
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
try
{
try
{
- textarea.append((String) contents
- .getTransferData(DataFlavor.stringFlavor));
+ textarea.append(
+ (String) contents.getTransferData(DataFlavor.stringFlavor));
} catch (Exception ex)
{
}
} catch (Exception ex)
{
}
@@
-228,11
+230,11
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
}
if (format == null)
{
}
if (format == null)
{
- System.err.println(MessageManager
- .getString("label.couldnt_read_data"));
+ System.err
+ .println(MessageManager.getString("label.couldnt_read_data"));
if (!Jalview.isHeadlessMode())
{
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,18
+253,18
@@
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[]
.formatMessage("label.couldnt_read_pasted_text", new String[]
- { ex.toString() }), MessageManager
- .getString("label.error_parsing_text"),
+ { ex.toString() }),
+ MessageManager.getString("label.error_parsing_text"),
JvOptionPane.WARNING_MESSAGE);
}
if (al != null && al.hasValidSequence())
{
JvOptionPane.WARNING_MESSAGE);
}
if (al != null && al.hasValidSequence())
{
- String title = MessageManager.formatMessage(
- "label.input_cut_paste_params",
- new String[] { format.getName() });
+ String title = MessageManager
+ .formatMessage("label.input_cut_paste_params", new String[]
+ { format.getName() });
FeatureSettingsModelI proxyColourScheme = source
.getFeatureColourScheme();
FeatureSettingsModelI proxyColourScheme = source
.getFeatureColourScheme();
@@
-322,13
+324,14
@@
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
{
- af.setMaximum(jalview.bin.Cache.getDefault("SHOW_FULLSCREEN",
- false));
+ af.setMaximum(
+ jalview.bin.Cache.getDefault(Preferences.SHOW_FULLSCREEN,
+ false));
} catch (Exception ex)
{
}
} catch (Exception ex)
{
}
@@
-336,11
+339,11
@@
public class CutAndPasteTransfer extends GCutAndPasteTransfer
}
else
{
}
else
{
- System.err.println(MessageManager
- .getString("label.couldnt_read_data"));
+ System.err
+ .println(MessageManager.getString("label.couldnt_read_data"));
if (!Jalview.isHeadlessMode())
{
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);