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 'features/JAL-2447experimentalFlag' into develop
[jalview.git]
/
src
/
jalview
/
jbgui
/
GAlignExportSettings.java
diff --git
a/src/jalview/jbgui/GAlignExportSettings.java
b/src/jalview/jbgui/GAlignExportSettings.java
index
282055b
..
072754e
100644
(file)
--- a/
src/jalview/jbgui/GAlignExportSettings.java
+++ b/
src/jalview/jbgui/GAlignExportSettings.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * 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.
*
*
* This file is part of Jalview.
*
@@
-20,6
+20,7
@@
*/
package jalview.jbgui;
*/
package jalview.jbgui;
+import jalview.io.FileFormatI;
import jalview.util.MessageManager;
import java.awt.BorderLayout;
import jalview.util.MessageManager;
import java.awt.BorderLayout;
@@
-69,20
+70,11
@@
public abstract class GAlignExportSettings extends JPanel
showDialog;
public GAlignExportSettings(boolean hasHiddenSeq, boolean hasHiddenCols,
showDialog;
public GAlignExportSettings(boolean hasHiddenSeq, boolean hasHiddenCols,
- String alignFileFormat)
+ FileFormatI format)
{
this.hasHiddenSeq = hasHiddenSeq;
this.hasHiddenCols = hasHiddenCols;
{
this.hasHiddenSeq = hasHiddenSeq;
this.hasHiddenCols = hasHiddenCols;
- String[] complexFormats = { "JSON", "HTML" };
-
- for (String format : complexFormats)
- {
- if (format.equalsIgnoreCase(alignFileFormat))
- {
- this.isComplexAlignFile = true;
- break;
- }
- }
+ this.isComplexAlignFile = format.isComplexAlignFile();
if (this.hasHiddenCols || this.hasHiddenSeq || this.isComplexAlignFile)
{
this.showDialog = true;
if (this.hasHiddenCols || this.hasHiddenSeq || this.isComplexAlignFile)
{
this.showDialog = true;
@@
-111,6
+103,7
@@
public abstract class GAlignExportSettings extends JPanel
chkAll.addItemListener(new ItemListener()
{
chkAll.addItemListener(new ItemListener()
{
+ @Override
public void itemStateChanged(ItemEvent e)
{
checkAllAction();
public void itemStateChanged(ItemEvent e)
{
checkAllAction();
@@
-119,6
+112,7
@@
public abstract class GAlignExportSettings extends JPanel
btnOk.addActionListener(new ActionListener()
{
btnOk.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
ok_actionPerformed(e);
public void actionPerformed(ActionEvent e)
{
ok_actionPerformed(e);
@@
-127,6
+121,7
@@
public abstract class GAlignExportSettings extends JPanel
btnCancel.addActionListener(new ActionListener()
{
btnCancel.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
cancel_actionPerformed(e);
public void actionPerformed(ActionEvent e)
{
cancel_actionPerformed(e);