X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=20fa65796a7822cba876e2724baacd2219273dd6;hb=614b72c437f14dd2ddd72ae918dada3fd5d64468;hp=63620e5cceedbfc0fc45dc970116d26e90983178;hpb=678a8ac35bb269d80cda081bec11e7b403c9811a;p=jalview.git diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index 63620e5..20fa657 100644 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -71,6 +71,7 @@ import jalview.io.JalviewFileChooser; import jalview.io.JalviewFileView; import jalview.io.JnetAnnotationMaker; import jalview.io.NewickFile; +import jalview.io.StructureFile; import jalview.io.TCoffeeScoreFile; import jalview.jbgui.GAlignFrame; import jalview.schemes.Blosum62ColourScheme; @@ -1347,7 +1348,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, public void bioJSMenuItem_actionPerformed(ActionEvent e) { BioJsHTMLOutput bjs = new BioJsHTMLOutput(alignPanel, this); - bjs.exportJalviewAlignmentAsBioJsHtmlFile(); + bjs.exportJalviewAlignmentAsBioJsHtmlFile(null); } public void createImageMap(File file, String image) @@ -4885,7 +4886,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, } if (type != null) { - if (type.equalsIgnoreCase("PDB")) + if (StructureFile.isStructureFile(type)) { filesmatched.add(new Object[] { file, protocol, mtch }); continue; @@ -4905,14 +4906,14 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, this, MessageManager .formatMessage( - "label.automatically_associate_pdb_files_with_sequences_same_name", + "label.automatically_associate_structure_files_with_sequences_same_name", new Object[] { Integer .valueOf( filesmatched .size()) .toString() }), MessageManager - .getString("label.automatically_associate_pdb_files_by_name"), + .getString("label.automatically_associate_structure_files_by_name"), JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION) {