From 9480f68983a1dbd16d876706ed0c7a51fbaaff01 Mon Sep 17 00:00:00 2001 From: jprocter Date: Fri, 22 Feb 2008 16:29:56 +0000 Subject: [PATCH] On 'save' menu entry check to see if fileformat is a valid output format and open save as dialog if it isn't. --- src/jalview/gui/AlignFrame.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index b6e0f70..72691cc 100755 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -688,7 +688,7 @@ public class AlignFrame public void save_actionPerformed(ActionEvent e) { if(fileName==null - || currentFileFormat==null + || (currentFileFormat==null || jalview.io.AppletFormatAdapter.isValidFormat(currentFileFormat, true)) || fileName.startsWith("http") ) { @@ -770,8 +770,18 @@ public class AlignFrame } else - { - + { + if (!jalview.io.AppletFormatAdapter.isValidFormat(format, true)) + { + // JBPNote need to have a raise_gui flag here + JOptionPane.showInternalMessageDialog( + this, "Cannot save file " + fileName + " using format "+format, + "Alignment output format not supported", + JOptionPane.WARNING_MESSAGE); + saveAs_actionPerformed(null); + return false; + } + String[] omitHidden = null; if (viewport.hasHiddenColumns) @@ -788,7 +798,6 @@ public class AlignFrame } } FormatAdapter f = new FormatAdapter(); - String output = f.formatSequences( format, (Alignment) viewport.alignment, // class cast exceptions will occur in the distant future -- 1.7.10.2