X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignExportSettings.java;h=201570e00612f7bf11434b162002c9faf3487316;hb=914a9aaf5a2eeb3cdedf136c2e6b4b6e4b5d6174;hp=04849d8b49820f766bc6aaaba311273444233ffb;hpb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;p=jalview.git diff --git a/src/jalview/gui/AlignExportSettings.java b/src/jalview/gui/AlignExportSettings.java index 04849d8..201570e 100644 --- a/src/jalview/gui/AlignExportSettings.java +++ b/src/jalview/gui/AlignExportSettings.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) - * 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. * @@ -22,6 +22,7 @@ package jalview.gui; import jalview.api.AlignExportSettingI; import jalview.bin.Jalview; +import jalview.io.FileFormatI; import jalview.jbgui.GAlignExportSettings; import jalview.util.MessageManager; @@ -33,26 +34,28 @@ import javax.swing.JDialog; import javax.swing.JOptionPane; @SuppressWarnings("serial") -public class AlignExportSettings extends GAlignExportSettings implements - AlignExportSettingI +public class AlignExportSettings extends GAlignExportSettings + implements AlignExportSettingI { boolean cancelled = false; JDialog dialog; public AlignExportSettings(boolean hasHiddenSeq, boolean hasHiddenCols, - String alignFileFormat) + FileFormatI format) { - super(hasHiddenSeq, hasHiddenCols, alignFileFormat); + super(hasHiddenSeq, hasHiddenCols, format); if (!Jalview.isHeadlessMode() && isShowDialog()) { JOptionPane pane = new JOptionPane(null, JOptionPane.DEFAULT_OPTION, - JOptionPane.DEFAULT_OPTION, null, new Object[] { this }); + JvOptionPane.DEFAULT_OPTION, null, new Object[] + { this }); dialog = pane.createDialog(Desktop.desktop, MessageManager.getString("label.export_settings")); dialog.addWindowListener(new WindowAdapter() { + @Override public void windowClosing(WindowEvent e) { cancelled = true; @@ -66,6 +69,7 @@ public class AlignExportSettings extends GAlignExportSettings implements } } + @Override public void ok_actionPerformed(ActionEvent e) { cancelled = false; @@ -73,6 +77,7 @@ public class AlignExportSettings extends GAlignExportSettings implements dialog.dispose(); } + @Override public void cancel_actionPerformed(ActionEvent e) { cancelled = true; @@ -110,6 +115,7 @@ public class AlignExportSettings extends GAlignExportSettings implements return chkExportGrps.isSelected(); } + @Override public boolean isCancelled() { return cancelled;